diff --git a/.cursorrules b/.cursorrules
index 61a306ff0..a40eec787 100644
--- a/.cursorrules
+++ b/.cursorrules
@@ -1,4 +1,7 @@
+You are an expert in TypeScript, Node.js, Remix, React, Shadcn UI and Tailwind.
+
 Code Style and Structure:
+
 - Write concise, technical TypeScript code with accurate examples
 - Use functional and declarative programming patterns; avoid classes
 - Prefer iteration and modularization over code duplication
@@ -6,20 +9,25 @@ Code Style and Structure:
 - Structure files: exported component, subcomponents, helpers, static content, types
 
 Naming Conventions:
+
 - Use lowercase with dashes for directories (e.g., components/auth-wizard)
 - Favor named exports for components
 
 TypeScript Usage:
-- Use TypeScript for all code; prefer interfaces over types
-- Avoid enums; use maps instead
+
+- Use TypeScript for all code; prefer types over interfaces
 - Use functional components with TypeScript interfaces
 
 Syntax and Formatting:
-- Use the "function" keyword for pure functions
+
+- Create functions using `const fn = () => {}`
 - Avoid unnecessary curly braces in conditionals; use concise syntax for simple statements
 - Use declarative JSX
+- Never use 'use client'
+- Never use 1 line if statements
 
 Error Handling and Validation:
+
 - Prioritize error handling: handle errors and edge cases early
 - Use early returns and guard clauses
 - Implement proper error logging and user-friendly messages
@@ -28,21 +36,40 @@ Error Handling and Validation:
 - Use error boundaries for unexpected errors
 
 UI and Styling:
+
 - Use Shadcn UI, Radix, and Tailwind Aria for components and styling
 - Implement responsive design with Tailwind CSS; use a mobile-first approach
+- When using Lucide icons, prefer the longhand names, for example HomeIcon instead of Home
 
-Performance Optimization:
-- Minimize 'use client', 'useEffect', and 'setState'; favor React Server Components (RSC)
-- Wrap client components in Suspense with fallback
-- Use dynamic loading for non-critical components
-- Optimize images: use WebP format, include size data, implement lazy loading
+React forms
 
-Key Conventions:
-- Use 'nuqs' for URL search parameter state management
-- Optimize Web Vitals (LCP, CLS, FID)
-- Limit 'use client':
-  - Favor server components and Next.js SSR
-  - Use only for Web API access in small components
-  - Avoid for data fetching or state management
+- Use zod for form validation react-hook-form for forms
+- Look at TeamCreateDialog.tsx as an example of form usage
+- Use <Form> <FormItem> elements, and also wrap the contents of form in a fieldset which should have the :disabled attribute when the form is loading
 
-Follow Next.js docs for Data Fetching, Rendering, and Routing
\ No newline at end of file
+TRPC Specifics
+
+- Every route should be in it's own file, example routers/teams/create-team.ts
+- Every route should have a types file associated with it, example routers/teams/create-team.types.ts. These files should have the OpenAPI meta, and request/response zod schemas
+- The request/response schemas should be named like Z[RouteName]RequestSchema and Z[RouteName]ResponseSchema
+- Use create-team.ts and create-team.types.ts as an example when creating new routes.
+- When creating the OpenAPI meta, only use GET and POST requests, do not use any other REST methods
+- Deconstruct the input argument on it's one line of code.
+
+Toast usage
+
+- Use the t`string` macro from @lingui/react/macro to display toast messages
+
+Remix/ReactRouter Usage
+
+- Use (params: Route.Params) to get the params from the route
+- Use (loaderData: Route.LoaderData) to get the loader data from the route
+- When using loaderdata, deconstruct the data you need from the loader data inside the function body
+- Do not use json() to return data, directly return the data
+
+Translations
+
+- Use <Trans>string</Trans> to display translations in jsx code, this should be imported from @lingui/react/macro
+- Use the t`string` macro from @lingui/react/macro to display translations in typescript code
+- t should be imported as const { t } = useLingui() where useLingui is imported from @lingui/react/macro
+- String in constants should be using the t`string` macro
diff --git a/apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx b/apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
new file mode 100644
index 000000000..840a4bb5d
--- /dev/null
+++ b/apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
@@ -0,0 +1,197 @@
+import { useEffect, useState } from 'react';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useLingui } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
+import type * as DialogPrimitive from '@radix-ui/react-dialog';
+import { useForm } from 'react-hook-form';
+import { useNavigate } from 'react-router';
+import type { z } from 'zod';
+
+import { AppError } from '@documenso/lib/errors/app-error';
+import { trpc } from '@documenso/trpc/react';
+import { ZCreateAdminOrganisationRequestSchema } from '@documenso/trpc/server/admin-router/create-admin-organisation.types';
+import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+export type OrganisationCreateDialogProps = {
+  trigger?: React.ReactNode;
+  ownerUserId: number;
+} & Omit<DialogPrimitive.DialogProps, 'children'>;
+
+const ZCreateAdminOrganisationFormSchema = ZCreateAdminOrganisationRequestSchema.shape.data.pick({
+  name: true,
+});
+
+type TCreateOrganisationFormSchema = z.infer<typeof ZCreateAdminOrganisationFormSchema>;
+
+export const AdminOrganisationCreateDialog = ({
+  trigger,
+  ownerUserId,
+  ...props
+}: OrganisationCreateDialogProps) => {
+  const { t } = useLingui();
+  const { toast } = useToast();
+
+  const [open, setOpen] = useState(false);
+
+  const navigate = useNavigate();
+
+  const form = useForm({
+    resolver: zodResolver(ZCreateAdminOrganisationFormSchema),
+    defaultValues: {
+      name: '',
+    },
+  });
+
+  const { mutateAsync: createOrganisation } = trpc.admin.organisation.create.useMutation();
+
+  const onFormSubmit = async ({ name }: TCreateOrganisationFormSchema) => {
+    try {
+      const { organisationId } = await createOrganisation({
+        ownerUserId,
+        data: {
+          name,
+        },
+      });
+
+      await navigate(`/admin/organisations/${organisationId}`);
+
+      setOpen(false);
+
+      toast({
+        title: t`Success`,
+        description: t`Organisation created`,
+        duration: 5000,
+      });
+    } catch (err) {
+      const error = AppError.parseError(err);
+
+      console.error(error);
+
+      toast({
+        title: t`An unknown error occurred`,
+        description: t`We encountered an unknown error while attempting to create a organisation. Please try again later.`,
+        variant: 'destructive',
+      });
+    }
+  };
+
+  useEffect(() => {
+    form.reset();
+  }, [open, form]);
+
+  return (
+    <Dialog
+      {...props}
+      open={open}
+      onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}
+    >
+      <DialogTrigger onClick={(e) => e.stopPropagation()} asChild={true}>
+        {trigger ?? (
+          <Button className="flex-shrink-0" variant="secondary">
+            <Trans>Create organisation</Trans>
+          </Button>
+        )}
+      </DialogTrigger>
+
+      <DialogContent position="center">
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Create organisation</Trans>
+          </DialogTitle>
+
+          <DialogDescription>
+            <Trans>Create an organisation for this user</Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onFormSubmit)}>
+            <fieldset
+              className="flex h-full flex-col space-y-4"
+              disabled={form.formState.isSubmitting}
+            >
+              <FormField
+                control={form.control}
+                name="name"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel required>
+                      <Trans>Organisation Name</Trans>
+                    </FormLabel>
+                    <FormControl>
+                      <Input {...field} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <Alert variant="neutral">
+                <AlertDescription className="mt-0">
+                  <Trans>
+                    You will need to configure any claims or subscription after creating this
+                    organisation
+                  </Trans>
+                </AlertDescription>
+              </Alert>
+
+              {/* <FormField
+                control={form.control}
+                name="name"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <Trans>Default claim ID</Trans>
+                    </FormLabel>
+                    <FormControl>
+                      <Input {...field} />
+                    </FormControl>
+                    <FormDescription>
+                      <Trans>Leave blank to use the default free claim</Trans>
+                    </FormDescription>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              /> */}
+
+              <DialogFooter>
+                <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                  <Trans>Cancel</Trans>
+                </Button>
+
+                <Button
+                  type="submit"
+                  data-testid="dialog-create-organisation-button"
+                  loading={form.formState.isSubmitting}
+                >
+                  <Trans>Create</Trans>
+                </Button>
+              </DialogFooter>
+            </fieldset>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/claim-create-dialog.tsx b/apps/remix/app/components/dialogs/claim-create-dialog.tsx
new file mode 100644
index 000000000..c3564e7e0
--- /dev/null
+++ b/apps/remix/app/components/dialogs/claim-create-dialog.tsx
@@ -0,0 +1,90 @@
+import { useState } from 'react';
+
+import { Trans, useLingui } from '@lingui/react/macro';
+import type { z } from 'zod';
+
+import { generateDefaultSubscriptionClaim } from '@documenso/lib/utils/organisations-claims';
+import { trpc } from '@documenso/trpc/react';
+import type { ZCreateSubscriptionClaimRequestSchema } from '@documenso/trpc/server/admin-router/create-subscription-claim.types';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { SubscriptionClaimForm } from '../forms/subscription-claim-form';
+
+export type CreateClaimFormValues = z.infer<typeof ZCreateSubscriptionClaimRequestSchema>;
+
+export const ClaimCreateDialog = () => {
+  const { t } = useLingui();
+  const { toast } = useToast();
+
+  const [open, setOpen] = useState(false);
+
+  const { mutateAsync: createClaim, isPending } = trpc.admin.claims.create.useMutation({
+    onSuccess: () => {
+      toast({
+        title: t`Subscription claim created successfully.`,
+      });
+
+      setOpen(false);
+    },
+    onError: () => {
+      toast({
+        title: t`Failed to create subscription claim.`,
+        variant: 'destructive',
+      });
+    },
+  });
+
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger onClick={(e) => e.stopPropagation()} asChild={true}>
+        <Button className="flex-shrink-0" variant="secondary">
+          <Trans>Create claim</Trans>
+        </Button>
+      </DialogTrigger>
+
+      <DialogContent className="sm:max-w-md">
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Create Subscription Claim</Trans>
+          </DialogTitle>
+          <DialogDescription>
+            <Trans>Fill in the details to create a new subscription claim.</Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        <SubscriptionClaimForm
+          subscriptionClaim={{
+            ...generateDefaultSubscriptionClaim(),
+          }}
+          onFormSubmit={createClaim}
+          formSubmitTrigger={
+            <DialogFooter>
+              <Button
+                type="button"
+                variant="outline"
+                onClick={() => setOpen(false)}
+                disabled={isPending}
+              >
+                <Trans>Cancel</Trans>
+              </Button>
+
+              <Button type="submit" loading={isPending}>
+                <Trans>Create Claim</Trans>
+              </Button>
+            </DialogFooter>
+          }
+        />
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/claim-delete-dialog.tsx b/apps/remix/app/components/dialogs/claim-delete-dialog.tsx
new file mode 100644
index 000000000..61124fa9d
--- /dev/null
+++ b/apps/remix/app/components/dialogs/claim-delete-dialog.tsx
@@ -0,0 +1,96 @@
+import { useState } from 'react';
+
+import { Trans, useLingui } from '@lingui/react/macro';
+
+import { trpc } from '@documenso/trpc/react';
+import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+export type ClaimDeleteDialogProps = {
+  claimId: string;
+  claimName: string;
+  claimLocked: boolean;
+  trigger: React.ReactNode;
+};
+
+export const ClaimDeleteDialog = ({
+  claimId,
+  claimName,
+  claimLocked,
+  trigger,
+}: ClaimDeleteDialogProps) => {
+  const { t } = useLingui();
+  const { toast } = useToast();
+
+  const [open, setOpen] = useState(false);
+
+  const { mutateAsync: deleteClaim, isPending } = trpc.admin.claims.delete.useMutation({
+    onSuccess: () => {
+      toast({
+        title: t`Subscription claim deleted successfully.`,
+      });
+
+      setOpen(false);
+    },
+    onError: (err) => {
+      console.error(err);
+
+      toast({
+        title: t`Failed to delete subscription claim.`,
+        variant: 'destructive',
+      });
+    },
+  });
+
+  return (
+    <Dialog open={open} onOpenChange={(value) => !isPending && setOpen(value)}>
+      <DialogTrigger asChild onClick={(e) => e.stopPropagation()}>
+        {trigger}
+      </DialogTrigger>
+
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Delete Subscription Claim</Trans>
+          </DialogTitle>
+          <DialogDescription>
+            <Trans>Are you sure you want to delete the following claim?</Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        <Alert variant="neutral">
+          <AlertDescription className="text-center font-semibold">
+            {claimLocked ? <Trans>This claim is locked and cannot be deleted.</Trans> : claimName}
+          </AlertDescription>
+        </Alert>
+
+        <DialogFooter>
+          <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+            <Trans>Cancel</Trans>
+          </Button>
+
+          {!claimLocked && (
+            <Button
+              type="submit"
+              variant="destructive"
+              loading={isPending}
+              onClick={async () => deleteClaim({ id: claimId })}
+            >
+              <Trans>Delete</Trans>
+            </Button>
+          )}
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/claim-update-dialog.tsx b/apps/remix/app/components/dialogs/claim-update-dialog.tsx
new file mode 100644
index 000000000..539343d40
--- /dev/null
+++ b/apps/remix/app/components/dialogs/claim-update-dialog.tsx
@@ -0,0 +1,92 @@
+import { useState } from 'react';
+
+import { Trans, useLingui } from '@lingui/react/macro';
+
+import { trpc } from '@documenso/trpc/react';
+import type { TFindSubscriptionClaimsResponse } from '@documenso/trpc/server/admin-router/find-subscription-claims.types';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { SubscriptionClaimForm } from '../forms/subscription-claim-form';
+
+export type ClaimUpdateDialogProps = {
+  claim: TFindSubscriptionClaimsResponse['data'][number];
+  trigger: React.ReactNode;
+};
+
+export const ClaimUpdateDialog = ({ claim, trigger }: ClaimUpdateDialogProps) => {
+  const { t } = useLingui();
+  const { toast } = useToast();
+
+  const [open, setOpen] = useState(false);
+
+  const { mutateAsync: updateClaim, isPending } = trpc.admin.claims.update.useMutation({
+    onSuccess: () => {
+      toast({
+        title: t`Subscription claim updated successfully.`,
+      });
+
+      setOpen(false);
+    },
+    onError: () => {
+      toast({
+        title: t`Failed to update subscription claim.`,
+        variant: 'destructive',
+      });
+    },
+  });
+
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger asChild onClick={(e) => e.stopPropagation()}>
+        {trigger}
+      </DialogTrigger>
+
+      <DialogContent className="sm:max-w-md">
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Update Subscription Claim</Trans>
+          </DialogTitle>
+          <DialogDescription>
+            <Trans>Modify the details of the subscription claim.</Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        <SubscriptionClaimForm
+          subscriptionClaim={claim}
+          onFormSubmit={async (data) =>
+            await updateClaim({
+              id: claim.id,
+              data,
+            })
+          }
+          formSubmitTrigger={
+            <DialogFooter>
+              <Button
+                type="button"
+                variant="outline"
+                onClick={() => setOpen(false)}
+                disabled={isPending}
+              >
+                <Trans>Cancel</Trans>
+              </Button>
+
+              <Button type="submit" loading={isPending}>
+                <Trans>Update Claim</Trans>
+              </Button>
+            </DialogFooter>
+          }
+        />
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/document-delete-dialog.tsx b/apps/remix/app/components/dialogs/document-delete-dialog.tsx
index c89e346a0..746ef1570 100644
--- a/apps/remix/app/components/dialogs/document-delete-dialog.tsx
+++ b/apps/remix/app/components/dialogs/document-delete-dialog.tsx
@@ -28,7 +28,6 @@ type DocumentDeleteDialogProps = {
   onDelete?: () => Promise<void> | void;
   status: DocumentStatus;
   documentTitle: string;
-  teamId?: number;
   canManageDocument: boolean;
 };
 
diff --git a/apps/remix/app/components/dialogs/document-duplicate-dialog.tsx b/apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
index 754fa2596..bb87f99dc 100644
--- a/apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
+++ b/apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
@@ -16,7 +16,7 @@ import {
 import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 type DocumentDuplicateDialogProps = {
   id: number;
@@ -34,7 +34,7 @@ export const DocumentDuplicateDialog = ({
   const { toast } = useToast();
   const { _ } = useLingui();
 
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const { data: document, isLoading } = trpcReact.document.getDocumentById.useQuery(
     {
@@ -52,7 +52,7 @@ export const DocumentDuplicateDialog = ({
       }
     : undefined;
 
-  const documentsPath = formatDocumentsPath(team?.url);
+  const documentsPath = formatDocumentsPath(team.url);
 
   const { mutateAsync: duplicateDocument, isPending: isDuplicateLoading } =
     trpcReact.document.duplicateDocument.useMutation({
diff --git a/apps/remix/app/components/dialogs/document-move-dialog.tsx b/apps/remix/app/components/dialogs/document-move-dialog.tsx
deleted file mode 100644
index 1e0632531..000000000
--- a/apps/remix/app/components/dialogs/document-move-dialog.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import { useState } from 'react';
-
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-
-import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
-import { trpc } from '@documenso/trpc/react';
-import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@documenso/ui/primitives/select';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-type DocumentMoveDialogProps = {
-  documentId: number;
-  open: boolean;
-  onOpenChange: (_open: boolean) => void;
-};
-
-export const DocumentMoveDialog = ({ documentId, open, onOpenChange }: DocumentMoveDialogProps) => {
-  const { _ } = useLingui();
-  const { toast } = useToast();
-
-  const [selectedTeamId, setSelectedTeamId] = useState<number | null>(null);
-
-  const { data: teams, isPending: isLoadingTeams } = trpc.team.getTeams.useQuery();
-
-  const { mutateAsync: moveDocument, isPending } = trpc.document.moveDocumentToTeam.useMutation({
-    onSuccess: () => {
-      toast({
-        title: _(msg`Document moved`),
-        description: _(msg`The document has been successfully moved to the selected team.`),
-        duration: 5000,
-      });
-
-      onOpenChange(false);
-    },
-    onError: (error) => {
-      toast({
-        title: _(msg`Error`),
-        description: error.message || _(msg`An error occurred while moving the document.`),
-        variant: 'destructive',
-        duration: 7500,
-      });
-    },
-  });
-
-  const onMove = async () => {
-    if (!selectedTeamId) {
-      return;
-    }
-
-    await moveDocument({ documentId, teamId: selectedTeamId });
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>
-            <Trans>Move Document to Team</Trans>
-          </DialogTitle>
-          <DialogDescription>
-            <Trans>Select a team to move this document to. This action cannot be undone.</Trans>
-          </DialogDescription>
-        </DialogHeader>
-
-        <Select onValueChange={(value) => setSelectedTeamId(Number(value))}>
-          <SelectTrigger>
-            <SelectValue placeholder={_(msg`Select a team`)} />
-          </SelectTrigger>
-          <SelectContent>
-            {isLoadingTeams ? (
-              <SelectItem value="loading" disabled>
-                <Trans>Loading teams...</Trans>
-              </SelectItem>
-            ) : (
-              teams?.map((team) => (
-                <SelectItem key={team.id} value={team.id.toString()}>
-                  <div className="flex items-center gap-4">
-                    <Avatar className="h-8 w-8">
-                      {team.avatarImageId && (
-                        <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />
-                      )}
-
-                      <AvatarFallback className="text-sm text-gray-400">
-                        {team.name.slice(0, 1).toUpperCase()}
-                      </AvatarFallback>
-                    </Avatar>
-
-                    <span>{team.name}</span>
-                  </div>
-                </SelectItem>
-              ))
-            )}
-          </SelectContent>
-        </Select>
-
-        <DialogFooter>
-          <Button variant="secondary" onClick={() => onOpenChange(false)}>
-            <Trans>Cancel</Trans>
-          </Button>
-          <Button onClick={onMove} loading={isPending} disabled={!selectedTeamId || isPending}>
-            {isPending ? <Trans>Moving...</Trans> : <Trans>Move</Trans>}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-};
diff --git a/apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx b/apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
index e8aefd0c0..860230b5f 100644
--- a/apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
+++ b/apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
@@ -33,7 +33,7 @@ import {
 } from '@documenso/ui/primitives/form/form';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 export type DocumentMoveToFolderDialogProps = {
   documentId: number;
@@ -57,8 +57,9 @@ export const DocumentMoveToFolderDialog = ({
 }: DocumentMoveToFolderDialogProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
+
   const navigate = useNavigate();
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const form = useForm<TMoveDocumentFormSchema>({
     resolver: zodResolver(ZMoveDocumentFormSchema),
@@ -94,6 +95,14 @@ export const DocumentMoveToFolderDialog = ({
         folderId: data.folderId ?? null,
       });
 
+      const documentsPath = formatDocumentsPath(team.url);
+
+      if (data.folderId) {
+        await navigate(`${documentsPath}/f/${data.folderId}`);
+      } else {
+        await navigate(documentsPath);
+      }
+
       toast({
         title: _(msg`Document moved`),
         description: _(msg`The document has been moved successfully.`),
@@ -101,14 +110,6 @@ export const DocumentMoveToFolderDialog = ({
       });
 
       onOpenChange(false);
-
-      const documentsPath = formatDocumentsPath(team?.url);
-
-      if (data.folderId) {
-        void navigate(`${documentsPath}/f/${data.folderId}`);
-      } else {
-        void navigate(documentsPath);
-      }
     } catch (err) {
       const error = AppError.parseError(err);
 
diff --git a/apps/remix/app/components/dialogs/document-resend-dialog.tsx b/apps/remix/app/components/dialogs/document-resend-dialog.tsx
index 0847eca0f..b3dc69503 100644
--- a/apps/remix/app/components/dialogs/document-resend-dialog.tsx
+++ b/apps/remix/app/components/dialogs/document-resend-dialog.tsx
@@ -36,7 +36,7 @@ import {
 } from '@documenso/ui/primitives/form/form';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 import { StackAvatar } from '../general/stack-avatar';
 
@@ -57,7 +57,7 @@ export type TResendDocumentFormSchema = z.infer<typeof ZResendDocumentFormSchema
 
 export const DocumentResendDialog = ({ document, recipients }: DocumentResendDialogProps) => {
   const { user } = useSession();
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const { toast } = useToast();
   const { _ } = useLingui();
diff --git a/apps/remix/app/components/dialogs/folder-create-dialog.tsx b/apps/remix/app/components/dialogs/folder-create-dialog.tsx
index c0544ba3a..9451b57a1 100644
--- a/apps/remix/app/components/dialogs/folder-create-dialog.tsx
+++ b/apps/remix/app/components/dialogs/folder-create-dialog.tsx
@@ -34,7 +34,7 @@ import {
 import { Input } from '@documenso/ui/primitives/input';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 const ZCreateFolderFormSchema = z.object({
   name: z.string().min(1, { message: 'Folder name is required' }),
@@ -52,7 +52,7 @@ export const CreateFolderDialog = ({ trigger, ...props }: CreateFolderDialogProp
   const { folderId } = useParams();
 
   const navigate = useNavigate();
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const [isCreateFolderOpen, setIsCreateFolderOpen] = useState(false);
 
@@ -75,13 +75,13 @@ export const CreateFolderDialog = ({ trigger, ...props }: CreateFolderDialogProp
 
       setIsCreateFolderOpen(false);
 
+      const documentsPath = formatDocumentsPath(team.url);
+
+      await navigate(`${documentsPath}/f/${newFolder.id}`);
+
       toast({
         description: 'Folder created successfully',
       });
-
-      const documentsPath = formatDocumentsPath(team?.url);
-
-      void navigate(`${documentsPath}/f/${newFolder.id}`);
     } catch (err) {
       const error = AppError.parseError(err);
 
@@ -124,7 +124,7 @@ export const CreateFolderDialog = ({ trigger, ...props }: CreateFolderDialogProp
         <DialogHeader>
           <DialogTitle>Create New Folder</DialogTitle>
           <DialogDescription>
-            Enter a name for your new folder. Folders help you organize your documents.
+            Enter a name for your new folder. Folders help you organise your documents.
           </DialogDescription>
         </DialogHeader>
 
diff --git a/apps/remix/app/components/dialogs/organisation-create-dialog.tsx b/apps/remix/app/components/dialogs/organisation-create-dialog.tsx
new file mode 100644
index 000000000..1e564ccaf
--- /dev/null
+++ b/apps/remix/app/components/dialogs/organisation-create-dialog.tsx
@@ -0,0 +1,423 @@
+import { useEffect, useMemo, useState } from 'react';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import type { MessageDescriptor } from '@lingui/core';
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
+import type * as DialogPrimitive from '@radix-ui/react-dialog';
+import { ExternalLinkIcon } from 'lucide-react';
+import { useForm } from 'react-hook-form';
+import { Link, useSearchParams } from 'react-router';
+import { match } from 'ts-pattern';
+import type { z } from 'zod';
+
+import type { InternalClaimPlans } from '@documenso/ee/server-only/stripe/get-internal-claim-plans';
+import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { AppError } from '@documenso/lib/errors/app-error';
+import { INTERNAL_CLAIM_ID } from '@documenso/lib/types/subscription';
+import { parseMessageDescriptorMacro } from '@documenso/lib/utils/i18n';
+import { trpc } from '@documenso/trpc/react';
+import { ZCreateOrganisationRequestSchema } from '@documenso/trpc/server/organisation-router/create-organisation.types';
+import { cn } from '@documenso/ui/lib/utils';
+import { Badge } from '@documenso/ui/primitives/badge';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+import { SpinnerBox } from '@documenso/ui/primitives/spinner';
+import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+export type OrganisationCreateDialogProps = {
+  trigger?: React.ReactNode;
+} & Omit<DialogPrimitive.DialogProps, 'children'>;
+
+export const ZCreateOrganisationFormSchema = ZCreateOrganisationRequestSchema.pick({
+  name: true,
+});
+
+export type TCreateOrganisationFormSchema = z.infer<typeof ZCreateOrganisationFormSchema>;
+
+export const OrganisationCreateDialog = ({ trigger, ...props }: OrganisationCreateDialogProps) => {
+  const { t } = useLingui();
+  const { toast } = useToast();
+  const { refreshSession } = useSession();
+
+  const [searchParams] = useSearchParams();
+  const updateSearchParams = useUpdateSearchParams();
+
+  const actionSearchParam = searchParams?.get('action');
+
+  const [step, setStep] = useState<'billing' | 'create'>(
+    IS_BILLING_ENABLED() ? 'billing' : 'create',
+  );
+
+  const [selectedPriceId, setSelectedPriceId] = useState<string>('');
+
+  const [open, setOpen] = useState(false);
+
+  const form = useForm({
+    resolver: zodResolver(ZCreateOrganisationFormSchema),
+    defaultValues: {
+      name: '',
+    },
+  });
+
+  const { mutateAsync: createOrganisation } = trpc.organisation.create.useMutation();
+
+  const { data: plansData } = trpc.billing.plans.get.useQuery();
+
+  const onFormSubmit = async ({ name }: TCreateOrganisationFormSchema) => {
+    try {
+      const response = await createOrganisation({
+        name,
+        priceId: selectedPriceId,
+      });
+
+      if (response.paymentRequired) {
+        window.open(response.checkoutUrl, '_blank');
+        setOpen(false);
+
+        return;
+      }
+
+      await refreshSession();
+      setOpen(false);
+
+      toast({
+        title: t`Success`,
+        description: t`Your organisation has been created.`,
+        duration: 5000,
+      });
+    } catch (err) {
+      const error = AppError.parseError(err);
+
+      console.error(error);
+
+      toast({
+        title: t`An unknown error occurred`,
+        description: t`We encountered an unknown error while attempting to create a organisation. Please try again later.`,
+        variant: 'destructive',
+      });
+    }
+  };
+
+  useEffect(() => {
+    if (actionSearchParam === 'add-organisation') {
+      setOpen(true);
+      updateSearchParams({ action: null });
+    }
+  }, [actionSearchParam, open]);
+
+  useEffect(() => {
+    form.reset();
+  }, [open, form]);
+
+  return (
+    <Dialog
+      {...props}
+      open={open}
+      onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}
+    >
+      <DialogTrigger onClick={(e) => e.stopPropagation()} asChild={true}>
+        {trigger ?? (
+          <Button className="flex-shrink-0" variant="secondary">
+            <Trans>Create organisation</Trans>
+          </Button>
+        )}
+      </DialogTrigger>
+
+      <DialogContent position="center">
+        {match(step)
+          .with('billing', () => (
+            <>
+              <DialogHeader>
+                <DialogTitle>
+                  <Trans>Select a plan</Trans>
+                </DialogTitle>
+
+                <DialogDescription>
+                  <Trans>Select a plan to continue</Trans>
+                </DialogDescription>
+              </DialogHeader>
+              <fieldset aria-label="Plan select">
+                {plansData ? (
+                  <BillingPlanForm
+                    value={selectedPriceId}
+                    onChange={setSelectedPriceId}
+                    plans={plansData.plans}
+                    canCreateFreeOrganisation={plansData.canCreateFreeOrganisation}
+                  />
+                ) : (
+                  <SpinnerBox className="py-32" />
+                )}
+
+                <DialogFooter className="mt-4">
+                  <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                    <Trans>Cancel</Trans>
+                  </Button>
+
+                  <Button type="submit" onClick={() => setStep('create')}>
+                    <Trans>Continue</Trans>
+                  </Button>
+                </DialogFooter>
+              </fieldset>
+            </>
+          ))
+          .with('create', () => (
+            <>
+              <DialogHeader>
+                <DialogTitle>
+                  <Trans>Create organisation</Trans>
+                </DialogTitle>
+
+                <DialogDescription>
+                  <Trans>Create an organisation to collaborate with teams</Trans>
+                </DialogDescription>
+              </DialogHeader>
+
+              <Form {...form}>
+                <form onSubmit={form.handleSubmit(onFormSubmit)}>
+                  <fieldset
+                    className="flex h-full flex-col space-y-4"
+                    disabled={form.formState.isSubmitting}
+                  >
+                    <FormField
+                      control={form.control}
+                      name="name"
+                      render={({ field }) => (
+                        <FormItem>
+                          <FormLabel required>
+                            <Trans>Organisation Name</Trans>
+                          </FormLabel>
+                          <FormControl>
+                            <Input {...field} />
+                          </FormControl>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+
+                    <DialogFooter>
+                      {IS_BILLING_ENABLED() ? (
+                        <Button
+                          type="button"
+                          variant="secondary"
+                          onClick={() => setStep('billing')}
+                        >
+                          <Trans>Back</Trans>
+                        </Button>
+                      ) : (
+                        <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                          <Trans>Cancel</Trans>
+                        </Button>
+                      )}
+
+                      <Button
+                        type="submit"
+                        data-testid="dialog-create-organisation-button"
+                        loading={form.formState.isSubmitting}
+                      >
+                        {selectedPriceId ? <Trans>Checkout</Trans> : <Trans>Create</Trans>}
+                      </Button>
+                    </DialogFooter>
+                  </fieldset>
+                </form>
+              </Form>
+            </>
+          ))
+
+          .exhaustive()}
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+// This is separated from the internal claims constant because we need to use the msg
+// macro which would cause import issues.
+const internalClaimsDescription: {
+  [key in INTERNAL_CLAIM_ID]: MessageDescriptor | string;
+} = {
+  [INTERNAL_CLAIM_ID.FREE]: msg`5 Documents a month`,
+  [INTERNAL_CLAIM_ID.INDIVIDUAL]: msg`Unlimited documents, API and more`,
+  [INTERNAL_CLAIM_ID.TEAM]: msg`Embedding, 5 members included and more`,
+  [INTERNAL_CLAIM_ID.PLATFORM]: msg`Whitelabeling, unlimited members and more`,
+  [INTERNAL_CLAIM_ID.ENTERPRISE]: '',
+  [INTERNAL_CLAIM_ID.EARLY_ADOPTER]: '',
+};
+
+type BillingPlanFormProps = {
+  value: string;
+  onChange: (priceId: string) => void;
+  plans: InternalClaimPlans;
+  canCreateFreeOrganisation: boolean;
+};
+
+const BillingPlanForm = ({
+  value,
+  onChange,
+  plans,
+  canCreateFreeOrganisation,
+}: BillingPlanFormProps) => {
+  const { t } = useLingui();
+
+  const [billingPeriod, setBillingPeriod] = useState<'monthlyPrice' | 'yearlyPrice'>('yearlyPrice');
+
+  const dynamicPlans = useMemo(() => {
+    return [INTERNAL_CLAIM_ID.INDIVIDUAL, INTERNAL_CLAIM_ID.TEAM, INTERNAL_CLAIM_ID.PLATFORM].map(
+      (planId) => {
+        const plan = plans[planId];
+
+        return {
+          id: planId,
+          name: plan.name,
+          description: parseMessageDescriptorMacro(t, internalClaimsDescription[planId]),
+          monthlyPrice: plan.monthlyPrice,
+          yearlyPrice: plan.yearlyPrice,
+        };
+      },
+    );
+  }, [plans]);
+
+  useEffect(() => {
+    if (value === '' && !canCreateFreeOrganisation) {
+      onChange(dynamicPlans[0][billingPeriod]?.id ?? '');
+    }
+  }, [value]);
+
+  const onBillingPeriodChange = (billingPeriod: 'monthlyPrice' | 'yearlyPrice') => {
+    const plan = dynamicPlans.find((plan) => plan[billingPeriod]?.id === value);
+
+    setBillingPeriod(billingPeriod);
+
+    onChange(plan?.[billingPeriod]?.id ?? Object.keys(plans)[0]);
+  };
+
+  return (
+    <div className="space-y-4">
+      <Tabs
+        className="flex w-full items-center justify-center"
+        defaultValue="monthlyPrice"
+        value={billingPeriod}
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        onValueChange={(value) => onBillingPeriodChange(value as 'monthlyPrice' | 'yearlyPrice')}
+      >
+        <TabsList className="flex w-full justify-center">
+          <TabsTrigger className="w-full" value="monthlyPrice">
+            <Trans>Monthly</Trans>
+          </TabsTrigger>
+          <TabsTrigger className="w-full" value="yearlyPrice">
+            <Trans>Yearly</Trans>
+          </TabsTrigger>
+        </TabsList>
+      </Tabs>
+
+      <div className="mt-4 grid gap-4 text-sm">
+        <button
+          onClick={() => onChange('')}
+          className={cn(
+            'hover:border-primary flex cursor-pointer items-center space-x-2 rounded-md border p-4 transition-all hover:shadow-sm',
+            {
+              'ring-primary/10 border-primary ring-2 ring-offset-1': '' === value,
+            },
+          )}
+          disabled={!canCreateFreeOrganisation}
+        >
+          <div className="w-full text-left">
+            <div className="flex items-center justify-between">
+              <p className="text-medium">
+                <Trans>Free</Trans>
+              </p>
+
+              <Badge size="small" variant="neutral" className="ml-1.5">
+                {canCreateFreeOrganisation ? (
+                  <Trans>1 Free organisations left</Trans>
+                ) : (
+                  <Trans>0 Free organisations left</Trans>
+                )}
+              </Badge>
+            </div>
+
+            <div className="text-muted-foreground">
+              <Trans>5 documents a month</Trans>
+            </div>
+          </div>
+        </button>
+
+        {dynamicPlans.map((plan) => (
+          <button
+            key={plan[billingPeriod]?.id}
+            onClick={() => onChange(plan[billingPeriod]?.id ?? '')}
+            className={cn(
+              'hover:border-primary flex cursor-pointer items-center space-x-2 rounded-md border p-4 transition-all hover:shadow-sm',
+              {
+                'ring-primary/10 border-primary ring-2 ring-offset-1':
+                  plan[billingPeriod]?.id === value,
+              },
+            )}
+          >
+            <div className="w-full text-left">
+              <p className="font-medium">{plan.name}</p>
+              <p className="text-muted-foreground">{plan.description}</p>
+            </div>
+            <div className="whitespace-nowrap text-right text-sm font-medium">
+              <p>{plan[billingPeriod]?.friendlyPrice}</p>
+              <span className="text-muted-foreground text-xs">
+                {billingPeriod === 'monthlyPrice' ? (
+                  <Trans>per month</Trans>
+                ) : (
+                  <Trans>per year</Trans>
+                )}
+              </span>
+            </div>
+          </button>
+        ))}
+
+        <Link
+          to="https://documen.so/enterprise-cta"
+          target="_blank"
+          className="bg-muted/30 flex items-center space-x-2 rounded-md border p-4"
+        >
+          <div className="flex-1 font-normal">
+            <p className="text-muted-foreground font-medium">
+              <Trans>Enterprise</Trans>
+            </p>
+            <p className="text-muted-foreground flex flex-row items-center gap-1">
+              <Trans>Contact sales here</Trans>
+              <ExternalLinkIcon className="h-4 w-4" />
+            </p>
+          </div>
+        </Link>
+      </div>
+
+      <div className="mt-6 text-center">
+        <Link
+          to="https://documenso.com/pricing"
+          className="text-primary hover:text-primary/80 flex items-center justify-center gap-1 text-sm hover:underline"
+          target="_blank"
+        >
+          <Trans>Compare all plans and features in detail</Trans>
+          <ExternalLinkIcon className="h-4 w-4" />
+        </Link>
+      </div>
+    </div>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/organisation-delete-dialog.tsx b/apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
new file mode 100644
index 000000000..10b53833b
--- /dev/null
+++ b/apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
@@ -0,0 +1,166 @@
+import { useEffect, useState } from 'react';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { useForm } from 'react-hook-form';
+import { useNavigate } from 'react-router';
+import { z } from 'zod';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { AppError } from '@documenso/lib/errors/app-error';
+import { trpc } from '@documenso/trpc/react';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+export type OrganisationDeleteDialogProps = {
+  trigger?: React.ReactNode;
+};
+
+export const OrganisationDeleteDialog = ({ trigger }: OrganisationDeleteDialogProps) => {
+  const navigate = useNavigate();
+  const [open, setOpen] = useState(false);
+
+  const { _ } = useLingui();
+  const { toast } = useToast();
+  const { refreshSession } = useSession();
+
+  const organisation = useCurrentOrganisation();
+
+  const deleteMessage = _(msg`delete ${organisation.name}`);
+
+  const ZDeleteOrganisationFormSchema = z.object({
+    organisationName: z.literal(deleteMessage, {
+      errorMap: () => ({ message: _(msg`You must enter '${deleteMessage}' to proceed`) }),
+    }),
+  });
+
+  const form = useForm({
+    resolver: zodResolver(ZDeleteOrganisationFormSchema),
+    defaultValues: {
+      organisationName: '',
+    },
+  });
+
+  const { mutateAsync: deleteOrganisation } = trpc.organisation.delete.useMutation();
+
+  const onFormSubmit = async () => {
+    try {
+      await deleteOrganisation({ organisationId: organisation.id });
+
+      toast({
+        title: _(msg`Success`),
+        description: _(msg`Your organisation has been successfully deleted.`),
+        duration: 5000,
+      });
+
+      await navigate('/settings/organisations');
+      await refreshSession();
+
+      setOpen(false);
+    } catch (err) {
+      const error = AppError.parseError(err);
+      console.error(error);
+
+      toast({
+        title: _(msg`An unknown error occurred`),
+        description: _(
+          msg`We encountered an unknown error while attempting to delete this organisation. Please try again later.`,
+        ),
+        variant: 'destructive',
+        duration: 10000,
+      });
+    }
+  };
+
+  useEffect(() => {
+    if (!open) {
+      form.reset();
+    }
+  }, [open, form]);
+
+  return (
+    <Dialog open={open} onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}>
+      <DialogTrigger asChild>
+        {trigger ?? (
+          <Button variant="destructive">
+            <Trans>Delete</Trans>
+          </Button>
+        )}
+      </DialogTrigger>
+
+      <DialogContent position="center">
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Are you sure you wish to delete this organisation?</Trans>
+          </DialogTitle>
+
+          <DialogDescription>
+            <Trans>
+              You are about to delete <span className="font-semibold">{organisation.name}</span>.
+              All data related to this organisation such as teams, documents, and all other
+              resources will be deleted. This action is irreversible.
+            </Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onFormSubmit)}>
+            <fieldset
+              className="flex h-full flex-col space-y-4"
+              disabled={form.formState.isSubmitting}
+            >
+              <FormField
+                control={form.control}
+                name="organisationName"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <Trans>
+                        Confirm by typing <span className="text-destructive">{deleteMessage}</span>
+                      </Trans>
+                    </FormLabel>
+                    <FormControl>
+                      <Input className="bg-background" {...field} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <DialogFooter>
+                <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                  <Trans>Cancel</Trans>
+                </Button>
+
+                <Button type="submit" variant="destructive" loading={form.formState.isSubmitting}>
+                  <Trans>Delete</Trans>
+                </Button>
+              </DialogFooter>
+            </fieldset>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx b/apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
new file mode 100644
index 000000000..4f80b318a
--- /dev/null
+++ b/apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
@@ -0,0 +1,251 @@
+import { useEffect, useState } from 'react';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useLingui } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
+import { OrganisationMemberRole } from '@prisma/client';
+import type * as DialogPrimitive from '@radix-ui/react-dialog';
+import { useForm } from 'react-hook-form';
+import type { z } from 'zod';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { ORGANISATION_MEMBER_ROLE_HIERARCHY } from '@documenso/lib/constants/organisations';
+import { EXTENDED_ORGANISATION_MEMBER_ROLE_MAP } from '@documenso/lib/constants/organisations-translations';
+import { AppError } from '@documenso/lib/errors/app-error';
+import { trpc } from '@documenso/trpc/react';
+import { ZCreateOrganisationGroupRequestSchema } from '@documenso/trpc/server/organisation-router/create-organisation-group.types';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+import { MultiSelectCombobox } from '@documenso/ui/primitives/multi-select-combobox';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@documenso/ui/primitives/select';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+export type OrganisationGroupCreateDialogProps = {
+  trigger?: React.ReactNode;
+} & Omit<DialogPrimitive.DialogProps, 'children'>;
+
+const ZCreateOrganisationGroupFormSchema = ZCreateOrganisationGroupRequestSchema.pick({
+  name: true,
+  memberIds: true,
+  organisationRole: true,
+});
+
+type TCreateOrganisationGroupFormSchema = z.infer<typeof ZCreateOrganisationGroupFormSchema>;
+
+export const OrganisationGroupCreateDialog = ({
+  trigger,
+  ...props
+}: OrganisationGroupCreateDialogProps) => {
+  const { t } = useLingui();
+  const { toast } = useToast();
+
+  const [open, setOpen] = useState(false);
+  const organisation = useCurrentOrganisation();
+
+  const form = useForm({
+    resolver: zodResolver(ZCreateOrganisationGroupFormSchema),
+    defaultValues: {
+      name: '',
+      organisationRole: OrganisationMemberRole.MEMBER,
+      memberIds: [],
+    },
+  });
+
+  const { mutateAsync: createOrganisationGroup } = trpc.organisation.group.create.useMutation();
+
+  const { data: membersFindResult, isLoading: isLoadingMembers } =
+    trpc.organisation.member.find.useQuery({
+      organisationId: organisation.id,
+    });
+
+  const members = membersFindResult?.data ?? [];
+
+  const onFormSubmit = async ({
+    name,
+    organisationRole,
+    memberIds,
+  }: TCreateOrganisationGroupFormSchema) => {
+    try {
+      await createOrganisationGroup({
+        organisationId: organisation.id,
+        name,
+        organisationRole,
+        memberIds,
+      });
+
+      setOpen(false);
+
+      toast({
+        title: t`Success`,
+        description: t`Group has been created.`,
+        duration: 5000,
+      });
+    } catch (err) {
+      const error = AppError.parseError(err);
+
+      console.error(error);
+
+      toast({
+        title: t`An unknown error occurred`,
+        description: t`We encountered an unknown error while attempting to create a group. Please try again later.`,
+        variant: 'destructive',
+      });
+    }
+  };
+
+  useEffect(() => {
+    form.reset();
+  }, [open, form]);
+
+  return (
+    <Dialog
+      {...props}
+      open={open}
+      onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}
+    >
+      <DialogTrigger onClick={(e) => e.stopPropagation()} asChild={true}>
+        {trigger ?? (
+          <Button className="flex-shrink-0" variant="secondary">
+            <Trans>Create group</Trans>
+          </Button>
+        )}
+      </DialogTrigger>
+
+      <DialogContent position="center">
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Create group</Trans>
+          </DialogTitle>
+
+          <DialogDescription>
+            <Trans>Organise your members into groups which can be assigned to teams</Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onFormSubmit)}>
+            <fieldset
+              className="flex h-full flex-col space-y-4"
+              disabled={form.formState.isSubmitting}
+            >
+              <FormField
+                control={form.control}
+                name="name"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel required>
+                      <Trans>Group Name</Trans>
+                    </FormLabel>
+                    <FormControl>
+                      <Input className="bg-background" {...field} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name="organisationRole"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel required>
+                      <Trans>Organisation role</Trans>
+                    </FormLabel>
+                    <FormControl>
+                      <Select {...field} onValueChange={field.onChange}>
+                        <SelectTrigger className="text-muted-foreground w-full">
+                          <SelectValue />
+                        </SelectTrigger>
+
+                        <SelectContent position="popper">
+                          {ORGANISATION_MEMBER_ROLE_HIERARCHY[
+                            organisation.currentOrganisationRole
+                          ].map((role) => (
+                            <SelectItem key={role} value={role}>
+                              {t(EXTENDED_ORGANISATION_MEMBER_ROLE_MAP[role]) ?? role}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    </FormControl>
+                    <FormMessage />
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name="memberIds"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <Trans>Members</Trans>
+                    </FormLabel>
+
+                    <FormControl>
+                      <MultiSelectCombobox
+                        options={members.map((member) => ({
+                          label: member.name,
+                          value: member.id,
+                        }))}
+                        loading={isLoadingMembers}
+                        selectedValues={field.value}
+                        onChange={field.onChange}
+                        className="bg-background w-full"
+                        emptySelectionPlaceholder={t`Select members`}
+                      />
+                    </FormControl>
+
+                    <FormDescription>
+                      <Trans>Select the members to add to this group</Trans>
+                    </FormDescription>
+                  </FormItem>
+                )}
+              />
+
+              <DialogFooter>
+                <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                  <Trans>Cancel</Trans>
+                </Button>
+
+                <Button
+                  type="submit"
+                  data-testid="dialog-create-organisation-button"
+                  loading={form.formState.isSubmitting}
+                >
+                  <Trans>Create</Trans>
+                </Button>
+              </DialogFooter>
+            </fieldset>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx b/apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
new file mode 100644
index 000000000..17a389622
--- /dev/null
+++ b/apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
@@ -0,0 +1,117 @@
+import { useState } from 'react';
+
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { trpc } from '@documenso/trpc/react';
+import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+export type OrganisationGroupDeleteDialogProps = {
+  organisationGroupId: string;
+  organisationGroupName: string;
+  trigger?: React.ReactNode;
+};
+
+export const OrganisationGroupDeleteDialog = ({
+  trigger,
+  organisationGroupId,
+  organisationGroupName,
+}: OrganisationGroupDeleteDialogProps) => {
+  const [open, setOpen] = useState(false);
+
+  const { _ } = useLingui();
+  const { toast } = useToast();
+
+  const organisation = useCurrentOrganisation();
+
+  const { mutateAsync: deleteGroup, isPending: isDeleting } =
+    trpc.organisation.group.delete.useMutation({
+      onSuccess: () => {
+        toast({
+          title: _(msg`Success`),
+          description: _(msg`You have successfully removed this group from the organisation.`),
+          duration: 5000,
+        });
+
+        setOpen(false);
+      },
+      onError: () => {
+        toast({
+          title: _(msg`An unknown error occurred`),
+          description: _(
+            msg`We encountered an unknown error while attempting to remove this group. Please try again later.`,
+          ),
+          variant: 'destructive',
+          duration: 10000,
+        });
+      },
+    });
+
+  return (
+    <Dialog open={open} onOpenChange={(value) => !isDeleting && setOpen(value)}>
+      <DialogTrigger asChild>
+        {trigger ?? (
+          <Button variant="secondary">
+            <Trans>Delete organisation group</Trans>
+          </Button>
+        )}
+      </DialogTrigger>
+
+      <DialogContent position="center">
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Are you sure?</Trans>
+          </DialogTitle>
+
+          <DialogDescription className="mt-4">
+            <Trans>
+              You are about to remove the following group from{' '}
+              <span className="font-semibold">{organisation.name}</span>.
+            </Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        <Alert variant="neutral">
+          <AlertDescription className="text-center font-semibold">
+            {organisationGroupName}
+          </AlertDescription>
+        </Alert>
+
+        <fieldset disabled={isDeleting}>
+          <DialogFooter>
+            <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+              <Trans>Cancel</Trans>
+            </Button>
+
+            <Button
+              type="submit"
+              variant="destructive"
+              loading={isDeleting}
+              onClick={async () =>
+                deleteGroup({
+                  organisationId: organisation.id,
+                  groupId: organisationGroupId,
+                })
+              }
+            >
+              <Trans>Delete</Trans>
+            </Button>
+          </DialogFooter>
+        </fieldset>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/organisation-leave-dialog.tsx b/apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
new file mode 100644
index 000000000..fb1c7a914
--- /dev/null
+++ b/apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
@@ -0,0 +1,115 @@
+import { useState } from 'react';
+
+import { useLingui } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
+import type { OrganisationMemberRole } from '@prisma/client';
+
+import { ORGANISATION_MEMBER_ROLE_MAP } from '@documenso/lib/constants/organisations-translations';
+import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
+import { trpc } from '@documenso/trpc/react';
+import { Alert } from '@documenso/ui/primitives/alert';
+import { AvatarWithText } from '@documenso/ui/primitives/avatar';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+export type OrganisationLeaveDialogProps = {
+  organisationId: string;
+  organisationName: string;
+  organisationAvatarImageId?: string | null;
+  role: OrganisationMemberRole;
+  trigger?: React.ReactNode;
+};
+
+export const OrganisationLeaveDialog = ({
+  trigger,
+  organisationId,
+  organisationName,
+  organisationAvatarImageId,
+  role,
+}: OrganisationLeaveDialogProps) => {
+  const [open, setOpen] = useState(false);
+
+  const { t } = useLingui();
+  const { toast } = useToast();
+
+  const { mutateAsync: leaveOrganisation, isPending: isLeavingOrganisation } =
+    trpc.organisation.leave.useMutation({
+      onSuccess: () => {
+        toast({
+          title: t`Success`,
+          description: t`You have successfully left this organisation.`,
+          duration: 5000,
+        });
+
+        setOpen(false);
+      },
+      onError: () => {
+        toast({
+          title: t`An unknown error occurred`,
+          description: t`We encountered an unknown error while attempting to leave this organisation. Please try again later.`,
+          variant: 'destructive',
+          duration: 10000,
+        });
+      },
+    });
+
+  return (
+    <Dialog open={open} onOpenChange={(value) => !isLeavingOrganisation && setOpen(value)}>
+      <DialogTrigger asChild>
+        {trigger ?? (
+          <Button variant="destructive">
+            <Trans>Leave organisation</Trans>
+          </Button>
+        )}
+      </DialogTrigger>
+
+      <DialogContent position="center">
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Are you sure?</Trans>
+          </DialogTitle>
+
+          <DialogDescription className="mt-4">
+            <Trans>You are about to leave the following organisation.</Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        <Alert variant="neutral" padding="tight">
+          <AvatarWithText
+            avatarClass="h-12 w-12"
+            avatarSrc={formatAvatarUrl(organisationAvatarImageId)}
+            avatarFallback={organisationName.slice(0, 1).toUpperCase()}
+            primaryText={organisationName}
+            secondaryText={t(ORGANISATION_MEMBER_ROLE_MAP[role])}
+          />
+        </Alert>
+
+        <fieldset disabled={isLeavingOrganisation}>
+          <DialogFooter>
+            <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+              <Trans>Cancel</Trans>
+            </Button>
+
+            <Button
+              type="submit"
+              variant="destructive"
+              loading={isLeavingOrganisation}
+              onClick={async () => leaveOrganisation({ organisationId })}
+            >
+              <Trans>Leave</Trans>
+            </Button>
+          </DialogFooter>
+        </fieldset>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx b/apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
new file mode 100644
index 000000000..a46151d3b
--- /dev/null
+++ b/apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
@@ -0,0 +1,123 @@
+import { useState } from 'react';
+
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { trpc } from '@documenso/trpc/react';
+import { Alert } from '@documenso/ui/primitives/alert';
+import { AvatarWithText } from '@documenso/ui/primitives/avatar';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+export type OrganisationMemberDeleteDialogProps = {
+  organisationMemberId: string;
+  organisationMemberName: string;
+  organisationMemberEmail: string;
+  trigger?: React.ReactNode;
+};
+
+export const OrganisationMemberDeleteDialog = ({
+  trigger,
+  organisationMemberId,
+  organisationMemberName,
+  organisationMemberEmail,
+}: OrganisationMemberDeleteDialogProps) => {
+  const [open, setOpen] = useState(false);
+
+  const { _ } = useLingui();
+  const { toast } = useToast();
+
+  const organisation = useCurrentOrganisation();
+
+  const { mutateAsync: deleteOrganisationMembers, isPending: isDeletingOrganisationMember } =
+    trpc.organisation.member.delete.useMutation({
+      onSuccess: () => {
+        toast({
+          title: _(msg`Success`),
+          description: _(msg`You have successfully removed this user from the organisation.`),
+          duration: 5000,
+        });
+
+        setOpen(false);
+      },
+      onError: () => {
+        toast({
+          title: _(msg`An unknown error occurred`),
+          description: _(
+            msg`We encountered an unknown error while attempting to remove this user. Please try again later.`,
+          ),
+          variant: 'destructive',
+          duration: 10000,
+        });
+      },
+    });
+
+  return (
+    <Dialog open={open} onOpenChange={(value) => !isDeletingOrganisationMember && setOpen(value)}>
+      <DialogTrigger asChild>
+        {trigger ?? (
+          <Button variant="secondary">
+            <Trans>Delete organisation member</Trans>
+          </Button>
+        )}
+      </DialogTrigger>
+
+      <DialogContent position="center">
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Are you sure?</Trans>
+          </DialogTitle>
+
+          <DialogDescription className="mt-4">
+            <Trans>
+              You are about to remove the following user from{' '}
+              <span className="font-semibold">{organisation.name}</span>.
+            </Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        <Alert variant="neutral" padding="tight">
+          <AvatarWithText
+            avatarClass="h-12 w-12"
+            avatarFallback={organisationMemberName.slice(0, 1).toUpperCase()}
+            primaryText={<span className="font-semibold">{organisationMemberName}</span>}
+            secondaryText={organisationMemberEmail}
+          />
+        </Alert>
+
+        <fieldset disabled={isDeletingOrganisationMember}>
+          <DialogFooter>
+            <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+              <Trans>Cancel</Trans>
+            </Button>
+
+            <Button
+              type="submit"
+              variant="destructive"
+              loading={isDeletingOrganisationMember}
+              onClick={async () =>
+                deleteOrganisationMembers({
+                  organisationId: organisation.id,
+                  organisationMemberId,
+                })
+              }
+            >
+              <Trans>Delete</Trans>
+            </Button>
+          </DialogFooter>
+        </fieldset>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx b/apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
new file mode 100644
index 000000000..1009ef4e6
--- /dev/null
+++ b/apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
@@ -0,0 +1,478 @@
+import { useEffect, useMemo, useRef, useState } from 'react';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { OrganisationMemberRole } from '@prisma/client';
+import type * as DialogPrimitive from '@radix-ui/react-dialog';
+import { Download, Mail, MailIcon, PlusCircle, Trash, Upload, UsersIcon } from 'lucide-react';
+import Papa, { type ParseResult } from 'papaparse';
+import { useFieldArray, useForm } from 'react-hook-form';
+import { z } from 'zod';
+
+import { downloadFile } from '@documenso/lib/client-only/download-file';
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { ORGANISATION_MEMBER_ROLE_HIERARCHY } from '@documenso/lib/constants/organisations';
+import { ORGANISATION_MEMBER_ROLE_MAP } from '@documenso/lib/constants/organisations-translations';
+import { INTERNAL_CLAIM_ID } from '@documenso/lib/types/subscription';
+import { trpc } from '@documenso/trpc/react';
+import { ZCreateOrganisationMemberInvitesRequestSchema } from '@documenso/trpc/server/organisation-router/create-organisation-member-invites.types';
+import { cn } from '@documenso/ui/lib/utils';
+import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
+import { Button } from '@documenso/ui/primitives/button';
+import { Card, CardContent } from '@documenso/ui/primitives/card';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@documenso/ui/primitives/select';
+import { SpinnerBox } from '@documenso/ui/primitives/spinner';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+export type OrganisationMemberInviteDialogProps = {
+  trigger?: React.ReactNode;
+} & Omit<DialogPrimitive.DialogProps, 'children'>;
+
+const ZInviteOrganisationMembersFormSchema = z
+  .object({
+    invitations: ZCreateOrganisationMemberInvitesRequestSchema.shape.invitations,
+  })
+  // Display exactly which rows are duplicates.
+  .superRefine((items, ctx) => {
+    const uniqueEmails = new Map<string, number>();
+
+    for (const [index, invitation] of items.invitations.entries()) {
+      const email = invitation.email.toLowerCase();
+
+      const firstFoundIndex = uniqueEmails.get(email);
+
+      if (firstFoundIndex === undefined) {
+        uniqueEmails.set(email, index);
+        continue;
+      }
+
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: 'Emails must be unique',
+        path: ['invitations', index, 'email'],
+      });
+
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: 'Emails must be unique',
+        path: ['invitations', firstFoundIndex, 'email'],
+      });
+    }
+  });
+
+type TInviteOrganisationMembersFormSchema = z.infer<typeof ZInviteOrganisationMembersFormSchema>;
+
+type TabTypes = 'INDIVIDUAL' | 'BULK';
+
+const ZImportOrganisationMemberSchema = z.array(
+  z.object({
+    email: z.string().email(),
+    organisationRole: z.nativeEnum(OrganisationMemberRole),
+  }),
+);
+
+export const OrganisationMemberInviteDialog = ({
+  trigger,
+  ...props
+}: OrganisationMemberInviteDialogProps) => {
+  const [open, setOpen] = useState(false);
+  const fileInputRef = useRef<HTMLInputElement>(null);
+  const [invitationType, setInvitationType] = useState<TabTypes>('INDIVIDUAL');
+
+  const { _ } = useLingui();
+  const { toast } = useToast();
+
+  const organisation = useCurrentOrganisation();
+
+  const form = useForm<TInviteOrganisationMembersFormSchema>({
+    resolver: zodResolver(ZInviteOrganisationMembersFormSchema),
+    defaultValues: {
+      invitations: [
+        {
+          email: '',
+          organisationRole: OrganisationMemberRole.MEMBER,
+        },
+      ],
+    },
+  });
+
+  const {
+    append: appendOrganisationMemberInvite,
+    fields: organisationMemberInvites,
+    remove: removeOrganisationMemberInvite,
+  } = useFieldArray({
+    control: form.control,
+    name: 'invitations',
+  });
+
+  const { mutateAsync: createOrganisationMemberInvites } =
+    trpc.organisation.member.invite.createMany.useMutation();
+
+  const { data: fullOrganisation } = trpc.organisation.get.useQuery({
+    organisationReference: organisation.id,
+  });
+
+  const onAddOrganisationMemberInvite = () => {
+    appendOrganisationMemberInvite({
+      email: '',
+      organisationRole: OrganisationMemberRole.MEMBER,
+    });
+  };
+
+  const onFormSubmit = async ({ invitations }: TInviteOrganisationMembersFormSchema) => {
+    try {
+      await createOrganisationMemberInvites({
+        organisationId: organisation.id,
+        invitations,
+      });
+
+      toast({
+        title: _(msg`Success`),
+        description: _(msg`Organisation invitations have been sent.`),
+        duration: 5000,
+      });
+
+      setOpen(false);
+    } catch {
+      toast({
+        title: _(msg`An unknown error occurred`),
+        description: _(
+          msg`We encountered an unknown error while attempting to invite organisation members. Please try again later.`,
+        ),
+        variant: 'destructive',
+      });
+    }
+  };
+
+  const dialogState = useMemo(() => {
+    if (!fullOrganisation) {
+      return 'loading';
+    }
+
+    if (!IS_BILLING_ENABLED()) {
+      return 'form';
+    }
+
+    if (fullOrganisation.organisationClaim.memberCount === 0) {
+      return 'form';
+    }
+
+    // This is probably going to screw us over in the future.
+    if (fullOrganisation.organisationClaim.originalSubscriptionClaimId !== INTERNAL_CLAIM_ID.TEAM) {
+      return 'alert';
+    }
+
+    return 'form';
+  }, [fullOrganisation]);
+
+  useEffect(() => {
+    if (!open) {
+      form.reset();
+      setInvitationType('INDIVIDUAL');
+    }
+  }, [open, form]);
+
+  const onFileInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    if (!e.target.files?.length) {
+      return;
+    }
+
+    const csvFile = e.target.files[0];
+
+    Papa.parse(csvFile, {
+      skipEmptyLines: true,
+      comments: 'Work email,Job title',
+      complete: (results: ParseResult<string[]>) => {
+        const members = results.data.map((row) => {
+          const [email, role] = row;
+
+          return {
+            email: email.trim(),
+            organisationRole: role.trim().toUpperCase(),
+          };
+        });
+
+        // Remove the first row if it contains the headers.
+        if (members.length > 1 && members[0].organisationRole.toUpperCase() === 'ROLE') {
+          members.shift();
+        }
+
+        try {
+          const importedInvitations = ZImportOrganisationMemberSchema.parse(members);
+
+          form.setValue('invitations', importedInvitations);
+          form.clearErrors('invitations');
+
+          setInvitationType('INDIVIDUAL');
+        } catch (err) {
+          console.error(err);
+
+          toast({
+            title: _(msg`Something went wrong`),
+            description: _(
+              msg`Please check the CSV file and make sure it is according to our format`,
+            ),
+            variant: 'destructive',
+          });
+        }
+      },
+    });
+  };
+
+  const downloadTemplate = () => {
+    const data = [
+      { email: 'admin@documenso.com', role: 'Admin' },
+      { email: 'manager@documenso.com', role: 'Manager' },
+      { email: 'member@documenso.com', role: 'Member' },
+    ];
+
+    const csvContent =
+      'Email address,Role\n' + data.map((row) => `${row.email},${row.role}`).join('\n');
+
+    const blob = new Blob([csvContent], {
+      type: 'text/csv',
+    });
+
+    downloadFile({
+      filename: 'documenso-organisation-member-invites-template.csv',
+      data: blob,
+    });
+  };
+
+  return (
+    <Dialog
+      {...props}
+      open={open}
+      onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}
+    >
+      <DialogTrigger onClick={(e) => e.stopPropagation()} asChild>
+        {trigger ?? (
+          <Button variant="secondary">
+            <Trans>Invite member</Trans>
+          </Button>
+        )}
+      </DialogTrigger>
+
+      <DialogContent position="center">
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Invite organisation members</Trans>
+          </DialogTitle>
+
+          <DialogDescription className="mt-4">
+            <Trans>An email containing an invitation will be sent to each member.</Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        {dialogState === 'loading' && <SpinnerBox className="py-32" />}
+
+        {dialogState === 'alert' && (
+          <>
+            <Alert
+              className="flex flex-col justify-between p-6 sm:flex-row sm:items-center"
+              variant="neutral"
+            >
+              <AlertDescription>
+                <Trans>
+                  Your plan does not support inviting members. Please upgrade or your plan or
+                  contact sales at <a href="mailto:support@documenso.com">support@documenso.com</a>{' '}
+                  if you would like to discuss your options.
+                </Trans>
+              </AlertDescription>
+            </Alert>
+
+            <DialogFooter>
+              <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                <Trans>Cancel</Trans>
+              </Button>
+            </DialogFooter>
+          </>
+        )}
+
+        {dialogState === 'form' && (
+          <Tabs
+            defaultValue="INDIVIDUAL"
+            value={invitationType}
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            onValueChange={(value) => setInvitationType(value as TabTypes)}
+          >
+            <TabsList className="w-full">
+              <TabsTrigger value="INDIVIDUAL" className="hover:text-foreground w-full">
+                <MailIcon size={20} className="mr-2" />
+                <Trans>Invite Members</Trans>
+              </TabsTrigger>
+
+              <TabsTrigger value="BULK" className="hover:text-foreground w-full">
+                <UsersIcon size={20} className="mr-2" /> <Trans>Bulk Import</Trans>
+              </TabsTrigger>
+            </TabsList>
+
+            <TabsContent value="INDIVIDUAL">
+              <Form {...form}>
+                <form onSubmit={form.handleSubmit(onFormSubmit)}>
+                  <fieldset
+                    className="flex h-full flex-col space-y-4"
+                    disabled={form.formState.isSubmitting}
+                  >
+                    <div className="custom-scrollbar -m-1 max-h-[60vh] space-y-4 overflow-y-auto p-1">
+                      {organisationMemberInvites.map((organisationMemberInvite, index) => (
+                        <div
+                          className="flex w-full flex-row space-x-4"
+                          key={organisationMemberInvite.id}
+                        >
+                          <FormField
+                            control={form.control}
+                            name={`invitations.${index}.email`}
+                            render={({ field }) => (
+                              <FormItem className="w-full">
+                                {index === 0 && (
+                                  <FormLabel required>
+                                    <Trans>Email address</Trans>
+                                  </FormLabel>
+                                )}
+                                <FormControl>
+                                  <Input className="bg-background" {...field} />
+                                </FormControl>
+                                <FormMessage />
+                              </FormItem>
+                            )}
+                          />
+
+                          <FormField
+                            control={form.control}
+                            name={`invitations.${index}.organisationRole`}
+                            render={({ field }) => (
+                              <FormItem className="w-full">
+                                {index === 0 && (
+                                  <FormLabel required>
+                                    <Trans>Organisation Role</Trans>
+                                  </FormLabel>
+                                )}
+                                <FormControl>
+                                  <Select {...field} onValueChange={field.onChange}>
+                                    <SelectTrigger className="text-muted-foreground max-w-[200px]">
+                                      <SelectValue />
+                                    </SelectTrigger>
+
+                                    <SelectContent position="popper">
+                                      {ORGANISATION_MEMBER_ROLE_HIERARCHY[
+                                        organisation.currentOrganisationRole
+                                      ].map((role) => (
+                                        <SelectItem key={role} value={role}>
+                                          {_(ORGANISATION_MEMBER_ROLE_MAP[role]) ?? role}
+                                        </SelectItem>
+                                      ))}
+                                    </SelectContent>
+                                  </Select>
+                                </FormControl>
+                                <FormMessage />
+                              </FormItem>
+                            )}
+                          />
+
+                          <button
+                            type="button"
+                            className={cn(
+                              'justify-left inline-flex h-10 w-10 items-center text-slate-500 hover:opacity-80 disabled:cursor-not-allowed disabled:opacity-50',
+                              index === 0 ? 'mt-8' : 'mt-0',
+                            )}
+                            disabled={organisationMemberInvites.length === 1}
+                            onClick={() => removeOrganisationMemberInvite(index)}
+                          >
+                            <Trash className="h-5 w-5" />
+                          </button>
+                        </div>
+                      ))}
+                    </div>
+
+                    <Button
+                      type="button"
+                      size="sm"
+                      variant="outline"
+                      className="w-fit"
+                      onClick={() => onAddOrganisationMemberInvite()}
+                    >
+                      <PlusCircle className="mr-2 h-4 w-4" />
+                      <Trans>Add more</Trans>
+                    </Button>
+
+                    <DialogFooter>
+                      <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                        <Trans>Cancel</Trans>
+                      </Button>
+
+                      <Button type="submit" loading={form.formState.isSubmitting}>
+                        {!form.formState.isSubmitting && <Mail className="mr-2 h-4 w-4" />}
+                        <Trans>Invite</Trans>
+                      </Button>
+                    </DialogFooter>
+                  </fieldset>
+                </form>
+              </Form>
+            </TabsContent>
+
+            <TabsContent value="BULK">
+              <div className="mt-4 space-y-4">
+                <Card gradient className="h-32">
+                  <CardContent
+                    className="text-muted-foreground/80 hover:text-muted-foreground/90 flex h-full cursor-pointer flex-col items-center justify-center rounded-lg p-0 transition-colors"
+                    onClick={() => fileInputRef.current?.click()}
+                  >
+                    <Upload className="h-5 w-5" />
+
+                    <p className="mt-1 text-sm">
+                      <Trans>Click here to upload</Trans>
+                    </p>
+
+                    <input
+                      onChange={onFileInputChange}
+                      type="file"
+                      ref={fileInputRef}
+                      accept=".csv"
+                      hidden
+                    />
+                  </CardContent>
+                </Card>
+
+                <DialogFooter>
+                  <Button type="button" variant="secondary" onClick={downloadTemplate}>
+                    <Download className="mr-2 h-4 w-4" />
+                    <Trans>Template</Trans>
+                  </Button>
+                </DialogFooter>
+              </div>
+            </TabsContent>
+          </Tabs>
+        )}
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx b/apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
new file mode 100644
index 000000000..07db162a2
--- /dev/null
+++ b/apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
@@ -0,0 +1,205 @@
+import { useEffect, useState } from 'react';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { OrganisationMemberRole } from '@prisma/client';
+import type * as DialogPrimitive from '@radix-ui/react-dialog';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+
+import { ORGANISATION_MEMBER_ROLE_HIERARCHY } from '@documenso/lib/constants/organisations';
+import { ORGANISATION_MEMBER_ROLE_MAP } from '@documenso/lib/constants/organisations-translations';
+import { isOrganisationRoleWithinUserHierarchy } from '@documenso/lib/utils/organisations';
+import { trpc } from '@documenso/trpc/react';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@documenso/ui/primitives/select';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+export type OrganisationMemberUpdateDialogProps = {
+  currentUserOrganisationRole: OrganisationMemberRole;
+  trigger?: React.ReactNode;
+  organisationId: string;
+  organisationMemberId: string;
+  organisationMemberName: string;
+  organisationMemberRole: OrganisationMemberRole;
+} & Omit<DialogPrimitive.DialogProps, 'children'>;
+
+const ZUpdateOrganisationMemberFormSchema = z.object({
+  role: z.nativeEnum(OrganisationMemberRole),
+});
+
+type ZUpdateOrganisationMemberSchema = z.infer<typeof ZUpdateOrganisationMemberFormSchema>;
+
+export const OrganisationMemberUpdateDialog = ({
+  currentUserOrganisationRole,
+  trigger,
+  organisationId,
+  organisationMemberId,
+  organisationMemberName,
+  organisationMemberRole,
+  ...props
+}: OrganisationMemberUpdateDialogProps) => {
+  const [open, setOpen] = useState(false);
+
+  const { _ } = useLingui();
+  const { toast } = useToast();
+
+  const form = useForm<ZUpdateOrganisationMemberSchema>({
+    resolver: zodResolver(ZUpdateOrganisationMemberFormSchema),
+    defaultValues: {
+      role: organisationMemberRole,
+    },
+  });
+
+  const { mutateAsync: updateOrganisationMember } = trpc.organisation.member.update.useMutation();
+
+  const onFormSubmit = async ({ role }: ZUpdateOrganisationMemberSchema) => {
+    try {
+      await updateOrganisationMember({
+        organisationId,
+        organisationMemberId,
+        data: {
+          role,
+        },
+      });
+
+      toast({
+        title: _(msg`Success`),
+        description: _(msg`You have updated ${organisationMemberName}.`),
+        duration: 5000,
+      });
+
+      setOpen(false);
+    } catch {
+      toast({
+        title: _(msg`An unknown error occurred`),
+        description: _(
+          msg`We encountered an unknown error while attempting to update this organisation member. Please try again later.`,
+        ),
+        variant: 'destructive',
+      });
+    }
+  };
+
+  useEffect(() => {
+    if (!open) {
+      return;
+    }
+
+    form.reset();
+
+    if (
+      !isOrganisationRoleWithinUserHierarchy(currentUserOrganisationRole, organisationMemberRole)
+    ) {
+      setOpen(false);
+
+      toast({
+        title: _(msg`You cannot modify a organisation member who has a higher role than you.`),
+        variant: 'destructive',
+      });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [open, currentUserOrganisationRole, organisationMemberRole, form, toast]);
+
+  return (
+    <Dialog
+      {...props}
+      open={open}
+      onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}
+    >
+      <DialogTrigger onClick={(e) => e.stopPropagation()} asChild>
+        {trigger ?? (
+          <Button variant="secondary">
+            <Trans>Update organisation member</Trans>
+          </Button>
+        )}
+      </DialogTrigger>
+
+      <DialogContent position="center">
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Update organisation member</Trans>
+          </DialogTitle>
+
+          <DialogDescription className="mt-4">
+            <Trans>
+              You are currently updating{' '}
+              <span className="font-bold">{organisationMemberName}.</span>
+            </Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onFormSubmit)}>
+            <fieldset className="flex h-full flex-col" disabled={form.formState.isSubmitting}>
+              <FormField
+                control={form.control}
+                name="role"
+                render={({ field }) => (
+                  <FormItem className="w-full">
+                    <FormLabel required>
+                      <Trans>Role</Trans>
+                    </FormLabel>
+                    <FormControl>
+                      <Select {...field} onValueChange={field.onChange}>
+                        <SelectTrigger className="text-muted-foreground">
+                          <SelectValue />
+                        </SelectTrigger>
+
+                        <SelectContent className="w-full" position="popper">
+                          {ORGANISATION_MEMBER_ROLE_HIERARCHY[currentUserOrganisationRole].map(
+                            (role) => (
+                              <SelectItem key={role} value={role}>
+                                {_(ORGANISATION_MEMBER_ROLE_MAP[role]) ?? role}
+                              </SelectItem>
+                            ),
+                          )}
+                        </SelectContent>
+                      </Select>
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <DialogFooter className="mt-4">
+                <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                  <Trans>Cancel</Trans>
+                </Button>
+
+                <Button type="submit" loading={form.formState.isSubmitting}>
+                  <Trans>Update</Trans>
+                </Button>
+              </DialogFooter>
+            </fieldset>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx b/apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
index d6a13f456..bcd624290 100644
--- a/apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+++ b/apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
@@ -49,7 +49,7 @@ import {
 import { Textarea } from '@documenso/ui/primitives/textarea';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 export type ManagePublicTemplateDialogProps = {
   directTemplates: (Template & {
@@ -95,7 +95,7 @@ export const ManagePublicTemplateDialog = ({
 
   const [open, onOpenChange] = useState(isOpen);
 
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const [selectedTemplateId, setSelectedTemplateId] = useState<number | null>(initialTemplateId);
 
diff --git a/apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx b/apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
deleted file mode 100644
index 038c78504..000000000
--- a/apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+++ /dev/null
@@ -1,188 +0,0 @@
-import { useMemo, useState } from 'react';
-
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import type * as DialogPrimitive from '@radix-ui/react-dialog';
-import { AnimatePresence, motion } from 'framer-motion';
-import { Loader, TagIcon } from 'lucide-react';
-
-import { trpc } from '@documenso/trpc/react';
-import { Button } from '@documenso/ui/primitives/button';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type TeamCheckoutCreateDialogProps = {
-  pendingTeamId: number | null;
-  onClose: () => void;
-} & Omit<DialogPrimitive.DialogProps, 'children'>;
-
-const MotionCard = motion(Card);
-
-export const TeamCheckoutCreateDialog = ({
-  pendingTeamId,
-  onClose,
-  ...props
-}: TeamCheckoutCreateDialogProps) => {
-  const { _ } = useLingui();
-  const { toast } = useToast();
-
-  const [interval, setInterval] = useState<'monthly' | 'yearly'>('monthly');
-
-  const { data, isLoading } = trpc.team.getTeamPrices.useQuery();
-
-  const { mutateAsync: createCheckout, isPending: isCreatingCheckout } =
-    trpc.team.createTeamPendingCheckout.useMutation({
-      onSuccess: (checkoutUrl) => {
-        window.open(checkoutUrl, '_blank');
-        onClose();
-      },
-      onError: () =>
-        toast({
-          title: _(msg`Something went wrong`),
-          description: _(
-            msg`We were unable to create a checkout session. Please try again, or contact support`,
-          ),
-          variant: 'destructive',
-        }),
-    });
-
-  const selectedPrice = useMemo(() => {
-    if (!data) {
-      return null;
-    }
-
-    return data[interval];
-  }, [data, interval]);
-
-  const handleOnOpenChange = (open: boolean) => {
-    if (pendingTeamId === null) {
-      return;
-    }
-
-    if (!open) {
-      onClose();
-    }
-  };
-
-  if (pendingTeamId === null) {
-    return null;
-  }
-
-  return (
-    <Dialog {...props} open={pendingTeamId !== null} onOpenChange={handleOnOpenChange}>
-      <DialogContent position="center">
-        <DialogHeader>
-          <DialogTitle>
-            <Trans>Team checkout</Trans>
-          </DialogTitle>
-
-          <DialogDescription className="mt-4">
-            <Trans>Payment is required to finalise the creation of your team.</Trans>
-          </DialogDescription>
-        </DialogHeader>
-
-        {(isLoading || !data) && (
-          <div className="flex h-20 items-center justify-center text-sm">
-            {isLoading ? (
-              <Loader className="text-documenso h-6 w-6 animate-spin" />
-            ) : (
-              <p>
-                <Trans>Something went wrong</Trans>
-              </p>
-            )}
-          </div>
-        )}
-
-        {data && selectedPrice && !isLoading && (
-          <div>
-            <Tabs
-              // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-              onValueChange={(value) => setInterval(value as 'monthly' | 'yearly')}
-              value={interval}
-              className="mb-4"
-            >
-              <TabsList className="w-full">
-                {[data.monthly, data.yearly].map((price) => (
-                  <TabsTrigger key={price.priceId} className="w-full" value={price.interval}>
-                    {price.friendlyInterval}
-                  </TabsTrigger>
-                ))}
-              </TabsList>
-            </Tabs>
-
-            <AnimatePresence mode="wait">
-              <MotionCard
-                key={selectedPrice.priceId}
-                initial={{ opacity: 0, y: 15 }}
-                animate={{ opacity: 1, y: 0, transition: { duration: 0.3 } }}
-                exit={{ opacity: 0, transition: { duration: 0.15 } }}
-              >
-                <CardContent className="flex h-full flex-col p-6">
-                  {selectedPrice.interval === 'monthly' ? (
-                    <div className="text-muted-foreground text-lg font-medium">
-                      $50 USD <span className="text-xs">per month</span>
-                    </div>
-                  ) : (
-                    <div className="text-muted-foreground flex items-center justify-between text-lg font-medium">
-                      <span>
-                        $480 USD <span className="text-xs">per year</span>
-                      </span>
-                      <div className="bg-primary text-primary-foreground ml-2 inline-flex flex-row items-center justify-center rounded px-2 py-1 text-xs">
-                        <TagIcon className="mr-1 h-4 w-4" />
-                        20% off
-                      </div>
-                    </div>
-                  )}
-
-                  <div className="text-muted-foreground mt-1.5 text-sm">
-                    <p>
-                      <Trans>This price includes minimum 5 seats.</Trans>
-                    </p>
-
-                    <p className="mt-1">
-                      <Trans>Adding and removing seats will adjust your invoice accordingly.</Trans>
-                    </p>
-                  </div>
-                </CardContent>
-              </MotionCard>
-            </AnimatePresence>
-
-            <DialogFooter className="mt-4">
-              <Button
-                type="button"
-                variant="secondary"
-                disabled={isCreatingCheckout}
-                onClick={() => onClose()}
-              >
-                <Trans>Cancel</Trans>
-              </Button>
-
-              <Button
-                type="submit"
-                loading={isCreatingCheckout}
-                onClick={async () =>
-                  createCheckout({
-                    interval: selectedPrice.interval,
-                    pendingTeamId,
-                  })
-                }
-              >
-                <Trans>Checkout</Trans>
-              </Button>
-            </DialogFooter>
-          </div>
-        )}
-      </DialogContent>
-    </Dialog>
-  );
-};
diff --git a/apps/remix/app/components/dialogs/team-create-dialog.tsx b/apps/remix/app/components/dialogs/team-create-dialog.tsx
index 0b49e9b6d..65740ce67 100644
--- a/apps/remix/app/components/dialogs/team-create-dialog.tsx
+++ b/apps/remix/app/components/dialogs/team-create-dialog.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import { msg } from '@lingui/core/macro';
@@ -7,15 +7,18 @@ import { Trans } from '@lingui/react/macro';
 import type * as DialogPrimitive from '@radix-ui/react-dialog';
 import { useForm } from 'react-hook-form';
 import { useSearchParams } from 'react-router';
-import { useNavigate } from 'react-router';
 import type { z } from 'zod';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { IS_BILLING_ENABLED, NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { trpc } from '@documenso/trpc/react';
-import { ZCreateTeamMutationSchema } from '@documenso/trpc/server/team-router/schema';
+import { ZCreateTeamRequestSchema } from '@documenso/trpc/server/team-router/create-team.types';
+import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
+import { Checkbox } from '@documenso/ui/primitives/checkbox';
 import {
   Dialog,
   DialogContent,
@@ -34,29 +37,37 @@ import {
   FormMessage,
 } from '@documenso/ui/primitives/form/form';
 import { Input } from '@documenso/ui/primitives/input';
+import { SpinnerBox } from '@documenso/ui/primitives/spinner';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export type TeamCreateDialogProps = {
   trigger?: React.ReactNode;
+  onCreated?: () => Promise<void>;
 } & Omit<DialogPrimitive.DialogProps, 'children'>;
 
-const ZCreateTeamFormSchema = ZCreateTeamMutationSchema.pick({
+const ZCreateTeamFormSchema = ZCreateTeamRequestSchema.pick({
   teamName: true,
   teamUrl: true,
+  inheritMembers: true,
 });
 
 type TCreateTeamFormSchema = z.infer<typeof ZCreateTeamFormSchema>;
 
-export const TeamCreateDialog = ({ trigger, ...props }: TeamCreateDialogProps) => {
+export const TeamCreateDialog = ({ trigger, onCreated, ...props }: TeamCreateDialogProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
+  const { refreshSession } = useSession();
 
-  const navigate = useNavigate();
   const [searchParams] = useSearchParams();
   const updateSearchParams = useUpdateSearchParams();
+  const organisation = useCurrentOrganisation();
 
   const [open, setOpen] = useState(false);
 
+  const { data: fullOrganisation } = trpc.organisation.get.useQuery({
+    organisationReference: organisation.id,
+  });
+
   const actionSearchParam = searchParams?.get('action');
 
   const form = useForm({
@@ -64,24 +75,25 @@ export const TeamCreateDialog = ({ trigger, ...props }: TeamCreateDialogProps) =
     defaultValues: {
       teamName: '',
       teamUrl: '',
+      inheritMembers: true,
     },
   });
 
-  const { mutateAsync: createTeam } = trpc.team.createTeam.useMutation();
+  const { mutateAsync: createTeam } = trpc.team.create.useMutation();
 
-  const onFormSubmit = async ({ teamName, teamUrl }: TCreateTeamFormSchema) => {
+  const onFormSubmit = async ({ teamName, teamUrl, inheritMembers }: TCreateTeamFormSchema) => {
     try {
-      const response = await createTeam({
+      await createTeam({
+        organisationId: organisation.id,
         teamName,
         teamUrl,
+        inheritMembers,
       });
 
       setOpen(false);
 
-      if (response.paymentRequired) {
-        await navigate(`/settings/teams?tab=pending&checkout=${response.pendingTeamId}`);
-        return;
-      }
+      await onCreated?.();
+      await refreshSession();
 
       toast({
         title: _(msg`Success`),
@@ -114,6 +126,26 @@ export const TeamCreateDialog = ({ trigger, ...props }: TeamCreateDialogProps) =
     return text.toLowerCase().replace(/\s+/g, '-');
   };
 
+  const dialogState = useMemo(() => {
+    if (!fullOrganisation) {
+      return 'loading';
+    }
+
+    if (!IS_BILLING_ENABLED()) {
+      return 'form';
+    }
+
+    if (fullOrganisation.organisationClaim.teamCount === 0) {
+      return 'form';
+    }
+
+    if (fullOrganisation.organisationClaim.teamCount <= fullOrganisation.teams.length) {
+      return 'alert';
+    }
+
+    return 'form';
+  }, [fullOrganisation]);
+
   useEffect(() => {
     if (actionSearchParam === 'add-team') {
       setOpen(true);
@@ -145,89 +177,141 @@ export const TeamCreateDialog = ({ trigger, ...props }: TeamCreateDialogProps) =
             <Trans>Create team</Trans>
           </DialogTitle>
 
-          <DialogDescription className="mt-4">
+          <DialogDescription>
             <Trans>Create a team to collaborate with your team members.</Trans>
           </DialogDescription>
         </DialogHeader>
 
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onFormSubmit)}>
-            <fieldset
-              className="flex h-full flex-col space-y-4"
-              disabled={form.formState.isSubmitting}
+        {dialogState === 'loading' && <SpinnerBox className="py-32" />}
+
+        {dialogState === 'alert' && (
+          <>
+            <Alert
+              className="flex flex-col justify-between p-6 sm:flex-row sm:items-center"
+              variant="neutral"
             >
-              <FormField
-                control={form.control}
-                name="teamName"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel required>
-                      <Trans>Team Name</Trans>
-                    </FormLabel>
-                    <FormControl>
-                      <Input
-                        className="bg-background"
-                        {...field}
-                        onChange={(event) => {
-                          const oldGeneratedUrl = mapTextToUrl(field.value);
-                          const newGeneratedUrl = mapTextToUrl(event.target.value);
+              <AlertDescription className="mt-0">
+                <Trans>
+                  You have reached the maximum number of teams for your plan. Please contact sales
+                  at <a href="mailto:support@documenso.com">support@documenso.com</a> if you would
+                  like to adjust your plan.
+                </Trans>
+              </AlertDescription>
+            </Alert>
 
-                          const urlField = form.getValues('teamUrl');
-                          if (urlField === oldGeneratedUrl) {
-                            form.setValue('teamUrl', newGeneratedUrl);
-                          }
+            <DialogFooter>
+              <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                <Trans>Cancel</Trans>
+              </Button>
+            </DialogFooter>
+          </>
+        )}
 
-                          field.onChange(event);
-                        }}
-                      />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
+        {dialogState === 'form' && (
+          <Form {...form}>
+            <form onSubmit={form.handleSubmit(onFormSubmit)}>
+              <fieldset
+                className="flex h-full flex-col space-y-4"
+                disabled={form.formState.isSubmitting}
+              >
+                <FormField
+                  control={form.control}
+                  name="teamName"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel required>
+                        <Trans>Team Name</Trans>
+                      </FormLabel>
+                      <FormControl>
+                        <Input
+                          className="bg-background"
+                          {...field}
+                          onChange={(event) => {
+                            const oldGeneratedUrl = mapTextToUrl(field.value);
+                            const newGeneratedUrl = mapTextToUrl(event.target.value);
 
-              <FormField
-                control={form.control}
-                name="teamUrl"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel required>
-                      <Trans>Team URL</Trans>
-                    </FormLabel>
-                    <FormControl>
-                      <Input className="bg-background" {...field} />
-                    </FormControl>
-                    {!form.formState.errors.teamUrl && (
-                      <span className="text-foreground/50 text-xs font-normal">
-                        {field.value ? (
-                          `${NEXT_PUBLIC_WEBAPP_URL()}/t/${field.value}`
-                        ) : (
-                          <Trans>A unique URL to identify your team</Trans>
-                        )}
-                      </span>
-                    )}
+                            const urlField = form.getValues('teamUrl');
+                            if (urlField === oldGeneratedUrl) {
+                              form.setValue('teamUrl', newGeneratedUrl);
+                            }
 
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
+                            field.onChange(event);
+                          }}
+                        />
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
 
-              <DialogFooter>
-                <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
-                  <Trans>Cancel</Trans>
-                </Button>
+                <FormField
+                  control={form.control}
+                  name="teamUrl"
+                  render={({ field }) => (
+                    <FormItem>
+                      <FormLabel required>
+                        <Trans>Team URL</Trans>
+                      </FormLabel>
+                      <FormControl>
+                        <Input className="bg-background" {...field} />
+                      </FormControl>
+                      {!form.formState.errors.teamUrl && (
+                        <span className="text-foreground/50 text-xs font-normal">
+                          {field.value ? (
+                            `${NEXT_PUBLIC_WEBAPP_URL()}/t/${field.value}`
+                          ) : (
+                            <Trans>A unique URL to identify your team</Trans>
+                          )}
+                        </span>
+                      )}
 
-                <Button
-                  type="submit"
-                  data-testid="dialog-create-team-button"
-                  loading={form.formState.isSubmitting}
-                >
-                  <Trans>Create Team</Trans>
-                </Button>
-              </DialogFooter>
-            </fieldset>
-          </form>
-        </Form>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+
+                <FormField
+                  control={form.control}
+                  name="inheritMembers"
+                  render={({ field }) => (
+                    <FormItem className="flex items-center space-x-2">
+                      <FormControl>
+                        <div className="flex items-center">
+                          <Checkbox
+                            id="inherit-members"
+                            checked={field.value}
+                            onCheckedChange={field.onChange}
+                          />
+
+                          <label
+                            className="text-muted-foreground ml-2 text-sm"
+                            htmlFor="inherit-members"
+                          >
+                            <Trans>Allow all organisation members to access this team</Trans>
+                          </label>
+                        </div>
+                      </FormControl>
+                    </FormItem>
+                  )}
+                />
+
+                <DialogFooter>
+                  <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                    <Trans>Cancel</Trans>
+                  </Button>
+
+                  <Button
+                    type="submit"
+                    data-testid="dialog-create-team-button"
+                    loading={form.formState.isSubmitting}
+                  >
+                    <Trans>Create Team</Trans>
+                  </Button>
+                </DialogFooter>
+              </fieldset>
+            </form>
+          </Form>
+        )}
       </DialogContent>
     </Dialog>
   );
diff --git a/apps/remix/app/components/dialogs/team-delete-dialog.tsx b/apps/remix/app/components/dialogs/team-delete-dialog.tsx
index b297cbb2a..670ba1a2a 100644
--- a/apps/remix/app/components/dialogs/team-delete-dialog.tsx
+++ b/apps/remix/app/components/dialogs/team-delete-dialog.tsx
@@ -8,6 +8,7 @@ import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router';
 import { z } from 'zod';
 
+import { useSession } from '@documenso/lib/client-only/providers/session';
 import { AppError } from '@documenso/lib/errors/app-error';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
@@ -35,15 +36,22 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 export type TeamDeleteDialogProps = {
   teamId: number;
   teamName: string;
+  redirectTo?: string;
   trigger?: React.ReactNode;
 };
 
-export const TeamDeleteDialog = ({ trigger, teamId, teamName }: TeamDeleteDialogProps) => {
+export const TeamDeleteDialog = ({
+  trigger,
+  teamId,
+  teamName,
+  redirectTo,
+}: TeamDeleteDialogProps) => {
   const navigate = useNavigate();
   const [open, setOpen] = useState(false);
 
   const { _ } = useLingui();
   const { toast } = useToast();
+  const { refreshSession } = useSession();
 
   const deleteMessage = _(msg`delete ${teamName}`);
 
@@ -60,19 +68,23 @@ export const TeamDeleteDialog = ({ trigger, teamId, teamName }: TeamDeleteDialog
     },
   });
 
-  const { mutateAsync: deleteTeam } = trpc.team.deleteTeam.useMutation();
+  const { mutateAsync: deleteTeam } = trpc.team.delete.useMutation();
 
   const onFormSubmit = async () => {
     try {
       await deleteTeam({ teamId });
 
+      await refreshSession();
+
       toast({
         title: _(msg`Success`),
         description: _(msg`Your team has been successfully deleted.`),
         duration: 5000,
       });
 
-      await navigate('/settings/teams');
+      if (redirectTo) {
+        await navigate(redirectTo);
+      }
 
       setOpen(false);
     } catch (err) {
@@ -113,7 +125,7 @@ export const TeamDeleteDialog = ({ trigger, teamId, teamName }: TeamDeleteDialog
       <DialogTrigger asChild>
         {trigger ?? (
           <Button variant="destructive">
-            <Trans>Delete team</Trans>
+            <Trans>Delete</Trans>
           </Button>
         )}
       </DialogTrigger>
diff --git a/apps/remix/app/components/dialogs/team-email-add-dialog.tsx b/apps/remix/app/components/dialogs/team-email-add-dialog.tsx
index 161c2c0eb..56e54da72 100644
--- a/apps/remix/app/components/dialogs/team-email-add-dialog.tsx
+++ b/apps/remix/app/components/dialogs/team-email-add-dialog.tsx
@@ -61,12 +61,12 @@ export const TeamEmailAddDialog = ({ teamId, trigger, ...props }: TeamEmailAddDi
     },
   });
 
-  const { mutateAsync: createTeamEmailVerification, isPending } =
-    trpc.team.createTeamEmailVerification.useMutation();
+  const { mutateAsync: sendTeamEmailVerification, isPending } =
+    trpc.team.email.verification.send.useMutation();
 
   const onFormSubmit = async ({ name, email }: TCreateTeamEmailFormSchema) => {
     try {
-      await createTeamEmailVerification({
+      await sendTeamEmailVerification({
         teamId,
         name,
         email,
diff --git a/apps/remix/app/components/dialogs/team-email-delete-dialog.tsx b/apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
index ec050961c..d9b780657 100644
--- a/apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
+++ b/apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
@@ -48,7 +48,7 @@ export const TeamEmailDeleteDialog = ({ trigger, teamName, team }: TeamEmailDele
   const { revalidate } = useRevalidator();
 
   const { mutateAsync: deleteTeamEmail, isPending: isDeletingTeamEmail } =
-    trpc.team.deleteTeamEmail.useMutation({
+    trpc.team.email.delete.useMutation({
       onSuccess: () => {
         toast({
           title: _(msg`Success`),
@@ -67,7 +67,7 @@ export const TeamEmailDeleteDialog = ({ trigger, teamName, team }: TeamEmailDele
     });
 
   const { mutateAsync: deleteTeamEmailVerification, isPending: isDeletingTeamEmailVerification } =
-    trpc.team.deleteTeamEmailVerification.useMutation({
+    trpc.team.email.verification.delete.useMutation({
       onSuccess: () => {
         toast({
           title: _(msg`Success`),
diff --git a/apps/remix/app/components/dialogs/team-email-update-dialog.tsx b/apps/remix/app/components/dialogs/team-email-update-dialog.tsx
index bde700949..dd5411b59 100644
--- a/apps/remix/app/components/dialogs/team-email-update-dialog.tsx
+++ b/apps/remix/app/components/dialogs/team-email-update-dialog.tsx
@@ -61,7 +61,7 @@ export const TeamEmailUpdateDialog = ({
     },
   });
 
-  const { mutateAsync: updateTeamEmail } = trpc.team.updateTeamEmail.useMutation();
+  const { mutateAsync: updateTeamEmail } = trpc.team.email.update.useMutation();
 
   const onFormSubmit = async ({ name }: TUpdateTeamEmailFormSchema) => {
     try {
diff --git a/apps/remix/app/components/dialogs/team-group-create-dialog.tsx b/apps/remix/app/components/dialogs/team-group-create-dialog.tsx
new file mode 100644
index 000000000..dd79e9e05
--- /dev/null
+++ b/apps/remix/app/components/dialogs/team-group-create-dialog.tsx
@@ -0,0 +1,305 @@
+import { useEffect, useMemo, useState } from 'react';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { Trans, useLingui } from '@lingui/react/macro';
+import { OrganisationGroupType, TeamMemberRole } from '@prisma/client';
+import type * as DialogPrimitive from '@radix-ui/react-dialog';
+import { useForm } from 'react-hook-form';
+import { match } from 'ts-pattern';
+import { z } from 'zod';
+
+import { TEAM_MEMBER_ROLE_HIERARCHY } from '@documenso/lib/constants/teams';
+import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams-translations';
+import { trpc } from '@documenso/trpc/react';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+import { MultiSelectCombobox } from '@documenso/ui/primitives/multi-select-combobox';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@documenso/ui/primitives/select';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { useCurrentTeam } from '~/providers/team';
+
+export type TeamGroupCreateDialogProps = Omit<DialogPrimitive.DialogProps, 'children'>;
+
+const ZAddTeamMembersFormSchema = z.object({
+  groups: z.array(
+    z.object({
+      organisationGroupId: z.string(),
+      teamRole: z.nativeEnum(TeamMemberRole),
+    }),
+  ),
+});
+
+type TAddTeamMembersFormSchema = z.infer<typeof ZAddTeamMembersFormSchema>;
+
+export const TeamGroupCreateDialog = ({ ...props }: TeamGroupCreateDialogProps) => {
+  const [open, setOpen] = useState(false);
+  const [step, setStep] = useState<'SELECT' | 'ROLES'>('SELECT');
+
+  const { t } = useLingui();
+  const { toast } = useToast();
+
+  const team = useCurrentTeam();
+
+  const form = useForm<TAddTeamMembersFormSchema>({
+    resolver: zodResolver(ZAddTeamMembersFormSchema),
+    defaultValues: {
+      groups: [],
+    },
+  });
+
+  const { mutateAsync: createTeamGroups } = trpc.team.group.createMany.useMutation();
+
+  const organisationGroupQuery = trpc.organisation.group.find.useQuery({
+    organisationId: team.organisationId,
+    perPage: 100, // Won't really work if they somehow have more than 100 groups.
+    types: [OrganisationGroupType.CUSTOM],
+  });
+
+  const teamGroupQuery = trpc.team.group.find.useQuery({
+    teamId: team.id,
+    perPage: 100, // Won't really work if they somehow have more than 100 groups.
+  });
+
+  const avaliableOrganisationGroups = useMemo(() => {
+    const organisationGroups = organisationGroupQuery.data?.data ?? [];
+    const teamGroups = teamGroupQuery.data?.data ?? [];
+
+    return organisationGroups.filter(
+      (group) => !teamGroups.some((teamGroup) => teamGroup.organisationGroupId === group.id),
+    );
+  }, [organisationGroupQuery, teamGroupQuery]);
+
+  const onFormSubmit = async ({ groups }: TAddTeamMembersFormSchema) => {
+    try {
+      await createTeamGroups({
+        teamId: team.id,
+        groups,
+      });
+
+      toast({
+        title: t`Success`,
+        description: t`Team members have been added.`,
+        duration: 5000,
+      });
+
+      setOpen(false);
+    } catch {
+      toast({
+        title: t`An unknown error occurred`,
+        description: t`We encountered an unknown error while attempting to add team members. Please try again later.`,
+        variant: 'destructive',
+      });
+    }
+  };
+
+  useEffect(() => {
+    if (!open) {
+      form.reset();
+      setStep('SELECT');
+    }
+  }, [open, form]);
+
+  return (
+    <Dialog
+      {...props}
+      open={open}
+      // Disable automatic onOpenChange events to prevent dialog from closing if auser 'accidentally' clicks the overlay.
+      // Since it would be annoying to redo the whole process.
+    >
+      <DialogTrigger onClick={(e) => e.stopPropagation()} asChild>
+        <Button variant="secondary" onClick={() => setOpen(true)}>
+          <Trans>Add groups</Trans>
+        </Button>
+      </DialogTrigger>
+
+      <DialogContent hideClose={true} position="center">
+        {match(step)
+          .with('SELECT', () => (
+            <DialogHeader>
+              <DialogTitle>
+                <Trans>Add members</Trans>
+              </DialogTitle>
+
+              <DialogDescription>
+                <Trans>Select members or groups of members to add to the team.</Trans>
+              </DialogDescription>
+            </DialogHeader>
+          ))
+          .with('ROLES', () => (
+            <DialogHeader>
+              <DialogTitle>
+                <Trans>Add group roles</Trans>
+              </DialogTitle>
+
+              <DialogDescription>
+                <Trans>Configure the team roles for each group</Trans>
+              </DialogDescription>
+            </DialogHeader>
+          ))
+          .exhaustive()}
+
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onFormSubmit)}>
+            <fieldset disabled={form.formState.isSubmitting}>
+              {step === 'SELECT' && (
+                <>
+                  <FormField
+                    control={form.control}
+                    name="groups"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>
+                          <Trans>Groups</Trans>
+                        </FormLabel>
+
+                        <FormControl>
+                          <MultiSelectCombobox
+                            options={avaliableOrganisationGroups.map((group) => ({
+                              label: group.name ?? group.organisationRole,
+                              value: group.id,
+                            }))}
+                            loading={organisationGroupQuery.isLoading || teamGroupQuery.isLoading}
+                            selectedValues={field.value.map(
+                              ({ organisationGroupId }) => organisationGroupId,
+                            )}
+                            onChange={(value) => {
+                              field.onChange(
+                                value.map((organisationGroupId) => ({
+                                  organisationGroupId,
+                                  teamRole:
+                                    field.value.find(
+                                      (value) => value.organisationGroupId === organisationGroupId,
+                                    )?.teamRole || TeamMemberRole.MEMBER,
+                                })),
+                              );
+                            }}
+                            className="bg-background w-full"
+                            emptySelectionPlaceholder={t`Select groups`}
+                          />
+                        </FormControl>
+
+                        <FormDescription>
+                          <Trans>Select groups to add to this team</Trans>
+                        </FormDescription>
+                      </FormItem>
+                    )}
+                  />
+
+                  <DialogFooter>
+                    <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                      <Trans>Cancel</Trans>
+                    </Button>
+
+                    <Button
+                      type="button"
+                      disabled={form.getValues('groups').length === 0}
+                      onClick={() => {
+                        setStep('ROLES');
+                      }}
+                    >
+                      <Trans>Next</Trans>
+                    </Button>
+                  </DialogFooter>
+                </>
+              )}
+
+              {step === 'ROLES' && (
+                <>
+                  <div className="custom-scrollbar -m-1 max-h-[60vh] space-y-4 overflow-y-auto p-1">
+                    {form.getValues('groups').map((group, index) => (
+                      <div className="flex w-full flex-row space-x-4" key={index}>
+                        <div className="w-full space-y-2">
+                          {index === 0 && (
+                            <FormLabel>
+                              <Trans>Group</Trans>
+                            </FormLabel>
+                          )}
+                          <Input
+                            readOnly
+                            className="bg-background"
+                            value={
+                              avaliableOrganisationGroups.find(
+                                ({ id }) => id === group.organisationGroupId,
+                              )?.name || t`Untitled Group`
+                            }
+                          />
+                        </div>
+
+                        <FormField
+                          control={form.control}
+                          name={`groups.${index}.teamRole`}
+                          render={({ field }) => (
+                            <FormItem className="w-full">
+                              {index === 0 && (
+                                <FormLabel required>
+                                  <Trans>Team Role</Trans>
+                                </FormLabel>
+                              )}
+                              <FormControl>
+                                <Select {...field} onValueChange={field.onChange}>
+                                  <SelectTrigger className="text-muted-foreground">
+                                    <SelectValue />
+                                  </SelectTrigger>
+
+                                  <SelectContent position="popper">
+                                    {TEAM_MEMBER_ROLE_HIERARCHY[team.currentTeamRole].map(
+                                      (role) => (
+                                        <SelectItem key={role} value={role}>
+                                          {t(TEAM_MEMBER_ROLE_MAP[role]) ?? role}
+                                        </SelectItem>
+                                      ),
+                                    )}
+                                  </SelectContent>
+                                </Select>
+                              </FormControl>
+                              <FormMessage />
+                            </FormItem>
+                          )}
+                        />
+                      </div>
+                    ))}
+                  </div>
+
+                  <DialogFooter className="mt-4">
+                    <Button type="button" variant="secondary" onClick={() => setStep('SELECT')}>
+                      <Trans>Back</Trans>
+                    </Button>
+
+                    <Button type="submit" loading={form.formState.isSubmitting}>
+                      <Trans>Create Groups</Trans>
+                    </Button>
+                  </DialogFooter>
+                </>
+              )}
+            </fieldset>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/team-group-delete-dialog.tsx b/apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
new file mode 100644
index 000000000..f42fd4630
--- /dev/null
+++ b/apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
@@ -0,0 +1,139 @@
+import { useState } from 'react';
+
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import type { TeamMemberRole } from '@prisma/client';
+
+import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
+import { trpc } from '@documenso/trpc/react';
+import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { useCurrentTeam } from '~/providers/team';
+
+export type TeamGroupDeleteDialogProps = {
+  trigger?: React.ReactNode;
+  teamGroupId: string;
+  teamGroupName: string;
+  teamGroupRole: TeamMemberRole;
+};
+
+export const TeamGroupDeleteDialog = ({
+  trigger,
+  teamGroupId,
+  teamGroupName,
+  teamGroupRole,
+}: TeamGroupDeleteDialogProps) => {
+  const [open, setOpen] = useState(false);
+
+  const { _ } = useLingui();
+  const { toast } = useToast();
+
+  const team = useCurrentTeam();
+
+  const { mutateAsync: deleteGroup, isPending: isDeleting } = trpc.team.group.delete.useMutation({
+    onSuccess: () => {
+      toast({
+        title: _(msg`Success`),
+        description: _(msg`You have successfully removed this group from the team.`),
+        duration: 5000,
+      });
+
+      setOpen(false);
+    },
+    onError: () => {
+      toast({
+        title: _(msg`An unknown error occurred`),
+        description: _(
+          msg`We encountered an unknown error while attempting to remove this group. Please try again later.`,
+        ),
+        variant: 'destructive',
+        duration: 10000,
+      });
+    },
+  });
+
+  return (
+    <Dialog open={open} onOpenChange={(value) => !isDeleting && setOpen(value)}>
+      <DialogTrigger asChild>
+        {trigger ?? (
+          <Button variant="secondary">
+            <Trans>Delete team group</Trans>
+          </Button>
+        )}
+      </DialogTrigger>
+
+      <DialogContent position="center">
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Are you sure?</Trans>
+          </DialogTitle>
+
+          <DialogDescription className="mt-4">
+            <Trans>
+              You are about to remove the following group from{' '}
+              <span className="font-semibold">{team.name}</span>.
+            </Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        {isTeamRoleWithinUserHierarchy(team.currentTeamRole, teamGroupRole) ? (
+          <>
+            <Alert variant="neutral">
+              <AlertDescription className="text-center font-semibold">
+                {teamGroupName}
+              </AlertDescription>
+            </Alert>
+
+            <fieldset disabled={isDeleting}>
+              <DialogFooter>
+                <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                  <Trans>Cancel</Trans>
+                </Button>
+
+                <Button
+                  type="submit"
+                  variant="destructive"
+                  loading={isDeleting}
+                  onClick={async () =>
+                    deleteGroup({
+                      teamId: team.id,
+                      teamGroupId: teamGroupId,
+                    })
+                  }
+                >
+                  <Trans>Delete</Trans>
+                </Button>
+              </DialogFooter>
+            </fieldset>
+          </>
+        ) : (
+          <>
+            <Alert variant="neutral">
+              <AlertDescription className="text-center font-semibold">
+                <Trans>You cannot delete a group which has a higher role than you.</Trans>
+              </AlertDescription>
+            </Alert>
+
+            <DialogFooter>
+              <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                <Trans>Close</Trans>
+              </Button>
+            </DialogFooter>
+          </>
+        )}
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/team-group-update-dialog.tsx b/apps/remix/app/components/dialogs/team-group-update-dialog.tsx
new file mode 100644
index 000000000..c57755e87
--- /dev/null
+++ b/apps/remix/app/components/dialogs/team-group-update-dialog.tsx
@@ -0,0 +1,209 @@
+import { useEffect, useState } from 'react';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { TeamMemberRole } from '@prisma/client';
+import type * as DialogPrimitive from '@radix-ui/react-dialog';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+
+import { TEAM_MEMBER_ROLE_HIERARCHY } from '@documenso/lib/constants/teams';
+import { EXTENDED_TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams-translations';
+import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
+import { trpc } from '@documenso/trpc/react';
+import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@documenso/ui/primitives/select';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { useCurrentTeam } from '~/providers/team';
+
+export type TeamGroupUpdateDialogProps = {
+  trigger?: React.ReactNode;
+  teamGroupId: string;
+  teamGroupName: string;
+  teamGroupRole: TeamMemberRole;
+} & Omit<DialogPrimitive.DialogProps, 'children'>;
+
+const ZUpdateTeamGroupFormSchema = z.object({
+  role: z.nativeEnum(TeamMemberRole),
+});
+
+type ZUpdateTeamGroupSchema = z.infer<typeof ZUpdateTeamGroupFormSchema>;
+
+export const TeamGroupUpdateDialog = ({
+  trigger,
+  teamGroupId,
+  teamGroupName,
+  teamGroupRole,
+  ...props
+}: TeamGroupUpdateDialogProps) => {
+  const [open, setOpen] = useState(false);
+
+  const { _ } = useLingui();
+  const { toast } = useToast();
+
+  const team = useCurrentTeam();
+
+  const form = useForm<ZUpdateTeamGroupSchema>({
+    resolver: zodResolver(ZUpdateTeamGroupFormSchema),
+    defaultValues: {
+      role: teamGroupRole,
+    },
+  });
+
+  const { mutateAsync: updateTeamGroup } = trpc.team.group.update.useMutation();
+
+  const onFormSubmit = async ({ role }: ZUpdateTeamGroupSchema) => {
+    try {
+      await updateTeamGroup({
+        id: teamGroupId,
+        data: {
+          teamRole: role,
+        },
+      });
+
+      toast({
+        title: _(msg`Success`),
+        description: _(msg`You have updated the team group.`),
+        duration: 5000,
+      });
+
+      setOpen(false);
+    } catch {
+      toast({
+        title: _(msg`An unknown error occurred`),
+        description: _(
+          msg`We encountered an unknown error while attempting to update this team member. Please try again later.`,
+        ),
+        variant: 'destructive',
+      });
+    }
+  };
+
+  useEffect(() => {
+    if (!open) {
+      return;
+    }
+
+    form.reset();
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [open, team.currentTeamRole, teamGroupRole, form, toast]);
+
+  return (
+    <Dialog
+      {...props}
+      open={open}
+      onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}
+    >
+      <DialogTrigger onClick={(e) => e.stopPropagation()} asChild>
+        {trigger ?? (
+          <Button variant="secondary">
+            <Trans>Update team group</Trans>
+          </Button>
+        )}
+      </DialogTrigger>
+
+      <DialogContent position="center">
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Update team group</Trans>
+          </DialogTitle>
+
+          <DialogDescription>
+            <Trans>
+              You are currently updating the <span className="font-bold">{teamGroupName}</span> team
+              group.
+            </Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        {isTeamRoleWithinUserHierarchy(team.currentTeamRole, teamGroupRole) ? (
+          <Form {...form}>
+            <form onSubmit={form.handleSubmit(onFormSubmit)}>
+              <fieldset className="flex h-full flex-col" disabled={form.formState.isSubmitting}>
+                <FormField
+                  control={form.control}
+                  name="role"
+                  render={({ field }) => (
+                    <FormItem className="w-full">
+                      <FormLabel required>
+                        <Trans>Role</Trans>
+                      </FormLabel>
+                      <FormControl>
+                        <Select {...field} onValueChange={field.onChange}>
+                          <SelectTrigger className="text-muted-foreground">
+                            <SelectValue />
+                          </SelectTrigger>
+
+                          <SelectContent className="w-full" position="popper">
+                            {TEAM_MEMBER_ROLE_HIERARCHY[team.currentTeamRole].map((role) => (
+                              <SelectItem key={role} value={role}>
+                                {_(EXTENDED_TEAM_MEMBER_ROLE_MAP[role]) ?? role}
+                              </SelectItem>
+                            ))}
+                          </SelectContent>
+                        </Select>
+                      </FormControl>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+
+                <DialogFooter className="mt-4">
+                  <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                    <Trans>Cancel</Trans>
+                  </Button>
+
+                  <Button type="submit" loading={form.formState.isSubmitting}>
+                    <Trans>Update</Trans>
+                  </Button>
+                </DialogFooter>
+              </fieldset>
+            </form>
+          </Form>
+        ) : (
+          <>
+            <Alert variant="neutral">
+              <AlertDescription className="text-center font-semibold">
+                <Trans>You cannot modify a group which has a higher role than you.</Trans>
+              </AlertDescription>
+            </Alert>
+
+            <DialogFooter>
+              <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                <Trans>Close</Trans>
+              </Button>
+            </DialogFooter>
+          </>
+        )}
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx b/apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
new file mode 100644
index 000000000..c7352b7fe
--- /dev/null
+++ b/apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
@@ -0,0 +1,93 @@
+import { Trans, useLingui } from '@lingui/react/macro';
+import type { TeamGroup } from '@prisma/client';
+
+import { trpc } from '@documenso/trpc/react';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { useCurrentTeam } from '~/providers/team';
+
+type TeamMemberInheritDisableDialogProps = {
+  group: TeamGroup;
+};
+
+export const TeamMemberInheritDisableDialog = ({ group }: TeamMemberInheritDisableDialogProps) => {
+  const { toast } = useToast();
+  const { t } = useLingui();
+
+  const team = useCurrentTeam();
+
+  const deleteGroupMutation = trpc.team.group.delete.useMutation({
+    onSuccess: () => {
+      toast({
+        title: t`Access disabled`,
+        duration: 5000,
+      });
+    },
+    onError: () => {
+      toast({
+        title: t`Something went wrong`,
+        description: t`We encountered an unknown error while attempting to disable access.`,
+        variant: 'destructive',
+        duration: 5000,
+      });
+    },
+  });
+
+  return (
+    <Dialog>
+      <DialogTrigger asChild>
+        <Button variant="outline">
+          <Trans>Disable access</Trans>
+        </Button>
+      </DialogTrigger>
+
+      <DialogContent position="center">
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Are you sure?</Trans>
+          </DialogTitle>
+
+          <DialogDescription className="mt-4">
+            <Trans>
+              You are about to remove default access to this team for all organisation members. Any
+              members not explicitly added to this team will no longer have access.
+            </Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        <DialogFooter>
+          <DialogClose asChild>
+            <Button type="button" variant="secondary">
+              <Trans>Cancel</Trans>
+            </Button>
+          </DialogClose>
+
+          <Button
+            type="submit"
+            variant="destructive"
+            loading={deleteGroupMutation.isPending}
+            onClick={() =>
+              deleteGroupMutation.mutate({
+                teamId: team.id,
+                teamGroupId: group.id,
+              })
+            }
+          >
+            <Trans>Disable</Trans>
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx b/apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
new file mode 100644
index 000000000..1abece3fa
--- /dev/null
+++ b/apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
@@ -0,0 +1,109 @@
+import { Trans, useLingui } from '@lingui/react/macro';
+import { OrganisationGroupType, OrganisationMemberRole, TeamMemberRole } from '@prisma/client';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { trpc } from '@documenso/trpc/react';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { useCurrentTeam } from '~/providers/team';
+
+export const TeamMemberInheritEnableDialog = () => {
+  const organisation = useCurrentOrganisation();
+  const team = useCurrentTeam();
+
+  const { toast } = useToast();
+  const { t } = useLingui();
+
+  const { mutateAsync: createTeamGroups, isPending } = trpc.team.group.createMany.useMutation({
+    onSuccess: () => {
+      toast({
+        title: t`Access enabled`,
+        duration: 5000,
+      });
+    },
+    onError: () => {
+      toast({
+        title: t`Something went wrong`,
+        description: t`We encountered an unknown error while attempting to enable access.`,
+        variant: 'destructive',
+        duration: 5000,
+      });
+    },
+  });
+
+  const organisationGroupQuery = trpc.organisation.group.find.useQuery({
+    organisationId: organisation.id,
+    perPage: 1,
+    types: [OrganisationGroupType.INTERNAL_ORGANISATION],
+    organisationRoles: [OrganisationMemberRole.MEMBER],
+  });
+
+  const enableAccessGroup = async () => {
+    if (!organisationGroupQuery.data?.data[0]?.id) {
+      return;
+    }
+
+    await createTeamGroups({
+      teamId: team.id,
+      groups: [
+        {
+          organisationGroupId: organisationGroupQuery.data?.data[0]?.id,
+          teamRole: TeamMemberRole.MEMBER,
+        },
+      ],
+    });
+  };
+
+  return (
+    <Dialog>
+      <DialogTrigger asChild>
+        <Button variant="outline">
+          <Trans>Enable access</Trans>
+        </Button>
+      </DialogTrigger>
+
+      <DialogContent position="center">
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Are you sure?</Trans>
+          </DialogTitle>
+
+          <DialogDescription className="mt-4">
+            <Trans>
+              You are about to give all organisation members access to this team under their
+              organisation role.
+            </Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        <DialogFooter>
+          <DialogClose asChild>
+            <Button type="button" variant="secondary">
+              <Trans>Cancel</Trans>
+            </Button>
+          </DialogClose>
+
+          <Button
+            type="submit"
+            disabled={organisationGroupQuery.isPending}
+            loading={isPending}
+            onClick={enableAccessGroup}
+          >
+            <Trans>Enable</Trans>
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/team-leave-dialog.tsx b/apps/remix/app/components/dialogs/team-leave-dialog.tsx
deleted file mode 100644
index a6b6246a6..000000000
--- a/apps/remix/app/components/dialogs/team-leave-dialog.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import { useState } from 'react';
-
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import type { TeamMemberRole } from '@prisma/client';
-
-import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams';
-import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
-import { trpc } from '@documenso/trpc/react';
-import { Alert } from '@documenso/ui/primitives/alert';
-import { AvatarWithText } from '@documenso/ui/primitives/avatar';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type TeamLeaveDialogProps = {
-  teamId: number;
-  teamName: string;
-  teamAvatarImageId?: string | null;
-  role: TeamMemberRole;
-  trigger?: React.ReactNode;
-};
-
-export const TeamLeaveDialog = ({
-  trigger,
-  teamId,
-  teamName,
-  teamAvatarImageId,
-  role,
-}: TeamLeaveDialogProps) => {
-  const [open, setOpen] = useState(false);
-
-  const { _ } = useLingui();
-  const { toast } = useToast();
-
-  const { mutateAsync: leaveTeam, isPending: isLeavingTeam } = trpc.team.leaveTeam.useMutation({
-    onSuccess: () => {
-      toast({
-        title: _(msg`Success`),
-        description: _(msg`You have successfully left this team.`),
-        duration: 5000,
-      });
-
-      setOpen(false);
-    },
-    onError: () => {
-      toast({
-        title: _(msg`An unknown error occurred`),
-        description: _(
-          msg`We encountered an unknown error while attempting to leave this team. Please try again later.`,
-        ),
-        variant: 'destructive',
-        duration: 10000,
-      });
-    },
-  });
-
-  return (
-    <Dialog open={open} onOpenChange={(value) => !isLeavingTeam && setOpen(value)}>
-      <DialogTrigger asChild>
-        {trigger ?? (
-          <Button variant="destructive">
-            <Trans>Leave team</Trans>
-          </Button>
-        )}
-      </DialogTrigger>
-
-      <DialogContent position="center">
-        <DialogHeader>
-          <DialogTitle>
-            <Trans>Are you sure?</Trans>
-          </DialogTitle>
-
-          <DialogDescription className="mt-4">
-            <Trans>You are about to leave the following team.</Trans>
-          </DialogDescription>
-        </DialogHeader>
-
-        <Alert variant="neutral" padding="tight">
-          <AvatarWithText
-            avatarClass="h-12 w-12"
-            avatarSrc={formatAvatarUrl(teamAvatarImageId)}
-            avatarFallback={teamName.slice(0, 1).toUpperCase()}
-            primaryText={teamName}
-            secondaryText={_(TEAM_MEMBER_ROLE_MAP[role])}
-          />
-        </Alert>
-
-        <fieldset disabled={isLeavingTeam}>
-          <DialogFooter>
-            <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
-              <Trans>Cancel</Trans>
-            </Button>
-
-            <Button
-              type="submit"
-              variant="destructive"
-              loading={isLeavingTeam}
-              onClick={async () => leaveTeam({ teamId })}
-            >
-              <Trans>Leave</Trans>
-            </Button>
-          </DialogFooter>
-        </fieldset>
-      </DialogContent>
-    </Dialog>
-  );
-};
diff --git a/apps/remix/app/components/dialogs/team-member-create-dialog.tsx b/apps/remix/app/components/dialogs/team-member-create-dialog.tsx
new file mode 100644
index 000000000..b691d910c
--- /dev/null
+++ b/apps/remix/app/components/dialogs/team-member-create-dialog.tsx
@@ -0,0 +1,305 @@
+import { useEffect, useMemo, useState } from 'react';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { Trans, useLingui } from '@lingui/react/macro';
+import { TeamMemberRole } from '@prisma/client';
+import type * as DialogPrimitive from '@radix-ui/react-dialog';
+import { useForm } from 'react-hook-form';
+import { match } from 'ts-pattern';
+import { z } from 'zod';
+
+import { TEAM_MEMBER_ROLE_HIERARCHY } from '@documenso/lib/constants/teams';
+import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams-translations';
+import { trpc } from '@documenso/trpc/react';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+import { MultiSelectCombobox } from '@documenso/ui/primitives/multi-select-combobox';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@documenso/ui/primitives/select';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { useCurrentTeam } from '~/providers/team';
+
+export type TeamMemberCreateDialogProps = {
+  trigger?: React.ReactNode;
+} & Omit<DialogPrimitive.DialogProps, 'children'>;
+
+const ZAddTeamMembersFormSchema = z.object({
+  members: z.array(
+    z.object({
+      organisationMemberId: z.string(),
+      teamRole: z.nativeEnum(TeamMemberRole),
+    }),
+  ),
+});
+
+type TAddTeamMembersFormSchema = z.infer<typeof ZAddTeamMembersFormSchema>;
+
+export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDialogProps) => {
+  const [open, setOpen] = useState(false);
+  const [step, setStep] = useState<'SELECT' | 'MEMBERS'>('SELECT');
+
+  const { t } = useLingui();
+  const { toast } = useToast();
+
+  const team = useCurrentTeam();
+
+  const form = useForm<TAddTeamMembersFormSchema>({
+    resolver: zodResolver(ZAddTeamMembersFormSchema),
+    defaultValues: {
+      members: [],
+    },
+  });
+
+  const { mutateAsync: createTeamMembers } = trpc.team.member.createMany.useMutation();
+
+  const organisationMemberQuery = trpc.organisation.member.find.useQuery({
+    organisationId: team.organisationId,
+  });
+
+  const teamMemberQuery = trpc.team.member.find.useQuery({
+    teamId: team.id,
+  });
+
+  const avaliableOrganisationMembers = useMemo(() => {
+    const organisationMembers = organisationMemberQuery.data?.data ?? [];
+    const teamMembers = teamMemberQuery.data?.data ?? [];
+
+    return organisationMembers.filter(
+      (member) => !teamMembers.some((teamMember) => teamMember.id === member.id),
+    );
+  }, [organisationMemberQuery, teamMemberQuery]);
+
+  const onFormSubmit = async ({ members }: TAddTeamMembersFormSchema) => {
+    try {
+      await createTeamMembers({
+        teamId: team.id,
+        organisationMembers: members,
+      });
+
+      toast({
+        title: t`Success`,
+        description: t`Team members have been added.`,
+        duration: 5000,
+      });
+
+      setOpen(false);
+    } catch {
+      toast({
+        title: t`An unknown error occurred`,
+        description: t`We encountered an unknown error while attempting to add team members. Please try again later.`,
+        variant: 'destructive',
+      });
+    }
+  };
+
+  useEffect(() => {
+    if (!open) {
+      form.reset();
+      setStep('SELECT');
+    }
+  }, [open, form]);
+
+  return (
+    <Dialog
+      {...props}
+      open={open}
+      // Disable automatic onOpenChange events to prevent dialog from closing if auser 'accidentally' clicks the overlay.
+      // Since it would be annoying to redo the whole process.
+    >
+      <DialogTrigger onClick={(e) => e.stopPropagation()} asChild>
+        <Button variant="secondary" onClick={() => setOpen(true)}>
+          <Trans>Add members</Trans>
+        </Button>
+      </DialogTrigger>
+
+      <DialogContent hideClose={true} position="center">
+        {match(step)
+          .with('SELECT', () => (
+            <DialogHeader>
+              <DialogTitle>
+                <Trans>Add members</Trans>
+              </DialogTitle>
+
+              <DialogDescription>
+                <Trans>Select members or groups of members to add to the team.</Trans>
+              </DialogDescription>
+            </DialogHeader>
+          ))
+          .with('MEMBERS', () => (
+            <DialogHeader>
+              <DialogTitle>
+                <Trans>Add members roles</Trans>
+              </DialogTitle>
+
+              <DialogDescription>
+                <Trans>Configure the team roles for each member</Trans>
+              </DialogDescription>
+            </DialogHeader>
+          ))
+          .exhaustive()}
+
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onFormSubmit)}>
+            <fieldset disabled={form.formState.isSubmitting}>
+              {step === 'SELECT' && (
+                <>
+                  <FormField
+                    control={form.control}
+                    name="members"
+                    render={({ field }) => (
+                      <FormItem>
+                        <FormLabel>
+                          <Trans>Members</Trans>
+                        </FormLabel>
+
+                        <FormControl>
+                          <MultiSelectCombobox
+                            options={avaliableOrganisationMembers.map((member) => ({
+                              label: member.name,
+                              value: member.id,
+                            }))}
+                            loading={organisationMemberQuery.isLoading}
+                            selectedValues={field.value.map(
+                              (member) => member.organisationMemberId,
+                            )}
+                            onChange={(value) => {
+                              field.onChange(
+                                value.map((organisationMemberId) => ({
+                                  organisationMemberId,
+                                  teamRole:
+                                    field.value.find(
+                                      (member) =>
+                                        member.organisationMemberId === organisationMemberId,
+                                    )?.teamRole || TeamMemberRole.MEMBER,
+                                })),
+                              );
+                            }}
+                            className="bg-background w-full"
+                            emptySelectionPlaceholder={t`Select members`}
+                          />
+                        </FormControl>
+
+                        <FormDescription>
+                          <Trans>Select members to add to this team</Trans>
+                        </FormDescription>
+                      </FormItem>
+                    )}
+                  />
+
+                  <DialogFooter>
+                    <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
+                      <Trans>Cancel</Trans>
+                    </Button>
+
+                    <Button
+                      type="button"
+                      disabled={form.getValues('members').length === 0}
+                      onClick={() => {
+                        setStep('MEMBERS');
+                      }}
+                    >
+                      <Trans>Next</Trans>
+                    </Button>
+                  </DialogFooter>
+                </>
+              )}
+
+              {step === 'MEMBERS' && (
+                <>
+                  <div className="custom-scrollbar -m-1 max-h-[60vh] space-y-4 overflow-y-auto p-1">
+                    {form.getValues('members').map((member, index) => (
+                      <div className="flex w-full flex-row space-x-4" key={index}>
+                        <div className="w-full space-y-2">
+                          {index === 0 && (
+                            <FormLabel>
+                              <Trans>Member</Trans>
+                            </FormLabel>
+                          )}
+                          <Input
+                            readOnly
+                            className="bg-background"
+                            value={
+                              organisationMemberQuery.data?.data.find(
+                                ({ id }) => id === member.organisationMemberId,
+                              )?.name || ''
+                            }
+                          />
+                        </div>
+
+                        <FormField
+                          control={form.control}
+                          name={`members.${index}.teamRole`}
+                          render={({ field }) => (
+                            <FormItem className="w-full">
+                              {index === 0 && (
+                                <FormLabel required>
+                                  <Trans>Team Role</Trans>
+                                </FormLabel>
+                              )}
+                              <FormControl>
+                                <Select {...field} onValueChange={field.onChange}>
+                                  <SelectTrigger className="text-muted-foreground">
+                                    <SelectValue />
+                                  </SelectTrigger>
+
+                                  <SelectContent position="popper">
+                                    {TEAM_MEMBER_ROLE_HIERARCHY[team.currentTeamRole].map(
+                                      (role) => (
+                                        <SelectItem key={role} value={role}>
+                                          {t(TEAM_MEMBER_ROLE_MAP[role]) ?? role}
+                                        </SelectItem>
+                                      ),
+                                    )}
+                                  </SelectContent>
+                                </Select>
+                              </FormControl>
+                              <FormMessage />
+                            </FormItem>
+                          )}
+                        />
+                      </div>
+                    ))}
+                  </div>
+
+                  <DialogFooter className="mt-4">
+                    <Button type="button" variant="secondary" onClick={() => setStep('SELECT')}>
+                      <Trans>Back</Trans>
+                    </Button>
+
+                    <Button type="submit" loading={form.formState.isSubmitting}>
+                      <Trans>Add Members</Trans>
+                    </Button>
+                  </DialogFooter>
+                </>
+              )}
+            </fieldset>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/dialogs/team-member-delete-dialog.tsx b/apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
index dedda2003..82a4d7a04 100644
--- a/apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+++ b/apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
@@ -5,7 +5,7 @@ import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 
 import { trpc } from '@documenso/trpc/react';
-import { Alert } from '@documenso/ui/primitives/alert';
+import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
 import { AvatarWithText } from '@documenso/ui/primitives/avatar';
 import { Button } from '@documenso/ui/primitives/button';
 import {
@@ -22,9 +22,10 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 export type TeamMemberDeleteDialogProps = {
   teamId: number;
   teamName: string;
-  teamMemberId: number;
-  teamMemberName: string;
-  teamMemberEmail: string;
+  memberId: string;
+  memberName: string;
+  memberEmail: string;
+  isInheritMemberEnabled: boolean | null;
   trigger?: React.ReactNode;
 };
 
@@ -32,17 +33,18 @@ export const TeamMemberDeleteDialog = ({
   trigger,
   teamId,
   teamName,
-  teamMemberId,
-  teamMemberName,
-  teamMemberEmail,
+  memberId,
+  memberName,
+  memberEmail,
+  isInheritMemberEnabled,
 }: TeamMemberDeleteDialogProps) => {
   const [open, setOpen] = useState(false);
 
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const { mutateAsync: deleteTeamMembers, isPending: isDeletingTeamMember } =
-    trpc.team.deleteTeamMembers.useMutation({
+  const { mutateAsync: deleteTeamMember, isPending: isDeletingTeamMember } =
+    trpc.team.member.delete.useMutation({
       onSuccess: () => {
         toast({
           title: _(msg`Success`),
@@ -69,7 +71,7 @@ export const TeamMemberDeleteDialog = ({
       <DialogTrigger asChild>
         {trigger ?? (
           <Button variant="secondary">
-            <Trans>Delete team member</Trans>
+            <Trans>Remove team member</Trans>
           </Button>
         )}
       </DialogTrigger>
@@ -88,29 +90,42 @@ export const TeamMemberDeleteDialog = ({
           </DialogDescription>
         </DialogHeader>
 
-        <Alert variant="neutral" padding="tight">
-          <AvatarWithText
-            avatarClass="h-12 w-12"
-            avatarFallback={teamMemberName.slice(0, 1).toUpperCase()}
-            primaryText={<span className="font-semibold">{teamMemberName}</span>}
-            secondaryText={teamMemberEmail}
-          />
-        </Alert>
+        {isInheritMemberEnabled ? (
+          <Alert variant="neutral">
+            <AlertDescription>
+              <Trans>
+                You cannot remove members from this team if the inherit member feature is enabled.
+              </Trans>
+            </AlertDescription>
+          </Alert>
+        ) : (
+          <Alert variant="neutral" padding="tight">
+            <AvatarWithText
+              avatarClass="h-12 w-12"
+              avatarFallback={memberName.slice(0, 1).toUpperCase()}
+              primaryText={<span className="font-semibold">{memberName}</span>}
+              secondaryText={memberEmail}
+            />
+          </Alert>
+        )}
 
         <fieldset disabled={isDeletingTeamMember}>
           <DialogFooter>
             <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
-              <Trans>Cancel</Trans>
+              <Trans>Close</Trans>
             </Button>
 
-            <Button
-              type="submit"
-              variant="destructive"
-              loading={isDeletingTeamMember}
-              onClick={async () => deleteTeamMembers({ teamId, teamMemberIds: [teamMemberId] })}
-            >
-              <Trans>Delete</Trans>
-            </Button>
+            {!isInheritMemberEnabled && (
+              <Button
+                type="submit"
+                variant="destructive"
+                disabled={Boolean(isInheritMemberEnabled)}
+                loading={isDeletingTeamMember}
+                onClick={async () => deleteTeamMember({ teamId, memberId })}
+              >
+                <Trans>Remove</Trans>
+              </Button>
+            )}
           </DialogFooter>
         </fieldset>
       </DialogContent>
diff --git a/apps/remix/app/components/dialogs/team-member-invite-dialog.tsx b/apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
deleted file mode 100644
index dac4f8fce..000000000
--- a/apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+++ /dev/null
@@ -1,415 +0,0 @@
-import { useEffect, useRef, useState } from 'react';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import { TeamMemberRole } from '@prisma/client';
-import type * as DialogPrimitive from '@radix-ui/react-dialog';
-import { Download, Mail, MailIcon, PlusCircle, Trash, Upload, UsersIcon } from 'lucide-react';
-import Papa, { type ParseResult } from 'papaparse';
-import { useFieldArray, useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-import { downloadFile } from '@documenso/lib/client-only/download-file';
-import { TEAM_MEMBER_ROLE_HIERARCHY, TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams';
-import { trpc } from '@documenso/trpc/react';
-import { ZCreateTeamMemberInvitesMutationSchema } from '@documenso/trpc/server/team-router/schema';
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@documenso/ui/primitives/select';
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { useCurrentTeam } from '~/providers/team';
-
-export type TeamMemberInviteDialogProps = {
-  trigger?: React.ReactNode;
-} & Omit<DialogPrimitive.DialogProps, 'children'>;
-
-const ZInviteTeamMembersFormSchema = z
-  .object({
-    invitations: ZCreateTeamMemberInvitesMutationSchema.shape.invitations,
-  })
-  // Display exactly which rows are duplicates.
-  .superRefine((items, ctx) => {
-    const uniqueEmails = new Map<string, number>();
-
-    for (const [index, invitation] of items.invitations.entries()) {
-      const email = invitation.email.toLowerCase();
-
-      const firstFoundIndex = uniqueEmails.get(email);
-
-      if (firstFoundIndex === undefined) {
-        uniqueEmails.set(email, index);
-        continue;
-      }
-
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: 'Emails must be unique',
-        path: ['invitations', index, 'email'],
-      });
-
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: 'Emails must be unique',
-        path: ['invitations', firstFoundIndex, 'email'],
-      });
-    }
-  });
-
-type TInviteTeamMembersFormSchema = z.infer<typeof ZInviteTeamMembersFormSchema>;
-
-type TabTypes = 'INDIVIDUAL' | 'BULK';
-
-const ZImportTeamMemberSchema = z.array(
-  z.object({
-    email: z.string().email(),
-    role: z.nativeEnum(TeamMemberRole),
-  }),
-);
-
-export const TeamMemberInviteDialog = ({ trigger, ...props }: TeamMemberInviteDialogProps) => {
-  const [open, setOpen] = useState(false);
-  const fileInputRef = useRef<HTMLInputElement>(null);
-  const [invitationType, setInvitationType] = useState<TabTypes>('INDIVIDUAL');
-
-  const { _ } = useLingui();
-  const { toast } = useToast();
-
-  const team = useCurrentTeam();
-
-  const form = useForm<TInviteTeamMembersFormSchema>({
-    resolver: zodResolver(ZInviteTeamMembersFormSchema),
-    defaultValues: {
-      invitations: [
-        {
-          email: '',
-          role: TeamMemberRole.MEMBER,
-        },
-      ],
-    },
-  });
-
-  const {
-    append: appendTeamMemberInvite,
-    fields: teamMemberInvites,
-    remove: removeTeamMemberInvite,
-  } = useFieldArray({
-    control: form.control,
-    name: 'invitations',
-  });
-
-  const { mutateAsync: createTeamMemberInvites } = trpc.team.createTeamMemberInvites.useMutation();
-
-  const onAddTeamMemberInvite = () => {
-    appendTeamMemberInvite({
-      email: '',
-      role: TeamMemberRole.MEMBER,
-    });
-  };
-
-  const onFormSubmit = async ({ invitations }: TInviteTeamMembersFormSchema) => {
-    try {
-      await createTeamMemberInvites({
-        teamId: team.id,
-        invitations,
-      });
-
-      toast({
-        title: _(msg`Success`),
-        description: _(msg`Team invitations have been sent.`),
-        duration: 5000,
-      });
-
-      setOpen(false);
-    } catch {
-      toast({
-        title: _(msg`An unknown error occurred`),
-        description: _(
-          msg`We encountered an unknown error while attempting to invite team members. Please try again later.`,
-        ),
-        variant: 'destructive',
-      });
-    }
-  };
-
-  useEffect(() => {
-    if (!open) {
-      form.reset();
-      setInvitationType('INDIVIDUAL');
-    }
-  }, [open, form]);
-
-  const onFileInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    if (!e.target.files?.length) {
-      return;
-    }
-
-    const csvFile = e.target.files[0];
-
-    Papa.parse(csvFile, {
-      skipEmptyLines: true,
-      comments: 'Work email,Job title',
-      complete: (results: ParseResult<string[]>) => {
-        const members = results.data.map((row) => {
-          const [email, role] = row;
-
-          return {
-            email: email.trim(),
-            role: role.trim().toUpperCase(),
-          };
-        });
-
-        // Remove the first row if it contains the headers.
-        if (members.length > 1 && members[0].role.toUpperCase() === 'ROLE') {
-          members.shift();
-        }
-
-        try {
-          const importedInvitations = ZImportTeamMemberSchema.parse(members);
-
-          form.setValue('invitations', importedInvitations);
-          form.clearErrors('invitations');
-
-          setInvitationType('INDIVIDUAL');
-        } catch (err) {
-          console.error(err);
-
-          toast({
-            title: _(msg`Something went wrong`),
-            description: _(
-              msg`Please check the CSV file and make sure it is according to our format`,
-            ),
-            variant: 'destructive',
-          });
-        }
-      },
-    });
-  };
-
-  const downloadTemplate = () => {
-    const data = [
-      { email: 'admin@documenso.com', role: 'Admin' },
-      { email: 'manager@documenso.com', role: 'Manager' },
-      { email: 'member@documenso.com', role: 'Member' },
-    ];
-
-    const csvContent =
-      'Email address,Role\n' + data.map((row) => `${row.email},${row.role}`).join('\n');
-
-    const blob = new Blob([csvContent], {
-      type: 'text/csv',
-    });
-
-    downloadFile({
-      filename: 'documenso-team-member-invites-template.csv',
-      data: blob,
-    });
-  };
-
-  return (
-    <Dialog
-      {...props}
-      open={open}
-      onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}
-    >
-      <DialogTrigger onClick={(e) => e.stopPropagation()} asChild>
-        {trigger ?? (
-          <Button variant="secondary">
-            <Trans>Invite member</Trans>
-          </Button>
-        )}
-      </DialogTrigger>
-
-      <DialogContent position="center">
-        <DialogHeader>
-          <DialogTitle>
-            <Trans>Invite team members</Trans>
-          </DialogTitle>
-
-          <DialogDescription className="mt-4">
-            <Trans>An email containing an invitation will be sent to each member.</Trans>
-          </DialogDescription>
-        </DialogHeader>
-
-        <Tabs
-          defaultValue="INDIVIDUAL"
-          value={invitationType}
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          onValueChange={(value) => setInvitationType(value as TabTypes)}
-        >
-          <TabsList className="w-full">
-            <TabsTrigger value="INDIVIDUAL" className="hover:text-foreground w-full">
-              <MailIcon size={20} className="mr-2" />
-              <Trans>Invite Members</Trans>
-            </TabsTrigger>
-
-            <TabsTrigger value="BULK" className="hover:text-foreground w-full">
-              <UsersIcon size={20} className="mr-2" /> <Trans>Bulk Import</Trans>
-            </TabsTrigger>
-          </TabsList>
-
-          <TabsContent value="INDIVIDUAL">
-            <Form {...form}>
-              <form onSubmit={form.handleSubmit(onFormSubmit)}>
-                <fieldset
-                  className="flex h-full flex-col space-y-4"
-                  disabled={form.formState.isSubmitting}
-                >
-                  <div className="custom-scrollbar -m-1 max-h-[60vh] space-y-4 overflow-y-auto p-1">
-                    {teamMemberInvites.map((teamMemberInvite, index) => (
-                      <div className="flex w-full flex-row space-x-4" key={teamMemberInvite.id}>
-                        <FormField
-                          control={form.control}
-                          name={`invitations.${index}.email`}
-                          render={({ field }) => (
-                            <FormItem className="w-full">
-                              {index === 0 && (
-                                <FormLabel required>
-                                  <Trans>Email address</Trans>
-                                </FormLabel>
-                              )}
-                              <FormControl>
-                                <Input className="bg-background" {...field} />
-                              </FormControl>
-                              <FormMessage />
-                            </FormItem>
-                          )}
-                        />
-
-                        <FormField
-                          control={form.control}
-                          name={`invitations.${index}.role`}
-                          render={({ field }) => (
-                            <FormItem className="w-full">
-                              {index === 0 && (
-                                <FormLabel required>
-                                  <Trans>Role</Trans>
-                                </FormLabel>
-                              )}
-                              <FormControl>
-                                <Select {...field} onValueChange={field.onChange}>
-                                  <SelectTrigger className="text-muted-foreground max-w-[200px]">
-                                    <SelectValue />
-                                  </SelectTrigger>
-
-                                  <SelectContent position="popper">
-                                    {TEAM_MEMBER_ROLE_HIERARCHY[team.currentTeamMember.role].map(
-                                      (role) => (
-                                        <SelectItem key={role} value={role}>
-                                          {_(TEAM_MEMBER_ROLE_MAP[role]) ?? role}
-                                        </SelectItem>
-                                      ),
-                                    )}
-                                  </SelectContent>
-                                </Select>
-                              </FormControl>
-                              <FormMessage />
-                            </FormItem>
-                          )}
-                        />
-
-                        <button
-                          type="button"
-                          className={cn(
-                            'justify-left inline-flex h-10 w-10 items-center text-slate-500 hover:opacity-80 disabled:cursor-not-allowed disabled:opacity-50',
-                            index === 0 ? 'mt-8' : 'mt-0',
-                          )}
-                          disabled={teamMemberInvites.length === 1}
-                          onClick={() => removeTeamMemberInvite(index)}
-                        >
-                          <Trash className="h-5 w-5" />
-                        </button>
-                      </div>
-                    ))}
-                  </div>
-
-                  <Button
-                    type="button"
-                    size="sm"
-                    variant="outline"
-                    className="w-fit"
-                    onClick={() => onAddTeamMemberInvite()}
-                  >
-                    <PlusCircle className="mr-2 h-4 w-4" />
-                    <Trans>Add more</Trans>
-                  </Button>
-
-                  <DialogFooter>
-                    <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
-                      <Trans>Cancel</Trans>
-                    </Button>
-
-                    <Button type="submit" loading={form.formState.isSubmitting}>
-                      {!form.formState.isSubmitting && <Mail className="mr-2 h-4 w-4" />}
-                      <Trans>Invite</Trans>
-                    </Button>
-                  </DialogFooter>
-                </fieldset>
-              </form>
-            </Form>
-          </TabsContent>
-
-          <TabsContent value="BULK">
-            <div className="mt-4 space-y-4">
-              <Card gradient className="h-32">
-                <CardContent
-                  className="text-muted-foreground/80 hover:text-muted-foreground/90 flex h-full cursor-pointer flex-col items-center justify-center rounded-lg p-0 transition-colors"
-                  onClick={() => fileInputRef.current?.click()}
-                >
-                  <Upload className="h-5 w-5" />
-
-                  <p className="mt-1 text-sm">
-                    <Trans>Click here to upload</Trans>
-                  </p>
-
-                  <input
-                    onChange={onFileInputChange}
-                    type="file"
-                    ref={fileInputRef}
-                    accept=".csv"
-                    hidden
-                  />
-                </CardContent>
-              </Card>
-
-              <DialogFooter>
-                <Button type="button" variant="secondary" onClick={downloadTemplate}>
-                  <Download className="mr-2 h-4 w-4" />
-                  <Trans>Template</Trans>
-                </Button>
-              </DialogFooter>
-            </div>
-          </TabsContent>
-        </Tabs>
-      </DialogContent>
-    </Dialog>
-  );
-};
diff --git a/apps/remix/app/components/dialogs/team-member-update-dialog.tsx b/apps/remix/app/components/dialogs/team-member-update-dialog.tsx
index e9c3a021b..b7729f734 100644
--- a/apps/remix/app/components/dialogs/team-member-update-dialog.tsx
+++ b/apps/remix/app/components/dialogs/team-member-update-dialog.tsx
@@ -9,7 +9,8 @@ import type * as DialogPrimitive from '@radix-ui/react-dialog';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 
-import { TEAM_MEMBER_ROLE_HIERARCHY, TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams';
+import { TEAM_MEMBER_ROLE_HIERARCHY } from '@documenso/lib/constants/teams';
+import { EXTENDED_TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams-translations';
 import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
@@ -43,9 +44,9 @@ export type TeamMemberUpdateDialogProps = {
   currentUserTeamRole: TeamMemberRole;
   trigger?: React.ReactNode;
   teamId: number;
-  teamMemberId: number;
-  teamMemberName: string;
-  teamMemberRole: TeamMemberRole;
+  memberId: string;
+  memberName: string;
+  memberTeamRole: TeamMemberRole;
 } & Omit<DialogPrimitive.DialogProps, 'children'>;
 
 const ZUpdateTeamMemberFormSchema = z.object({
@@ -58,9 +59,9 @@ export const TeamMemberUpdateDialog = ({
   currentUserTeamRole,
   trigger,
   teamId,
-  teamMemberId,
-  teamMemberName,
-  teamMemberRole,
+  memberId,
+  memberName,
+  memberTeamRole,
   ...props
 }: TeamMemberUpdateDialogProps) => {
   const [open, setOpen] = useState(false);
@@ -71,17 +72,17 @@ export const TeamMemberUpdateDialog = ({
   const form = useForm<ZUpdateTeamMemberSchema>({
     resolver: zodResolver(ZUpdateTeamMemberFormSchema),
     defaultValues: {
-      role: teamMemberRole,
+      role: memberTeamRole,
     },
   });
 
-  const { mutateAsync: updateTeamMember } = trpc.team.updateTeamMember.useMutation();
+  const { mutateAsync: updateTeamMember } = trpc.team.member.update.useMutation();
 
   const onFormSubmit = async ({ role }: ZUpdateTeamMemberSchema) => {
     try {
       await updateTeamMember({
         teamId,
-        teamMemberId,
+        memberId,
         data: {
           role,
         },
@@ -89,7 +90,7 @@ export const TeamMemberUpdateDialog = ({
 
       toast({
         title: _(msg`Success`),
-        description: _(msg`You have updated ${teamMemberName}.`),
+        description: _(msg`You have updated ${memberName}.`),
         duration: 5000,
       });
 
@@ -112,7 +113,7 @@ export const TeamMemberUpdateDialog = ({
 
     form.reset();
 
-    if (!isTeamRoleWithinUserHierarchy(currentUserTeamRole, teamMemberRole)) {
+    if (!isTeamRoleWithinUserHierarchy(currentUserTeamRole, memberTeamRole)) {
       setOpen(false);
 
       toast({
@@ -121,7 +122,7 @@ export const TeamMemberUpdateDialog = ({
       });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [open, currentUserTeamRole, teamMemberRole, form, toast]);
+  }, [open, currentUserTeamRole, memberTeamRole, form, toast]);
 
   return (
     <Dialog
@@ -143,9 +144,9 @@ export const TeamMemberUpdateDialog = ({
             <Trans>Update team member</Trans>
           </DialogTitle>
 
-          <DialogDescription className="mt-4">
+          <DialogDescription>
             <Trans>
-              You are currently updating <span className="font-bold">{teamMemberName}.</span>
+              You are currently updating <span className="font-bold">{memberName}.</span>
             </Trans>
           </DialogDescription>
         </DialogHeader>
@@ -170,7 +171,7 @@ export const TeamMemberUpdateDialog = ({
                         <SelectContent className="w-full" position="popper">
                           {TEAM_MEMBER_ROLE_HIERARCHY[currentUserTeamRole].map((role) => (
                             <SelectItem key={role} value={role}>
-                              {_(TEAM_MEMBER_ROLE_MAP[role]) ?? role}
+                              {_(EXTENDED_TEAM_MEMBER_ROLE_MAP[role]) ?? role}
                             </SelectItem>
                           ))}
                         </SelectContent>
diff --git a/apps/remix/app/components/dialogs/team-transfer-dialog.tsx b/apps/remix/app/components/dialogs/team-transfer-dialog.tsx
deleted file mode 100644
index 4e46233cc..000000000
--- a/apps/remix/app/components/dialogs/team-transfer-dialog.tsx
+++ /dev/null
@@ -1,272 +0,0 @@
-import { useEffect, useState } from 'react';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import { Loader } from 'lucide-react';
-import { useForm } from 'react-hook-form';
-import { useRevalidator } from 'react-router';
-import { z } from 'zod';
-
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
-import { trpc } from '@documenso/trpc/react';
-import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@documenso/ui/primitives/select';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type TeamTransferDialogProps = {
-  teamId: number;
-  teamName: string;
-  ownerUserId: number;
-  trigger?: React.ReactNode;
-};
-
-export const TeamTransferDialog = ({
-  trigger,
-  teamId,
-  teamName,
-  ownerUserId,
-}: TeamTransferDialogProps) => {
-  const [open, setOpen] = useState(false);
-
-  const { _ } = useLingui();
-  const { toast } = useToast();
-  const { revalidate } = useRevalidator();
-
-  const { mutateAsync: requestTeamOwnershipTransfer } =
-    trpc.team.requestTeamOwnershipTransfer.useMutation();
-
-  const {
-    data,
-    refetch: refetchTeamMembers,
-    isPending: loadingTeamMembers,
-    isLoadingError: loadingTeamMembersError,
-  } = trpc.team.getTeamMembers.useQuery({
-    teamId,
-  });
-
-  const confirmTransferMessage = _(msg`transfer ${teamName}`);
-
-  const ZTransferTeamFormSchema = z.object({
-    teamName: z.literal(confirmTransferMessage, {
-      errorMap: () => ({ message: `You must enter '${confirmTransferMessage}' to proceed` }),
-    }),
-    newOwnerUserId: z.string(),
-    clearPaymentMethods: z.boolean(),
-  });
-
-  const form = useForm<z.infer<typeof ZTransferTeamFormSchema>>({
-    resolver: zodResolver(ZTransferTeamFormSchema),
-    defaultValues: {
-      teamName: '',
-      clearPaymentMethods: false,
-    },
-  });
-
-  const onFormSubmit = async ({
-    newOwnerUserId,
-    clearPaymentMethods,
-  }: z.infer<typeof ZTransferTeamFormSchema>) => {
-    try {
-      await requestTeamOwnershipTransfer({
-        teamId,
-        newOwnerUserId: Number.parseInt(newOwnerUserId),
-        clearPaymentMethods,
-      });
-
-      await revalidate();
-
-      toast({
-        title: _(msg`Success`),
-        description: _(msg`An email requesting the transfer of this team has been sent.`),
-        duration: 5000,
-      });
-
-      setOpen(false);
-    } catch (err) {
-      toast({
-        title: _(msg`An unknown error occurred`),
-        description: _(
-          msg`We encountered an unknown error while attempting to request a transfer of this team. Please try again later.`,
-        ),
-        variant: 'destructive',
-        duration: 10000,
-      });
-    }
-  };
-
-  useEffect(() => {
-    if (!open) {
-      form.reset();
-    }
-  }, [open, form]);
-
-  useEffect(() => {
-    if (open && loadingTeamMembersError) {
-      void refetchTeamMembers();
-    }
-  }, [open, loadingTeamMembersError, refetchTeamMembers]);
-
-  const teamMembers = data
-    ? data.filter((teamMember) => teamMember.userId !== ownerUserId)
-    : undefined;
-
-  return (
-    <Dialog open={open} onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)}>
-      <DialogTrigger asChild>
-        {trigger ?? (
-          <Button variant="outline" className="bg-background">
-            <Trans>Transfer team</Trans>
-          </Button>
-        )}
-      </DialogTrigger>
-
-      {teamMembers && teamMembers.length > 0 ? (
-        <DialogContent position="center">
-          <DialogHeader>
-            <DialogTitle>
-              <Trans>Transfer team</Trans>
-            </DialogTitle>
-
-            <DialogDescription className="mt-4">
-              <Trans>Transfer ownership of this team to a selected team member.</Trans>
-            </DialogDescription>
-          </DialogHeader>
-
-          <Form {...form}>
-            <form onSubmit={form.handleSubmit(onFormSubmit)}>
-              <fieldset
-                className="flex h-full flex-col space-y-4"
-                disabled={form.formState.isSubmitting}
-              >
-                <FormField
-                  control={form.control}
-                  name="newOwnerUserId"
-                  render={({ field }) => (
-                    <FormItem className="w-full">
-                      <FormLabel required>
-                        <Trans>New team owner</Trans>
-                      </FormLabel>
-                      <FormControl>
-                        <Select {...field} onValueChange={field.onChange}>
-                          <SelectTrigger className="text-muted-foreground">
-                            <SelectValue />
-                          </SelectTrigger>
-
-                          <SelectContent position="popper">
-                            {teamMembers.map((teamMember) => (
-                              <SelectItem
-                                key={teamMember.userId}
-                                value={teamMember.userId.toString()}
-                              >
-                                {teamMember.user.name} ({teamMember.user.email})
-                              </SelectItem>
-                            ))}
-                          </SelectContent>
-                        </Select>
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={form.control}
-                  name="teamName"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>
-                        <Trans>
-                          Confirm by typing{' '}
-                          <span className="text-destructive">{confirmTransferMessage}</span>
-                        </Trans>
-                      </FormLabel>
-                      <FormControl>
-                        <Input className="bg-background" {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <Alert variant="neutral">
-                  <AlertDescription>
-                    <ul className="list-outside list-disc space-y-2 pl-4">
-                      {IS_BILLING_ENABLED() && (
-                        <li>
-                          <Trans>
-                            Any payment methods attached to this team will remain attached to this
-                            team. Please contact us if you need to update this information.
-                          </Trans>
-                        </li>
-                      )}
-                      <li>
-                        <Trans>
-                          The selected team member will receive an email which they must accept
-                          before the team is transferred
-                        </Trans>
-                      </li>
-                    </ul>
-                  </AlertDescription>
-                </Alert>
-
-                <DialogFooter>
-                  <Button type="button" variant="secondary" onClick={() => setOpen(false)}>
-                    <Trans>Cancel</Trans>
-                  </Button>
-
-                  <Button type="submit" variant="destructive" loading={form.formState.isSubmitting}>
-                    <Trans>Request transfer</Trans>
-                  </Button>
-                </DialogFooter>
-              </fieldset>
-            </form>
-          </Form>
-        </DialogContent>
-      ) : (
-        <DialogContent
-          position="center"
-          className="text-muted-foreground flex items-center justify-center py-16 text-sm"
-        >
-          {loadingTeamMembers ? (
-            <Loader className="text-muted-foreground h-6 w-6 animate-spin" />
-          ) : (
-            <p className="text-center text-sm">
-              {loadingTeamMembersError ? (
-                <Trans>An error occurred while loading team members. Please try again later.</Trans>
-              ) : (
-                <Trans>You must have at least one other team member to transfer ownership.</Trans>
-              )}
-            </p>
-          )}
-        </DialogContent>
-      )}
-    </Dialog>
-  );
-};
diff --git a/apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx b/apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
index cd700ac1e..610ce7ac3 100644
--- a/apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
+++ b/apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
@@ -21,7 +21,7 @@ import {
 import { Form, FormControl, FormField, FormItem } from '@documenso/ui/primitives/form/form';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 const ZBulkSendFormSchema = z.object({
   file: z.instanceof(File),
@@ -46,7 +46,7 @@ export const TemplateBulkSendDialog = ({
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const form = useForm<TBulkSendFormSchema>({
     resolver: zodResolver(ZBulkSendFormSchema),
diff --git a/apps/remix/app/components/dialogs/template-direct-link-dialog.tsx b/apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
index 8142eb848..d7e60b512 100644
--- a/apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
+++ b/apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
@@ -15,6 +15,7 @@ import { P, match } from 'ts-pattern';
 
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
 import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { DIRECT_TEMPLATE_RECIPIENT_EMAIL } from '@documenso/lib/constants/direct-templates';
 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
 import { DIRECT_TEMPLATE_DOCUMENTATION } from '@documenso/lib/constants/template';
@@ -75,6 +76,8 @@ export const TemplateDirectLinkDialog = ({
     token ? 'MANAGE' : 'ONBOARD',
   );
 
+  const organisation = useCurrentOrganisation();
+
   const validDirectTemplateRecipients = useMemo(
     () =>
       template.recipients.filter(
@@ -237,7 +240,7 @@ export const TemplateDirectLinkDialog = ({
                         templates.{' '}
                         <Link
                           className="mt-1 block underline underline-offset-4"
-                          to="/settings/billing"
+                          to={`/o/${organisation.url}/settings/billing`}
                         >
                           Upgrade your account to continue!
                         </Link>
diff --git a/apps/remix/app/components/dialogs/template-folder-create-dialog.tsx b/apps/remix/app/components/dialogs/template-folder-create-dialog.tsx
index aaf0322f4..db1da14de 100644
--- a/apps/remix/app/components/dialogs/template-folder-create-dialog.tsx
+++ b/apps/remix/app/components/dialogs/template-folder-create-dialog.tsx
@@ -34,7 +34,7 @@ import {
 import { Input } from '@documenso/ui/primitives/input';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 const ZCreateFolderFormSchema = z.object({
   name: z.string().min(1, { message: 'Folder name is required' }),
@@ -52,10 +52,11 @@ export const TemplateFolderCreateDialog = ({
 }: TemplateFolderCreateDialogProps) => {
   const { toast } = useToast();
   const { _ } = useLingui();
-  const navigate = useNavigate();
-  const team = useOptionalCurrentTeam();
   const { folderId } = useParams();
 
+  const navigate = useNavigate();
+  const team = useCurrentTeam();
+
   const [isCreateFolderOpen, setIsCreateFolderOpen] = useState(false);
 
   const { mutateAsync: createFolder } = trpc.folder.createFolder.useMutation();
@@ -81,7 +82,7 @@ export const TemplateFolderCreateDialog = ({
         description: _(msg`Folder created successfully`),
       });
 
-      const templatesPath = formatTemplatesPath(team?.url);
+      const templatesPath = formatTemplatesPath(team.url);
 
       void navigate(`${templatesPath}/f/${newFolder.id}`);
     } catch (err) {
@@ -126,7 +127,7 @@ export const TemplateFolderCreateDialog = ({
         <DialogHeader>
           <DialogTitle>Create New Folder</DialogTitle>
           <DialogDescription>
-            Enter a name for your new folder. Folders help you organize your templates.
+            Enter a name for your new folder. Folders help you organise your templates.
           </DialogDescription>
         </DialogHeader>
 
diff --git a/apps/remix/app/components/dialogs/template-move-dialog.tsx b/apps/remix/app/components/dialogs/template-move-dialog.tsx
deleted file mode 100644
index f113317eb..000000000
--- a/apps/remix/app/components/dialogs/template-move-dialog.tsx
+++ /dev/null
@@ -1,158 +0,0 @@
-import { useState } from 'react';
-
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import { match } from 'ts-pattern';
-
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
-import { trpc } from '@documenso/trpc/react';
-import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@documenso/ui/primitives/select';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-type TemplateMoveDialogProps = {
-  templateId: number;
-  open: boolean;
-  onOpenChange: (_open: boolean) => void;
-  onMove?: ({
-    templateId,
-    teamUrl,
-  }: {
-    templateId: number;
-    teamUrl: string;
-  }) => Promise<void> | void;
-};
-
-export const TemplateMoveDialog = ({
-  templateId,
-  open,
-  onOpenChange,
-  onMove,
-}: TemplateMoveDialogProps) => {
-  const { toast } = useToast();
-  const { _ } = useLingui();
-
-  const [selectedTeamId, setSelectedTeamId] = useState<number | null>(null);
-
-  const { data: teams, isLoading: isLoadingTeams } = trpc.team.getTeams.useQuery();
-
-  const { mutateAsync: moveTemplate, isPending } = trpc.template.moveTemplateToTeam.useMutation({
-    onSuccess: async () => {
-      const team = teams?.find((team) => team.id === selectedTeamId);
-
-      if (team) {
-        await onMove?.({ templateId, teamUrl: team.url });
-      }
-
-      toast({
-        title: _(msg`Template moved`),
-        description: _(msg`The template has been successfully moved to the selected team.`),
-        duration: 5000,
-      });
-
-      onOpenChange(false);
-    },
-    onError: (err) => {
-      const error = AppError.parseError(err);
-
-      const errorMessage = match(error.code)
-        .with(
-          AppErrorCode.NOT_FOUND,
-          () => msg`Template not found or already associated with a team.`,
-        )
-        .with(AppErrorCode.UNAUTHORIZED, () => msg`You are not a member of this team.`)
-        .otherwise(() => msg`An error occurred while moving the template.`);
-
-      toast({
-        title: _(msg`Error`),
-        description: _(errorMessage),
-        variant: 'destructive',
-        duration: 7500,
-      });
-    },
-  });
-
-  const handleOnMove = async () => {
-    if (!selectedTeamId) {
-      return;
-    }
-
-    await moveTemplate({ templateId, teamId: selectedTeamId });
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>
-            <Trans>Move Template to Team</Trans>
-          </DialogTitle>
-          <DialogDescription>
-            <Trans>Select a team to move this template to. This action cannot be undone.</Trans>
-          </DialogDescription>
-        </DialogHeader>
-
-        <Select onValueChange={(value) => setSelectedTeamId(Number(value))}>
-          <SelectTrigger>
-            <SelectValue placeholder={_(msg`Select a team`)} />
-          </SelectTrigger>
-          <SelectContent>
-            {isLoadingTeams ? (
-              <SelectItem value="loading" disabled>
-                <Trans>Loading teams...</Trans>
-              </SelectItem>
-            ) : (
-              teams?.map((team) => (
-                <SelectItem key={team.id} value={team.id.toString()}>
-                  <div className="flex items-center gap-4">
-                    <Avatar className="h-8 w-8">
-                      {team.avatarImageId && (
-                        <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />
-                      )}
-
-                      <AvatarFallback className="text-sm text-gray-400">
-                        {team.name.slice(0, 1).toUpperCase()}
-                      </AvatarFallback>
-                    </Avatar>
-
-                    <span>{team.name}</span>
-                  </div>
-                </SelectItem>
-              ))
-            )}
-          </SelectContent>
-        </Select>
-
-        <DialogFooter>
-          <Button variant="secondary" onClick={() => onOpenChange(false)}>
-            <Trans>Cancel</Trans>
-          </Button>
-          <Button
-            onClick={handleOnMove}
-            loading={isPending}
-            disabled={!selectedTeamId || isPending}
-          >
-            {isPending ? <Trans>Moving...</Trans> : <Trans>Move</Trans>}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-};
diff --git a/apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx b/apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
index c0d068ac4..4838995b5 100644
--- a/apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
+++ b/apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
@@ -33,7 +33,7 @@ import {
 } from '@documenso/ui/primitives/form/form';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 export type TemplateMoveToFolderDialogProps = {
   templateId: number;
@@ -60,7 +60,7 @@ export function TemplateMoveToFolderDialog({
   const { _ } = useLingui();
   const { toast } = useToast();
   const navigate = useNavigate();
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const form = useForm<TMoveTemplateFormSchema>({
     resolver: zodResolver(ZMoveTemplateFormSchema),
@@ -104,7 +104,7 @@ export function TemplateMoveToFolderDialog({
 
       onOpenChange(false);
 
-      const templatesPath = formatTemplatesPath(team?.url);
+      const templatesPath = formatTemplatesPath(team.url);
 
       if (data.folderId) {
         void navigate(`${templatesPath}/f/${data.folderId}`);
diff --git a/apps/remix/app/components/dialogs/token-delete-dialog.tsx b/apps/remix/app/components/dialogs/token-delete-dialog.tsx
index 511ce04db..aa557132b 100644
--- a/apps/remix/app/components/dialogs/token-delete-dialog.tsx
+++ b/apps/remix/app/components/dialogs/token-delete-dialog.tsx
@@ -30,7 +30,7 @@ import {
 import { Input } from '@documenso/ui/primitives/input';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 export type TokenDeleteDialogProps = {
   token: Pick<ApiToken, 'id' | 'name'>;
@@ -42,7 +42,7 @@ export default function TokenDeleteDialog({ token, onDelete, children }: TokenDe
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const [isOpen, setIsOpen] = useState(false);
 
diff --git a/apps/remix/app/components/dialogs/webhook-create-dialog.tsx b/apps/remix/app/components/dialogs/webhook-create-dialog.tsx
index f8c5c94d2..ce1109322 100644
--- a/apps/remix/app/components/dialogs/webhook-create-dialog.tsx
+++ b/apps/remix/app/components/dialogs/webhook-create-dialog.tsx
@@ -9,7 +9,7 @@ import { useForm } from 'react-hook-form';
 import type { z } from 'zod';
 
 import { trpc } from '@documenso/trpc/react';
-import { ZCreateWebhookMutationSchema } from '@documenso/trpc/server/webhook-router/schema';
+import { ZCreateWebhookRequestSchema } from '@documenso/trpc/server/webhook-router/schema';
 import { Button } from '@documenso/ui/primitives/button';
 import {
   Dialog,
@@ -34,11 +34,11 @@ import { PasswordInput } from '@documenso/ui/primitives/password-input';
 import { Switch } from '@documenso/ui/primitives/switch';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 import { WebhookMultiSelectCombobox } from '../general/webhook-multiselect-combobox';
 
-const ZCreateWebhookFormSchema = ZCreateWebhookMutationSchema.omit({ teamId: true });
+const ZCreateWebhookFormSchema = ZCreateWebhookRequestSchema.omit({ teamId: true });
 
 type TCreateWebhookFormSchema = z.infer<typeof ZCreateWebhookFormSchema>;
 
@@ -50,7 +50,7 @@ export const WebhookCreateDialog = ({ trigger, ...props }: WebhookCreateDialogPr
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const [open, setOpen] = useState(false);
 
@@ -78,7 +78,7 @@ export const WebhookCreateDialog = ({ trigger, ...props }: WebhookCreateDialogPr
         eventTriggers,
         secret,
         webhookUrl,
-        teamId: team?.id,
+        teamId: team.id,
       });
 
       setOpen(false);
diff --git a/apps/remix/app/components/dialogs/webhook-delete-dialog.tsx b/apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
index 5842f4fb7..6fb369577 100644
--- a/apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
+++ b/apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
@@ -30,7 +30,7 @@ import {
 import { Input } from '@documenso/ui/primitives/input';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 export type WebhookDeleteDialogProps = {
   webhook: Pick<Webhook, 'id' | 'webhookUrl'>;
@@ -42,7 +42,7 @@ export const WebhookDeleteDialog = ({ webhook, children }: WebhookDeleteDialogPr
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const [open, setOpen] = useState(false);
 
@@ -67,7 +67,7 @@ export const WebhookDeleteDialog = ({ webhook, children }: WebhookDeleteDialogPr
 
   const onSubmit = async () => {
     try {
-      await deleteWebhook({ id: webhook.id, teamId: team?.id });
+      await deleteWebhook({ id: webhook.id, teamId: team.id });
 
       toast({
         title: _(msg`Webhook deleted`),
diff --git a/apps/remix/app/components/forms/avatar-image.tsx b/apps/remix/app/components/forms/avatar-image.tsx
index 852063287..0d6dd4ddf 100644
--- a/apps/remix/app/components/forms/avatar-image.tsx
+++ b/apps/remix/app/components/forms/avatar-image.tsx
@@ -6,7 +6,6 @@ import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { ErrorCode, useDropzone } from 'react-dropzone';
 import { useForm } from 'react-hook-form';
-import { useRevalidator } from 'react-router';
 import { match } from 'ts-pattern';
 import { z } from 'zod';
 
@@ -29,8 +28,6 @@ import {
 } from '@documenso/ui/primitives/form/form';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
-
 export const ZAvatarImageFormSchema = z.object({
   bytes: z.string().nullish(),
 });
@@ -39,29 +36,44 @@ export type TAvatarImageFormSchema = z.infer<typeof ZAvatarImageFormSchema>;
 
 export type AvatarImageFormProps = {
   className?: string;
+  team?: {
+    id: number;
+    name: string;
+    avatarImageId: string | null;
+  };
+  organisation?: {
+    id: string;
+    name: string;
+    avatarImageId: string | null;
+  };
 };
 
-export const AvatarImageForm = ({ className }: AvatarImageFormProps) => {
+export const AvatarImageForm = ({ className, team, organisation }: AvatarImageFormProps) => {
   const { user, refreshSession } = useSession();
   const { _ } = useLingui();
   const { toast } = useToast();
-  const { revalidate } = useRevalidator();
-
-  const team = useOptionalCurrentTeam();
 
   const { mutateAsync: setProfileImage } = trpc.profile.setProfileImage.useMutation();
 
-  const initials = extractInitials(team?.name || user.name || '');
+  const initials = extractInitials(team?.name || organisation?.name || user.name || '');
 
   const hasAvatarImage = useMemo(() => {
     if (team) {
       return team.avatarImageId !== null;
     }
 
-    return user.avatarImageId !== null;
-  }, [team, user.avatarImageId]);
+    if (organisation) {
+      return organisation.avatarImageId !== null;
+    }
 
-  const avatarImageId = team ? team.avatarImageId : user.avatarImageId;
+    return user.avatarImageId !== null;
+  }, [team, organisation, user.avatarImageId]);
+
+  const avatarImageId = team
+    ? team.avatarImageId
+    : organisation
+      ? organisation.avatarImageId
+      : user.avatarImageId;
 
   const form = useForm<TAvatarImageFormSchema>({
     values: {
@@ -100,7 +112,8 @@ export const AvatarImageForm = ({ className }: AvatarImageFormProps) => {
     try {
       await setProfileImage({
         bytes: data.bytes,
-        teamId: team?.id,
+        teamId: team?.id ?? null,
+        organisationId: organisation?.id ?? null,
       });
 
       await refreshSession();
diff --git a/apps/remix/app/components/forms/team-branding-preferences-form.tsx b/apps/remix/app/components/forms/branding-preferences-form.tsx
similarity index 64%
rename from apps/remix/app/components/forms/team-branding-preferences-form.tsx
rename to apps/remix/app/components/forms/branding-preferences-form.tsx
index 5cc519960..85355a7b1 100644
--- a/apps/remix/app/components/forms/team-branding-preferences-form.tsx
+++ b/apps/remix/app/components/forms/branding-preferences-form.tsx
@@ -1,17 +1,14 @@
 import { useEffect, useState } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
+import { useLingui } from '@lingui/react/macro';
 import { Trans } from '@lingui/react/macro';
-import type { Team, TeamGlobalSettings } from '@prisma/client';
+import type { TeamGlobalSettings } from '@prisma/client';
 import { Loader } from 'lucide-react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 
 import { getFile } from '@documenso/lib/universal/upload/get-file';
-import { putFile } from '@documenso/lib/universal/upload/put-file';
-import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 import {
@@ -23,15 +20,20 @@ import {
   FormLabel,
 } from '@documenso/ui/primitives/form/form';
 import { Input } from '@documenso/ui/primitives/input';
-import { Switch } from '@documenso/ui/primitives/switch';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@documenso/ui/primitives/select';
 import { Textarea } from '@documenso/ui/primitives/textarea';
-import { useToast } from '@documenso/ui/primitives/use-toast';
 
 const MAX_FILE_SIZE = 5 * 1024 * 1024; // 5MB
 const ACCEPTED_FILE_TYPES = ['image/jpeg', 'image/png', 'image/webp'];
 
-const ZTeamBrandingPreferencesFormSchema = z.object({
-  brandingEnabled: z.boolean(),
+const ZBrandingPreferencesFormSchema = z.object({
+  brandingEnabled: z.boolean().nullable(),
   brandingLogo: z
     .instanceof(File)
     .refine((file) => file.size <= MAX_FILE_SIZE, 'File size must be less than 5MB')
@@ -44,76 +46,45 @@ const ZTeamBrandingPreferencesFormSchema = z.object({
   brandingCompanyDetails: z.string().max(500).optional(),
 });
 
-type TTeamBrandingPreferencesFormSchema = z.infer<typeof ZTeamBrandingPreferencesFormSchema>;
+export type TBrandingPreferencesFormSchema = z.infer<typeof ZBrandingPreferencesFormSchema>;
 
-export type TeamBrandingPreferencesFormProps = {
-  team: Team;
-  settings?: TeamGlobalSettings | null;
+type SettingsSubset = Pick<
+  TeamGlobalSettings,
+  'brandingEnabled' | 'brandingLogo' | 'brandingUrl' | 'brandingCompanyDetails'
+>;
+
+export type BrandingPreferencesFormProps = {
+  canInherit?: boolean;
+  settings: SettingsSubset;
+  onFormSubmit: (data: TBrandingPreferencesFormSchema) => Promise<void>;
+  context: 'Team' | 'Organisation';
 };
 
-export function TeamBrandingPreferencesForm({ team, settings }: TeamBrandingPreferencesFormProps) {
-  const { _ } = useLingui();
-  const { toast } = useToast();
+export function BrandingPreferencesForm({
+  canInherit = false,
+  settings,
+  onFormSubmit,
+  context,
+}: BrandingPreferencesFormProps) {
+  const { t } = useLingui();
 
   const [previewUrl, setPreviewUrl] = useState<string>('');
   const [hasLoadedPreview, setHasLoadedPreview] = useState(false);
 
-  const { mutateAsync: updateTeamBrandingSettings } =
-    trpc.team.updateTeamBrandingSettings.useMutation();
-
-  const form = useForm<TTeamBrandingPreferencesFormSchema>({
+  const form = useForm<TBrandingPreferencesFormSchema>({
     defaultValues: {
-      brandingEnabled: settings?.brandingEnabled ?? false,
-      brandingUrl: settings?.brandingUrl ?? '',
+      brandingEnabled: settings.brandingEnabled ?? null,
+      brandingUrl: settings.brandingUrl ?? '',
       brandingLogo: undefined,
-      brandingCompanyDetails: settings?.brandingCompanyDetails ?? '',
+      brandingCompanyDetails: settings.brandingCompanyDetails ?? '',
     },
-    resolver: zodResolver(ZTeamBrandingPreferencesFormSchema),
+    resolver: zodResolver(ZBrandingPreferencesFormSchema),
   });
 
   const isBrandingEnabled = form.watch('brandingEnabled');
 
-  const onSubmit = async (data: TTeamBrandingPreferencesFormSchema) => {
-    try {
-      const { brandingEnabled, brandingLogo, brandingUrl, brandingCompanyDetails } = data;
-
-      let uploadedBrandingLogo = settings?.brandingLogo;
-
-      if (brandingLogo) {
-        uploadedBrandingLogo = JSON.stringify(await putFile(brandingLogo));
-      }
-
-      if (brandingLogo === null) {
-        uploadedBrandingLogo = '';
-      }
-
-      await updateTeamBrandingSettings({
-        teamId: team.id,
-        settings: {
-          brandingEnabled,
-          brandingLogo: uploadedBrandingLogo,
-          brandingUrl,
-          brandingCompanyDetails,
-        },
-      });
-
-      toast({
-        title: _(msg`Branding preferences updated`),
-        description: _(msg`Your branding preferences have been updated`),
-      });
-    } catch (err) {
-      toast({
-        title: _(msg`Something went wrong`),
-        description: _(
-          msg`We were unable to update your branding preferences at this time, please try again later`,
-        ),
-        variant: 'destructive',
-      });
-    }
-  };
-
   useEffect(() => {
-    if (settings?.brandingLogo) {
+    if (settings.brandingLogo) {
       const file = JSON.parse(settings.brandingLogo);
 
       if ('type' in file && 'data' in file) {
@@ -129,7 +100,7 @@ export function TeamBrandingPreferencesForm({ team, settings }: TeamBrandingPref
     }
 
     setHasLoadedPreview(true);
-  }, [settings?.brandingLogo]);
+  }, [settings.brandingLogo]);
 
   // Cleanup ObjectURL on unmount or when previewUrl changes
   useEffect(() => {
@@ -142,45 +113,72 @@ export function TeamBrandingPreferencesForm({ team, settings }: TeamBrandingPref
 
   return (
     <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)}>
-        <fieldset
-          className="flex h-full max-w-xl flex-col gap-y-4"
-          disabled={form.formState.isSubmitting}
-        >
+      <form onSubmit={form.handleSubmit(onFormSubmit)}>
+        <fieldset className="flex h-full flex-col gap-y-4" disabled={form.formState.isSubmitting}>
           <FormField
             control={form.control}
             name="brandingEnabled"
             render={({ field }) => (
               <FormItem className="flex-1">
-                <FormLabel>Enable Custom Branding</FormLabel>
+                <FormLabel>
+                  <Trans>Enable Custom Branding</Trans>
+                </FormLabel>
 
-                <div>
-                  <FormControl>
-                    <Switch
-                      ref={field.ref}
-                      name={field.name}
-                      checked={field.value}
-                      onCheckedChange={field.onChange}
-                    />
-                  </FormControl>
-                </div>
+                <FormControl>
+                  <Select
+                    {...field}
+                    value={field.value === null ? '-1' : field.value.toString()}
+                    onValueChange={(value) =>
+                      field.onChange(value === 'true' ? true : value === 'false' ? false : null)
+                    }
+                  >
+                    <SelectTrigger
+                      className="bg-background text-muted-foreground"
+                      data-testid="enable-branding"
+                    >
+                      <SelectValue />
+                    </SelectTrigger>
+
+                    <SelectContent className="z-[9999]">
+                      <SelectItem value="true">
+                        <Trans>Yes</Trans>
+                      </SelectItem>
+
+                      <SelectItem value="false">
+                        <Trans>No</Trans>
+                      </SelectItem>
+
+                      {canInherit && (
+                        <SelectItem value={'-1'}>
+                          <Trans>Inherit from organisation</Trans>
+                        </SelectItem>
+                      )}
+                    </SelectContent>
+                  </Select>
+                </FormControl>
 
                 <FormDescription>
-                  <Trans>Enable custom branding for all documents in this team.</Trans>
+                  {context === 'Team' ? (
+                    <Trans>Enable custom branding for all documents in this team</Trans>
+                  ) : (
+                    <Trans>Enable custom branding for all documents in this organisation</Trans>
+                  )}
                 </FormDescription>
               </FormItem>
             )}
           />
 
           <div className="relative flex w-full flex-col gap-y-4">
-            {!isBrandingEnabled && <div className="bg-background/60 absolute inset-0 z-[9999]" />}
+            {!isBrandingEnabled && <div className="bg-background/60 absolute inset-0 z-[9998]" />}
 
             <FormField
               control={form.control}
               name="brandingLogo"
               render={({ field: { value: _value, onChange, ...field } }) => (
                 <FormItem className="flex-1">
-                  <FormLabel>Branding Logo</FormLabel>
+                  <FormLabel>
+                    <Trans>Branding Logo</Trans>
+                  </FormLabel>
 
                   <div className="flex flex-col gap-4">
                     <div className="border-border bg-background relative h-48 w-full overflow-hidden rounded-lg border">
@@ -192,7 +190,8 @@ export function TeamBrandingPreferencesForm({ team, settings }: TeamBrandingPref
                         />
                       ) : (
                         <div className="bg-muted/20 dark:bg-muted text-muted-foreground relative flex h-full w-full items-center justify-center text-sm">
-                          Please upload a logo
+                          <Trans>Please upload a logo</Trans>
+
                           {!hasLoadedPreview && (
                             <div className="bg-muted dark:bg-muted absolute inset-0 z-[999] flex items-center justify-center">
                               <Loader className="text-muted-foreground h-8 w-8 animate-spin" />
@@ -253,6 +252,13 @@ export function TeamBrandingPreferencesForm({ team, settings }: TeamBrandingPref
 
                     <FormDescription>
                       <Trans>Upload your brand logo (max 5MB, JPG, PNG, or WebP)</Trans>
+
+                      {canInherit && (
+                        <span>
+                          {'. '}
+                          <Trans>Leave blank to inherit from the organisation.</Trans>
+                        </span>
+                      )}
                     </FormDescription>
                   </div>
                 </FormItem>
@@ -264,7 +270,9 @@ export function TeamBrandingPreferencesForm({ team, settings }: TeamBrandingPref
               name="brandingUrl"
               render={({ field }) => (
                 <FormItem className="flex-1">
-                  <FormLabel>Brand Website</FormLabel>
+                  <FormLabel>
+                    <Trans>Brand Website</Trans>
+                  </FormLabel>
 
                   <FormControl>
                     <Input
@@ -277,6 +285,13 @@ export function TeamBrandingPreferencesForm({ team, settings }: TeamBrandingPref
 
                   <FormDescription>
                     <Trans>Your brand website URL</Trans>
+
+                    {canInherit && (
+                      <span>
+                        {'. '}
+                        <Trans>Leave blank to inherit from the organisation.</Trans>
+                      </span>
+                    )}
                   </FormDescription>
                 </FormItem>
               )}
@@ -287,11 +302,13 @@ export function TeamBrandingPreferencesForm({ team, settings }: TeamBrandingPref
               name="brandingCompanyDetails"
               render={({ field }) => (
                 <FormItem className="flex-1">
-                  <FormLabel>Brand Details</FormLabel>
+                  <FormLabel>
+                    <Trans>Brand Details</Trans>
+                  </FormLabel>
 
                   <FormControl>
                     <Textarea
-                      placeholder={_(msg`Enter your brand details`)}
+                      placeholder={t`Enter your brand details`}
                       className="min-h-[100px] resize-y"
                       disabled={!isBrandingEnabled}
                       {...field}
@@ -300,6 +317,13 @@ export function TeamBrandingPreferencesForm({ team, settings }: TeamBrandingPref
 
                   <FormDescription>
                     <Trans>Additional brand information to display at the bottom of emails</Trans>
+
+                    {canInherit && (
+                      <span>
+                        {'. '}
+                        <Trans>Leave blank to inherit from the organisation.</Trans>
+                      </span>
+                    )}
                   </FormDescription>
                 </FormItem>
               )}
diff --git a/apps/remix/app/components/forms/document-preferences-form.tsx b/apps/remix/app/components/forms/document-preferences-form.tsx
new file mode 100644
index 000000000..ac91ee13e
--- /dev/null
+++ b/apps/remix/app/components/forms/document-preferences-form.tsx
@@ -0,0 +1,370 @@
+import { zodResolver } from '@hookform/resolvers/zod';
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
+import type { TeamGlobalSettings } from '@prisma/client';
+import { DocumentVisibility } from '@prisma/client';
+import { useForm } from 'react-hook-form';
+import { z } from 'zod';
+
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { DOCUMENT_SIGNATURE_TYPES, DocumentSignatureType } from '@documenso/lib/constants/document';
+import {
+  SUPPORTED_LANGUAGES,
+  SUPPORTED_LANGUAGE_CODES,
+  isValidLanguageCode,
+} from '@documenso/lib/constants/i18n';
+import { isPersonalLayout } from '@documenso/lib/utils/organisations';
+import { extractTeamSignatureSettings } from '@documenso/lib/utils/teams';
+import { DocumentSignatureSettingsTooltip } from '@documenso/ui/components/document/document-signature-settings-tooltip';
+import { Alert } from '@documenso/ui/primitives/alert';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { MultiSelectCombobox } from '@documenso/ui/primitives/multi-select-combobox';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@documenso/ui/primitives/select';
+
+/**
+ * Can't infer this from the schema since we need to keep the schema inside the component to allow
+ * it to be dynamic.
+ */
+export type TDocumentPreferencesFormSchema = {
+  documentVisibility: DocumentVisibility | null;
+  documentLanguage: (typeof SUPPORTED_LANGUAGE_CODES)[number] | null;
+  includeSenderDetails: boolean | null;
+  includeSigningCertificate: boolean | null;
+  signatureTypes: DocumentSignatureType[];
+};
+
+type SettingsSubset = Pick<
+  TeamGlobalSettings,
+  | 'documentVisibility'
+  | 'documentLanguage'
+  | 'includeSenderDetails'
+  | 'includeSigningCertificate'
+  | 'typedSignatureEnabled'
+  | 'uploadSignatureEnabled'
+  | 'drawSignatureEnabled'
+>;
+
+export type DocumentPreferencesFormProps = {
+  settings: SettingsSubset;
+  canInherit: boolean;
+  onFormSubmit: (data: TDocumentPreferencesFormSchema) => Promise<void>;
+};
+
+export const DocumentPreferencesForm = ({
+  settings,
+  onFormSubmit,
+  canInherit,
+}: DocumentPreferencesFormProps) => {
+  const { t } = useLingui();
+  const { user, organisations } = useSession();
+
+  const isPersonalLayoutMode = isPersonalLayout(organisations);
+
+  const placeholderEmail = user.email ?? 'user@example.com';
+
+  const ZDocumentPreferencesFormSchema = z.object({
+    documentVisibility: z.nativeEnum(DocumentVisibility).nullable(),
+    documentLanguage: z.enum(SUPPORTED_LANGUAGE_CODES).nullable(),
+    includeSenderDetails: z.boolean().nullable(),
+    includeSigningCertificate: z.boolean().nullable(),
+    signatureTypes: z.array(z.nativeEnum(DocumentSignatureType)).min(canInherit ? 0 : 1, {
+      message: msg`At least one signature type must be enabled`.id,
+    }),
+  });
+
+  const form = useForm<TDocumentPreferencesFormSchema>({
+    defaultValues: {
+      documentVisibility: settings.documentVisibility,
+      documentLanguage: isValidLanguageCode(settings.documentLanguage)
+        ? settings.documentLanguage
+        : null,
+      includeSenderDetails: settings.includeSenderDetails,
+      includeSigningCertificate: settings.includeSigningCertificate,
+      signatureTypes: extractTeamSignatureSettings({ ...settings }),
+    },
+    resolver: zodResolver(ZDocumentPreferencesFormSchema),
+  });
+
+  return (
+    <Form {...form}>
+      <form onSubmit={form.handleSubmit(onFormSubmit)}>
+        <fieldset
+          className="flex h-full max-w-2xl flex-col gap-y-6"
+          disabled={form.formState.isSubmitting}
+        >
+          {!isPersonalLayoutMode && (
+            <FormField
+              control={form.control}
+              name="documentVisibility"
+              render={({ field }) => (
+                <FormItem className="flex-1">
+                  <FormLabel>
+                    <Trans>Default Document Visibility</Trans>
+                  </FormLabel>
+
+                  <FormControl>
+                    <Select
+                      {...field}
+                      value={field.value === null ? '-1' : field.value}
+                      onValueChange={(value) => field.onChange(value === '-1' ? null : value)}
+                    >
+                      <SelectTrigger className="bg-background text-muted-foreground">
+                        <SelectValue />
+                      </SelectTrigger>
+
+                      <SelectContent>
+                        <SelectItem value={DocumentVisibility.EVERYONE}>
+                          <Trans>Everyone can access and view the document</Trans>
+                        </SelectItem>
+                        <SelectItem value={DocumentVisibility.MANAGER_AND_ABOVE}>
+                          <Trans>Only managers and above can access and view the document</Trans>
+                        </SelectItem>
+                        <SelectItem value={DocumentVisibility.ADMIN}>
+                          <Trans>Only admins can access and view the document</Trans>
+                        </SelectItem>
+
+                        {canInherit && (
+                          <SelectItem value={'-1'}>
+                            <Trans>Inherit from organisation</Trans>
+                          </SelectItem>
+                        )}
+                      </SelectContent>
+                    </Select>
+                  </FormControl>
+
+                  <FormDescription>
+                    <Trans>Controls the default visibility of an uploaded document.</Trans>
+                  </FormDescription>
+                </FormItem>
+              )}
+            />
+          )}
+
+          <FormField
+            control={form.control}
+            name="documentLanguage"
+            render={({ field }) => (
+              <FormItem className="flex-1">
+                <FormLabel>
+                  <Trans>Default Document Language</Trans>
+                </FormLabel>
+
+                <FormControl>
+                  <Select
+                    {...field}
+                    value={field.value === null ? '-1' : field.value}
+                    onValueChange={(value) => field.onChange(value === '-1' ? null : value)}
+                  >
+                    <SelectTrigger className="bg-background text-muted-foreground">
+                      <SelectValue />
+                    </SelectTrigger>
+
+                    <SelectContent>
+                      {Object.entries(SUPPORTED_LANGUAGES).map(([code, language]) => (
+                        <SelectItem key={code} value={code}>
+                          {language.full}
+                        </SelectItem>
+                      ))}
+
+                      <SelectItem value={'-1'}>
+                        <Trans>Inherit from organisation</Trans>
+                      </SelectItem>
+                    </SelectContent>
+                  </Select>
+                </FormControl>
+
+                <FormDescription>
+                  <Trans>
+                    Controls the default language of an uploaded document. This will be used as the
+                    language in email communications with the recipients.
+                  </Trans>
+                </FormDescription>
+              </FormItem>
+            )}
+          />
+
+          <FormField
+            control={form.control}
+            name="signatureTypes"
+            render={({ field }) => (
+              <FormItem className="flex-1">
+                <FormLabel className="flex flex-row items-center">
+                  <Trans>Default Signature Settings</Trans>
+                  <DocumentSignatureSettingsTooltip />
+                </FormLabel>
+
+                <FormControl>
+                  <MultiSelectCombobox
+                    options={Object.values(DOCUMENT_SIGNATURE_TYPES).map((option) => ({
+                      label: t(option.label),
+                      value: option.value,
+                    }))}
+                    selectedValues={field.value}
+                    onChange={field.onChange}
+                    className="bg-background w-full"
+                    enableSearch={false}
+                    emptySelectionPlaceholder={
+                      canInherit ? t`Inherit from organisation` : t`Select signature types`
+                    }
+                    testId="signature-types-combobox"
+                  />
+                </FormControl>
+
+                {form.formState.errors.signatureTypes ? (
+                  <FormMessage />
+                ) : (
+                  <FormDescription>
+                    <Trans>
+                      Controls which signatures are allowed to be used when signing a document.
+                    </Trans>
+                  </FormDescription>
+                )}
+              </FormItem>
+            )}
+          />
+
+          {!isPersonalLayoutMode && (
+            <FormField
+              control={form.control}
+              name="includeSenderDetails"
+              render={({ field }) => (
+                <FormItem className="flex-1">
+                  <FormLabel>
+                    <Trans>Send on Behalf of Team</Trans>
+                  </FormLabel>
+
+                  <FormControl>
+                    <Select
+                      {...field}
+                      value={field.value === null ? '-1' : field.value.toString()}
+                      onValueChange={(value) =>
+                        field.onChange(value === 'true' ? true : value === 'false' ? false : null)
+                      }
+                    >
+                      <SelectTrigger className="bg-background text-muted-foreground">
+                        <SelectValue />
+                      </SelectTrigger>
+
+                      <SelectContent>
+                        <SelectItem value="true">
+                          <Trans>Yes</Trans>
+                        </SelectItem>
+
+                        <SelectItem value="false">
+                          <Trans>No</Trans>
+                        </SelectItem>
+
+                        {canInherit && (
+                          <SelectItem value={'-1'}>
+                            <Trans>Inherit from organisation</Trans>
+                          </SelectItem>
+                        )}
+                      </SelectContent>
+                    </Select>
+                  </FormControl>
+
+                  <div className="pt-2">
+                    <div className="text-muted-foreground text-xs font-medium">
+                      <Trans>Preview</Trans>
+                    </div>
+
+                    <Alert variant="neutral" className="mt-1 px-2.5 py-1.5 text-sm">
+                      {field.value ? (
+                        <Trans>
+                          "{placeholderEmail}" on behalf of "Team Name" has invited you to sign
+                          "example document".
+                        </Trans>
+                      ) : (
+                        <Trans>"Team Name" has invited you to sign "example document".</Trans>
+                      )}
+                    </Alert>
+                  </div>
+
+                  <FormDescription>
+                    <Trans>
+                      Controls the formatting of the message that will be sent when inviting a
+                      recipient to sign a document. If a custom message has been provided while
+                      configuring the document, it will be used instead.
+                    </Trans>
+                  </FormDescription>
+                </FormItem>
+              )}
+            />
+          )}
+
+          <FormField
+            control={form.control}
+            name="includeSigningCertificate"
+            render={({ field }) => (
+              <FormItem className="flex-1">
+                <FormLabel>
+                  <Trans>Include the Signing Certificate in the Document</Trans>
+                </FormLabel>
+
+                <FormControl>
+                  <Select
+                    {...field}
+                    value={field.value === null ? '-1' : field.value.toString()}
+                    onValueChange={(value) =>
+                      field.onChange(value === 'true' ? true : value === 'false' ? false : null)
+                    }
+                  >
+                    <SelectTrigger className="bg-background text-muted-foreground">
+                      <SelectValue />
+                    </SelectTrigger>
+
+                    <SelectContent>
+                      <SelectItem value="true">
+                        <Trans>Yes</Trans>
+                      </SelectItem>
+
+                      <SelectItem value="false">
+                        <Trans>No</Trans>
+                      </SelectItem>
+
+                      {canInherit && (
+                        <SelectItem value={'-1'}>
+                          <Trans>Inherit from organisation</Trans>
+                        </SelectItem>
+                      )}
+                    </SelectContent>
+                  </Select>
+                </FormControl>
+
+                <FormDescription>
+                  <Trans>
+                    Controls whether the signing certificate will be included in the document when
+                    it is downloaded. The signing certificate can still be downloaded from the logs
+                    page separately.
+                  </Trans>
+                </FormDescription>
+              </FormItem>
+            )}
+          />
+
+          <div className="flex flex-row justify-end space-x-4">
+            <Button type="submit" loading={form.formState.isSubmitting}>
+              <Trans>Update</Trans>
+            </Button>
+          </div>
+        </fieldset>
+      </form>
+    </Form>
+  );
+};
diff --git a/apps/remix/app/components/forms/organisation-update-form.tsx b/apps/remix/app/components/forms/organisation-update-form.tsx
new file mode 100644
index 000000000..8c3dbb513
--- /dev/null
+++ b/apps/remix/app/components/forms/organisation-update-form.tsx
@@ -0,0 +1,182 @@
+import { zodResolver } from '@hookform/resolvers/zod';
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { AnimatePresence, motion } from 'framer-motion';
+import { useForm } from 'react-hook-form';
+import { useNavigate } from 'react-router';
+import type { z } from 'zod';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { trpc } from '@documenso/trpc/react';
+import { ZUpdateOrganisationRequestSchema } from '@documenso/trpc/server/organisation-router/update-organisation.types';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+const ZOrganisationUpdateFormSchema = ZUpdateOrganisationRequestSchema.shape.data.pick({
+  name: true,
+  url: true,
+});
+
+type TOrganisationUpdateFormSchema = z.infer<typeof ZOrganisationUpdateFormSchema>;
+
+export const OrganisationUpdateForm = () => {
+  const navigate = useNavigate();
+  const organisation = useCurrentOrganisation();
+
+  const { refreshSession } = useSession();
+
+  const { _ } = useLingui();
+  const { toast } = useToast();
+
+  const form = useForm({
+    resolver: zodResolver(ZOrganisationUpdateFormSchema),
+    defaultValues: {
+      name: organisation.name,
+      url: organisation.url,
+    },
+  });
+
+  const { mutateAsync: updateOrganisation } = trpc.organisation.update.useMutation();
+
+  const onFormSubmit = async ({ name, url }: TOrganisationUpdateFormSchema) => {
+    try {
+      await updateOrganisation({
+        data: {
+          name,
+          url,
+        },
+        organisationId: organisation.id,
+      });
+
+      await refreshSession();
+
+      if (url !== organisation.url) {
+        await navigate(`/o/${url}/settings`);
+      }
+
+      toast({
+        title: _(msg`Success`),
+        description: _(msg`Your organisation has been successfully updated.`),
+        duration: 5000,
+      });
+
+      form.reset({
+        name,
+        url,
+      });
+    } catch (err) {
+      const error = AppError.parseError(err);
+
+      if (error.code === AppErrorCode.ALREADY_EXISTS) {
+        form.setError('url', {
+          type: 'manual',
+          message: _(msg`This URL is already in use.`),
+        });
+
+        return;
+      }
+
+      toast({
+        title: _(msg`An unknown error occurred`),
+        description: _(
+          msg`We encountered an unknown error while attempting to update your organisation. Please try again later.`,
+        ),
+        variant: 'destructive',
+      });
+    }
+  };
+
+  return (
+    <Form {...form}>
+      <form onSubmit={form.handleSubmit(onFormSubmit)}>
+        <fieldset className="flex h-full flex-col" disabled={form.formState.isSubmitting}>
+          <FormField
+            control={form.control}
+            name="name"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel required>
+                  <Trans>Organisation Name</Trans>
+                </FormLabel>
+                <FormControl>
+                  <Input className="bg-background" {...field} />
+                </FormControl>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+
+          <FormField
+            control={form.control}
+            name="url"
+            render={({ field }) => (
+              <FormItem className="mt-4">
+                <FormLabel required>
+                  <Trans>Organisation URL</Trans>
+                </FormLabel>
+                <FormControl>
+                  <Input className="bg-background" {...field} />
+                </FormControl>
+                {!form.formState.errors.url && (
+                  <span className="text-foreground/50 text-xs font-normal">
+                    {field.value ? (
+                      `${NEXT_PUBLIC_WEBAPP_URL()}/o/${field.value}`
+                    ) : (
+                      <Trans>A unique URL to identify your organisation</Trans>
+                    )}
+                  </span>
+                )}
+
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+
+          <div className="flex flex-row justify-end space-x-4">
+            <AnimatePresence>
+              {form.formState.isDirty && (
+                <motion.div
+                  initial={{
+                    opacity: 0,
+                  }}
+                  animate={{
+                    opacity: 1,
+                  }}
+                  exit={{
+                    opacity: 0,
+                  }}
+                >
+                  <Button type="button" variant="secondary" onClick={() => form.reset()}>
+                    <Trans>Reset</Trans>
+                  </Button>
+                </motion.div>
+              )}
+            </AnimatePresence>
+
+            <Button
+              type="submit"
+              className="transition-opacity"
+              disabled={!form.formState.isDirty}
+              loading={form.formState.isSubmitting}
+            >
+              <Trans>Update organisation</Trans>
+            </Button>
+          </div>
+        </fieldset>
+      </form>
+    </Form>
+  );
+};
diff --git a/apps/remix/app/components/forms/public-profile-form.tsx b/apps/remix/app/components/forms/public-profile-form.tsx
index 6903fc1f9..0366b3f3b 100644
--- a/apps/remix/app/components/forms/public-profile-form.tsx
+++ b/apps/remix/app/components/forms/public-profile-form.tsx
@@ -4,7 +4,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Plural, Trans } from '@lingui/react/macro';
-import type { TeamProfile, UserProfile } from '@prisma/client';
+import type { TeamProfile } from '@prisma/client';
 import { motion } from 'framer-motion';
 import { AnimatePresence } from 'framer-motion';
 import { CheckSquareIcon, CopyIcon } from 'lucide-react';
@@ -12,12 +12,14 @@ import { useForm } from 'react-hook-form';
 import type { z } from 'zod';
 
 import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
-import { AppError } from '@documenso/lib/errors/app-error';
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { isPersonalLayout } from '@documenso/lib/utils/organisations';
 import { formatUserProfilePath } from '@documenso/lib/utils/public-profiles';
 import {
   MAX_PROFILE_BIO_LENGTH,
-  ZUpdatePublicProfileMutationSchema,
-} from '@documenso/trpc/server/profile-router/schema';
+  ZUpdateTeamRequestSchema,
+} from '@documenso/trpc/server/team-router/update-team.types';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 import {
@@ -32,9 +34,10 @@ import { Input } from '@documenso/ui/primitives/input';
 import { Textarea } from '@documenso/ui/primitives/textarea';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-export const ZPublicProfileFormSchema = ZUpdatePublicProfileMutationSchema.pick({
-  bio: true,
-  enabled: true,
+import { useCurrentTeam } from '~/providers/team';
+
+export const ZPublicProfileFormSchema = ZUpdateTeamRequestSchema.shape.data.pick({
+  profileBio: true,
   url: true,
 });
 
@@ -42,16 +45,12 @@ export type TPublicProfileFormSchema = z.infer<typeof ZPublicProfileFormSchema>;
 
 export type PublicProfileFormProps = {
   className?: string;
-  profileUrl?: string | null;
-  teamUrl?: string;
   onProfileUpdate: (data: TPublicProfileFormSchema) => Promise<unknown>;
-  profile: UserProfile | TeamProfile;
+  profile: TeamProfile;
 };
 export const PublicProfileForm = ({
   className,
-  profileUrl,
   profile,
-  teamUrl,
   onProfileUpdate,
 }: PublicProfileFormProps) => {
   const { _ } = useLingui();
@@ -61,10 +60,16 @@ export const PublicProfileForm = ({
 
   const [copiedTimeout, setCopiedTimeout] = useState<NodeJS.Timeout | null>(null);
 
+  const { organisations } = useSession();
+
+  const isPersonalLayoutMode = isPersonalLayout(organisations);
+
+  const team = useCurrentTeam();
+
   const form = useForm<TPublicProfileFormSchema>({
     values: {
-      url: profileUrl ?? '',
-      bio: profile?.bio ?? '',
+      url: team.url,
+      profileBio: profile?.bio ?? '',
     },
     resolver: zodResolver(ZPublicProfileFormSchema),
   });
@@ -83,12 +88,13 @@ export const PublicProfileForm = ({
 
       form.reset({
         url: data.url,
-        bio: data.bio,
+        profileBio: data.profileBio,
       });
     } catch (err) {
       const error = AppError.parseError(err);
 
       switch (error.code) {
+        case AppErrorCode.ALREADY_EXISTS:
         case 'PREMIUM_PROFILE_URL':
         case 'PROFILE_URL_TAKEN':
           form.setError('url', {
@@ -145,10 +151,10 @@ export const PublicProfileForm = ({
                   <Trans>Public profile URL</Trans>
                 </FormLabel>
                 <FormControl>
-                  <Input {...field} disabled={field.disabled || teamUrl !== undefined} />
+                  <Input {...field} disabled={field.disabled || !isPersonalLayoutMode} />
                 </FormControl>
 
-                {teamUrl && (
+                {!isPersonalLayoutMode && (
                   <p className="text-muted-foreground text-xs">
                     <Trans>
                       You can update the profile URL by updating the team URL in the general
@@ -208,7 +214,7 @@ export const PublicProfileForm = ({
 
           <FormField
             control={form.control}
-            name="bio"
+            name="profileBio"
             render={({ field }) => {
               const remaningLength = MAX_PROFILE_BIO_LENGTH - (field.value || '').length;
 
@@ -218,13 +224,11 @@ export const PublicProfileForm = ({
                   <FormControl>
                     <Textarea
                       {...field}
-                      placeholder={
-                        teamUrl ? _(msg`Write about the team`) : _(msg`Write about yourself`)
-                      }
+                      placeholder={_(msg`Write a description to display on your public profile`)}
                     />
                   </FormControl>
 
-                  {!form.formState.errors.bio && (
+                  {!form.formState.errors.profileBio && (
                     <p className="text-muted-foreground text-sm">
                       {remaningLength >= 0 ? (
                         <Plural
diff --git a/apps/remix/app/components/forms/signin.tsx b/apps/remix/app/components/forms/signin.tsx
index 79edbf849..2d7f9dffe 100644
--- a/apps/remix/app/components/forms/signin.tsx
+++ b/apps/remix/app/components/forms/signin.tsx
@@ -55,7 +55,7 @@ const handleFallbackErrorMessages = (code: string) => {
   return message;
 };
 
-const LOGIN_REDIRECT_PATH = '/documents';
+const LOGIN_REDIRECT_PATH = '/';
 
 export const ZSignInFormSchema = z.object({
   email: z.string().email().min(1),
diff --git a/apps/remix/app/components/forms/signup.tsx b/apps/remix/app/components/forms/signup.tsx
index b26f56742..9502e44ce 100644
--- a/apps/remix/app/components/forms/signup.tsx
+++ b/apps/remix/app/components/forms/signup.tsx
@@ -1,11 +1,10 @@
-import { useEffect, useState } from 'react';
+import { useEffect } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import type { MessageDescriptor } from '@lingui/core';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import { AnimatePresence, motion } from 'framer-motion';
 import { useForm } from 'react-hook-form';
 import { FaIdCardClip } from 'react-icons/fa6';
 import { FcGoogle } from 'react-icons/fc';
@@ -15,7 +14,6 @@ import { z } from 'zod';
 import communityCardsImage from '@documenso/assets/images/community-cards.png';
 import { authClient } from '@documenso/auth/client';
 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { ZPasswordSchema } from '@documenso/trpc/server/auth-router/schema';
 import { cn } from '@documenso/ui/lib/utils';
@@ -33,11 +31,8 @@ import { PasswordInput } from '@documenso/ui/primitives/password-input';
 import { SignaturePadDialog } from '@documenso/ui/primitives/signature-pad/signature-pad-dialog';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { UserProfileSkeleton } from '~/components/general/user-profile-skeleton';
 import { UserProfileTimur } from '~/components/general/user-profile-timur';
 
-type SignUpStep = 'BASIC_DETAILS' | 'CLAIM_USERNAME';
-
 export const ZSignUpFormSchema = z
   .object({
     name: z
@@ -47,14 +42,6 @@ export const ZSignUpFormSchema = z
     email: z.string().email().min(1),
     password: ZPasswordSchema,
     signature: z.string().min(1, { message: msg`We need your signature to sign documents`.id }),
-    url: z
-      .string()
-      .trim()
-      .toLowerCase()
-      .min(1, { message: msg`We need a username to create your profile`.id })
-      .regex(/^[a-z0-9-]+$/, {
-        message: msg`Username can only container alphanumeric characters and dashes.`.id,
-      }),
   })
   .refine(
     (data) => {
@@ -71,8 +58,6 @@ export const signupErrorMessages: Record<string, MessageDescriptor> = {
   SIGNUP_DISABLED: msg`Signups are disabled.`,
   [AppErrorCode.ALREADY_EXISTS]: msg`User with this email already exists. Please use a different email address.`,
   [AppErrorCode.INVALID_REQUEST]: msg`We were unable to create your account. Please review the information you provided and try again.`,
-  PROFILE_URL_TAKEN: msg`This username has already been taken`,
-  PREMIUM_PROFILE_URL: msg`Only subscribers can have a username shorter than 6 characters`,
 };
 
 export type TSignUpFormSchema = z.infer<typeof ZSignUpFormSchema>;
@@ -97,19 +82,14 @@ export const SignUpForm = ({
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
 
-  const [step, setStep] = useState<SignUpStep>('BASIC_DETAILS');
-
   const utmSrc = searchParams.get('utm_source') ?? null;
 
-  const baseUrl = new URL(NEXT_PUBLIC_WEBAPP_URL() ?? 'http://localhost:3000');
-
   const form = useForm<TSignUpFormSchema>({
     values: {
       name: '',
       email: initialEmail ?? '',
       password: '',
       signature: '',
-      url: '',
     },
     mode: 'onBlur',
     resolver: zodResolver(ZSignUpFormSchema),
@@ -117,17 +97,13 @@ export const SignUpForm = ({
 
   const isSubmitting = form.formState.isSubmitting;
 
-  const name = form.watch('name');
-  const url = form.watch('url');
-
-  const onFormSubmit = async ({ name, email, password, signature, url }: TSignUpFormSchema) => {
+  const onFormSubmit = async ({ name, email, password, signature }: TSignUpFormSchema) => {
     try {
       await authClient.emailPassword.signUp({
         name,
         email,
         password,
         signature,
-        url,
       });
 
       await navigate(`/unverified-account`);
@@ -150,26 +126,11 @@ export const SignUpForm = ({
 
       const errorMessage = signupErrorMessages[error.code] ?? signupErrorMessages.INVALID_REQUEST;
 
-      if (error.code === 'PROFILE_URL_TAKEN' || error.code === 'PREMIUM_PROFILE_URL') {
-        form.setError('url', {
-          type: 'manual',
-          message: _(errorMessage),
-        });
-      } else {
-        toast({
-          title: _(msg`An error occurred`),
-          description: _(errorMessage),
-          variant: 'destructive',
-        });
-      }
-    }
-  };
-
-  const onNextClick = async () => {
-    const valid = await form.trigger(['name', 'email', 'password', 'signature']);
-
-    if (valid) {
-      setStep('CLAIM_USERNAME');
+      toast({
+        title: _(msg`An error occurred`),
+        description: _(errorMessage),
+        variant: 'destructive',
+      });
     }
   };
 
@@ -231,59 +192,30 @@ export const SignUpForm = ({
             <Trans>User profiles are here!</Trans>
           </div>
 
-          <AnimatePresence>
-            {step === 'BASIC_DETAILS' ? (
-              <motion.div className="w-full max-w-md" layoutId="user-profile">
-                <UserProfileTimur
-                  rows={2}
-                  className="bg-background border-border rounded-2xl border shadow-md"
-                />
-              </motion.div>
-            ) : (
-              <motion.div className="w-full max-w-md" layoutId="user-profile">
-                <UserProfileSkeleton
-                  user={{ name, url }}
-                  rows={2}
-                  className="bg-background border-border rounded-2xl border shadow-md"
-                />
-              </motion.div>
-            )}
-          </AnimatePresence>
+          <div className="w-full max-w-md">
+            <UserProfileTimur
+              rows={2}
+              className="bg-background border-border rounded-2xl border shadow-md"
+            />
+          </div>
 
           <div />
         </div>
       </div>
 
       <div className="border-border dark:bg-background relative z-10 flex min-h-[min(850px,80vh)] w-full max-w-lg flex-col rounded-xl border bg-neutral-100 p-6">
-        {step === 'BASIC_DETAILS' && (
-          <div className="h-20">
-            <h1 className="text-xl font-semibold md:text-2xl">
-              <Trans>Create a new account</Trans>
-            </h1>
+        <div className="h-20">
+          <h1 className="text-xl font-semibold md:text-2xl">
+            <Trans>Create a new account</Trans>
+          </h1>
 
-            <p className="text-muted-foreground mt-2 text-xs md:text-sm">
-              <Trans>
-                Create your account and start using state-of-the-art document signing. Open and
-                beautiful signing is within your grasp.
-              </Trans>
-            </p>
-          </div>
-        )}
-
-        {step === 'CLAIM_USERNAME' && (
-          <div className="h-20">
-            <h1 className="text-xl font-semibold md:text-2xl">
-              <Trans>Claim your username now</Trans>
-            </h1>
-
-            <p className="text-muted-foreground mt-2 text-xs md:text-sm">
-              <Trans>
-                You will get notified & be able to set up your documenso public profile when we
-                launch the feature.
-              </Trans>
-            </p>
-          </div>
-        )}
+          <p className="text-muted-foreground mt-2 text-xs md:text-sm">
+            <Trans>
+              Create your account and start using state-of-the-art document signing. Open and
+              beautiful signing is within your grasp.
+            </Trans>
+          </p>
+        </div>
 
         <hr className="-mx-6 my-4" />
 
@@ -292,242 +224,146 @@ export const SignUpForm = ({
             className="flex w-full flex-1 flex-col gap-y-4"
             onSubmit={form.handleSubmit(onFormSubmit)}
           >
-            {step === 'BASIC_DETAILS' && (
-              <fieldset
-                className={cn(
-                  'flex h-[550px] w-full flex-col gap-y-4',
-                  (isGoogleSSOEnabled || isOIDCSSOEnabled) && 'h-[650px]',
+            <fieldset
+              className={cn(
+                'flex h-[550px] w-full flex-col gap-y-4',
+                (isGoogleSSOEnabled || isOIDCSSOEnabled) && 'h-[650px]',
+              )}
+              disabled={isSubmitting}
+            >
+              <FormField
+                control={form.control}
+                name="name"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <Trans>Full Name</Trans>
+                    </FormLabel>
+                    <FormControl>
+                      <Input type="text" {...field} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
                 )}
-                disabled={isSubmitting}
-              >
-                <FormField
-                  control={form.control}
-                  name="name"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>
-                        <Trans>Full Name</Trans>
-                      </FormLabel>
-                      <FormControl>
-                        <Input type="text" {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
+              />
 
-                <FormField
-                  control={form.control}
-                  name="email"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>
-                        <Trans>Email Address</Trans>
-                      </FormLabel>
-                      <FormControl>
-                        <Input type="email" {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={form.control}
-                  name="password"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>
-                        <Trans>Password</Trans>
-                      </FormLabel>
-
-                      <FormControl>
-                        <PasswordInput {...field} />
-                      </FormControl>
-
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={form.control}
-                  name="signature"
-                  render={({ field: { onChange, value } }) => (
-                    <FormItem>
-                      <FormLabel>
-                        <Trans>Sign Here</Trans>
-                      </FormLabel>
-                      <FormControl>
-                        <SignaturePadDialog
-                          disabled={isSubmitting}
-                          value={value}
-                          onChange={(v) => onChange(v ?? '')}
-                        />
-                      </FormControl>
-
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                {(isGoogleSSOEnabled || isOIDCSSOEnabled) && (
-                  <>
-                    <div className="relative flex items-center justify-center gap-x-4 py-2 text-xs uppercase">
-                      <div className="bg-border h-px flex-1" />
-                      <span className="text-muted-foreground bg-transparent">
-                        <Trans>Or</Trans>
-                      </span>
-                      <div className="bg-border h-px flex-1" />
-                    </div>
-                  </>
+              <FormField
+                control={form.control}
+                name="email"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <Trans>Email Address</Trans>
+                    </FormLabel>
+                    <FormControl>
+                      <Input type="email" {...field} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
                 )}
+              />
 
-                {isGoogleSSOEnabled && (
-                  <>
-                    <Button
-                      type="button"
-                      size="lg"
-                      variant={'outline'}
-                      className="bg-background text-muted-foreground border"
-                      disabled={isSubmitting}
-                      onClick={onSignUpWithGoogleClick}
-                    >
-                      <FcGoogle className="mr-2 h-5 w-5" />
-                      <Trans>Sign Up with Google</Trans>
-                    </Button>
-                  </>
+              <FormField
+                control={form.control}
+                name="password"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <Trans>Password</Trans>
+                    </FormLabel>
+
+                    <FormControl>
+                      <PasswordInput {...field} />
+                    </FormControl>
+
+                    <FormMessage />
+                  </FormItem>
                 )}
+              />
 
-                {isOIDCSSOEnabled && (
-                  <>
-                    <Button
-                      type="button"
-                      size="lg"
-                      variant={'outline'}
-                      className="bg-background text-muted-foreground border"
-                      disabled={isSubmitting}
-                      onClick={onSignUpWithOIDCClick}
-                    >
-                      <FaIdCardClip className="mr-2 h-5 w-5" />
-                      <Trans>Sign Up with OIDC</Trans>
-                    </Button>
-                  </>
+              <FormField
+                control={form.control}
+                name="signature"
+                render={({ field: { onChange, value } }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <Trans>Sign Here</Trans>
+                    </FormLabel>
+                    <FormControl>
+                      <SignaturePadDialog
+                        disabled={isSubmitting}
+                        value={value}
+                        onChange={(v) => onChange(v ?? '')}
+                      />
+                    </FormControl>
+
+                    <FormMessage />
+                  </FormItem>
                 )}
+              />
 
-                <p className="text-muted-foreground mt-4 text-sm">
-                  <Trans>
-                    Already have an account?{' '}
-                    <Link to="/signin" className="text-documenso-700 duration-200 hover:opacity-70">
-                      Sign in instead
-                    </Link>
-                  </Trans>
-                </p>
-              </fieldset>
-            )}
-
-            {step === 'CLAIM_USERNAME' && (
-              <fieldset
-                className={cn(
-                  'flex h-[550px] w-full flex-col gap-y-4',
-                  isGoogleSSOEnabled && 'h-[650px]',
-                )}
-                disabled={isSubmitting}
-              >
-                <FormField
-                  control={form.control}
-                  name="url"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>
-                        <Trans>Public profile username</Trans>
-                      </FormLabel>
-
-                      <FormControl>
-                        <Input type="text" className="mb-2 mt-2 lowercase" {...field} />
-                      </FormControl>
-
-                      <FormMessage />
-
-                      <div className="bg-muted/50 border-border text-muted-foreground mt-2 inline-block max-w-[16rem] truncate rounded-md border px-2 py-1 text-sm lowercase">
-                        {baseUrl.host}/u/{field.value || '<username>'}
-                      </div>
-                    </FormItem>
-                  )}
-                />
-              </fieldset>
-            )}
-
-            <div className="mt-6">
-              {step === 'BASIC_DETAILS' && (
-                <p className="text-muted-foreground text-sm">
-                  <span className="font-medium">
-                    <Trans>Basic details</Trans>
-                  </span>{' '}
-                  1/2
-                </p>
+              {(isGoogleSSOEnabled || isOIDCSSOEnabled) && (
+                <>
+                  <div className="relative flex items-center justify-center gap-x-4 py-2 text-xs uppercase">
+                    <div className="bg-border h-px flex-1" />
+                    <span className="text-muted-foreground bg-transparent">
+                      <Trans>Or</Trans>
+                    </span>
+                    <div className="bg-border h-px flex-1" />
+                  </div>
+                </>
               )}
 
-              {step === 'CLAIM_USERNAME' && (
-                <p className="text-muted-foreground text-sm">
-                  <span className="font-medium">
-                    <Trans>Claim username</Trans>
-                  </span>{' '}
-                  2/2
-                </p>
+              {isGoogleSSOEnabled && (
+                <>
+                  <Button
+                    type="button"
+                    size="lg"
+                    variant={'outline'}
+                    className="bg-background text-muted-foreground border"
+                    disabled={isSubmitting}
+                    onClick={onSignUpWithGoogleClick}
+                  >
+                    <FcGoogle className="mr-2 h-5 w-5" />
+                    <Trans>Sign Up with Google</Trans>
+                  </Button>
+                </>
               )}
 
-              <div className="bg-foreground/40 relative mt-4 h-1.5 rounded-full">
-                <motion.div
-                  layout="size"
-                  layoutId="document-flow-container-step"
-                  className="bg-documenso absolute inset-y-0 left-0 rounded-full"
-                  style={{
-                    width: step === 'BASIC_DETAILS' ? '50%' : '100%',
-                  }}
-                />
-              </div>
-            </div>
-
-            <div className="flex items-center gap-x-4">
-              {/* Go back button, disabled if step is basic details */}
-              <Button
-                type="button"
-                size="lg"
-                variant="secondary"
-                className="flex-1"
-                disabled={step === 'BASIC_DETAILS' || form.formState.isSubmitting}
-                onClick={() => setStep('BASIC_DETAILS')}
-              >
-                <Trans>Back</Trans>
-              </Button>
-
-              {/* Continue button */}
-              {step === 'BASIC_DETAILS' && (
-                <Button
-                  type="button"
-                  size="lg"
-                  className="flex-1 disabled:cursor-not-allowed"
-                  loading={form.formState.isSubmitting}
-                  onClick={onNextClick}
-                >
-                  <Trans>Next</Trans>
-                </Button>
+              {isOIDCSSOEnabled && (
+                <>
+                  <Button
+                    type="button"
+                    size="lg"
+                    variant={'outline'}
+                    className="bg-background text-muted-foreground border"
+                    disabled={isSubmitting}
+                    onClick={onSignUpWithOIDCClick}
+                  >
+                    <FaIdCardClip className="mr-2 h-5 w-5" />
+                    <Trans>Sign Up with OIDC</Trans>
+                  </Button>
+                </>
               )}
 
-              {/* Sign up button */}
-              {step === 'CLAIM_USERNAME' && (
-                <Button
-                  loading={form.formState.isSubmitting}
-                  disabled={!form.formState.isValid}
-                  type="submit"
-                  size="lg"
-                  className="flex-1"
-                >
-                  <Trans>Complete</Trans>
-                </Button>
-              )}
-            </div>
+              <p className="text-muted-foreground mt-4 text-sm">
+                <Trans>
+                  Already have an account?{' '}
+                  <Link to="/signin" className="text-documenso-700 duration-200 hover:opacity-70">
+                    Sign in instead
+                  </Link>
+                </Trans>
+              </p>
+            </fieldset>
+
+            <Button
+              loading={form.formState.isSubmitting}
+              type="submit"
+              size="lg"
+              className="mt-6 w-full"
+            >
+              <Trans>Complete</Trans>
+            </Button>
           </form>
         </Form>
         <p className="text-muted-foreground mt-6 text-xs">
diff --git a/apps/remix/app/components/forms/subscription-claim-form.tsx b/apps/remix/app/components/forms/subscription-claim-form.tsx
new file mode 100644
index 000000000..0a26b2ab6
--- /dev/null
+++ b/apps/remix/app/components/forms/subscription-claim-form.tsx
@@ -0,0 +1,155 @@
+import { zodResolver } from '@hookform/resolvers/zod';
+import { Trans, useLingui } from '@lingui/react/macro';
+import type { SubscriptionClaim } from '@prisma/client';
+import { useForm } from 'react-hook-form';
+import type { z } from 'zod';
+
+import { SUBSCRIPTION_CLAIM_FEATURE_FLAGS } from '@documenso/lib/types/subscription';
+import { ZCreateSubscriptionClaimRequestSchema } from '@documenso/trpc/server/admin-router/create-subscription-claim.types';
+import { Checkbox } from '@documenso/ui/primitives/checkbox';
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+
+export type SubscriptionClaimFormValues = z.infer<typeof ZCreateSubscriptionClaimRequestSchema>;
+
+type SubscriptionClaimFormProps = {
+  subscriptionClaim: Omit<SubscriptionClaim, 'id' | 'createdAt' | 'updatedAt'>;
+  onFormSubmit: (data: SubscriptionClaimFormValues) => Promise<void>;
+  formSubmitTrigger?: React.ReactNode;
+};
+
+export const SubscriptionClaimForm = ({
+  subscriptionClaim,
+  onFormSubmit,
+  formSubmitTrigger,
+}: SubscriptionClaimFormProps) => {
+  const { t } = useLingui();
+
+  const form = useForm<SubscriptionClaimFormValues>({
+    resolver: zodResolver(ZCreateSubscriptionClaimRequestSchema),
+    defaultValues: {
+      name: subscriptionClaim.name,
+      teamCount: subscriptionClaim.teamCount,
+      memberCount: subscriptionClaim.memberCount,
+      flags: subscriptionClaim.flags,
+    },
+  });
+
+  return (
+    <Form {...form}>
+      <form onSubmit={form.handleSubmit(onFormSubmit)}>
+        <fieldset disabled={form.formState.isSubmitting} className="space-y-4">
+          <FormField
+            control={form.control}
+            name="name"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <Trans>Name</Trans>
+                </FormLabel>
+                <FormControl>
+                  <Input placeholder={t`Enter claim name`} {...field} />
+                </FormControl>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+
+          <FormField
+            control={form.control}
+            name="teamCount"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <Trans>Team Count</Trans>
+                </FormLabel>
+                <FormControl>
+                  <Input
+                    type="number"
+                    min={0}
+                    {...field}
+                    onChange={(e) => field.onChange(parseInt(e.target.value, 10) || 0)}
+                  />
+                </FormControl>
+                <FormDescription>
+                  <Trans>Number of teams allowed. 0 = Unlimited</Trans>
+                </FormDescription>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+
+          <FormField
+            control={form.control}
+            name="memberCount"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <Trans>Member Count</Trans>
+                </FormLabel>
+                <FormControl>
+                  <Input
+                    type="number"
+                    min={0}
+                    {...field}
+                    onChange={(e) => field.onChange(parseInt(e.target.value, 10) || 0)}
+                  />
+                </FormControl>
+                <FormDescription>
+                  <Trans>Number of members allowed. 0 = Unlimited</Trans>
+                </FormDescription>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+
+          <div>
+            <FormLabel>
+              <Trans>Feature Flags</Trans>
+            </FormLabel>
+
+            <div className="mt-2 space-y-2 rounded-md border p-4">
+              {Object.values(SUBSCRIPTION_CLAIM_FEATURE_FLAGS).map(({ key, label }) => (
+                <FormField
+                  key={key}
+                  control={form.control}
+                  name={`flags.${key}`}
+                  render={({ field }) => (
+                    <FormItem className="flex items-center space-x-2">
+                      <FormControl>
+                        <div className="flex items-center">
+                          <Checkbox
+                            id={`flag-${key}`}
+                            checked={field.value}
+                            onCheckedChange={field.onChange}
+                          />
+
+                          <label
+                            className="text-muted-foreground ml-2 flex flex-row items-center text-sm"
+                            htmlFor={`flag-${key}`}
+                          >
+                            {label}
+                          </label>
+                        </div>
+                      </FormControl>
+                    </FormItem>
+                  )}
+                />
+              ))}
+            </div>
+          </div>
+
+          {formSubmitTrigger}
+        </fieldset>
+      </form>
+    </Form>
+  );
+};
diff --git a/apps/remix/app/components/forms/team-document-preferences-form.tsx b/apps/remix/app/components/forms/team-document-preferences-form.tsx
deleted file mode 100644
index 2b4846116..000000000
--- a/apps/remix/app/components/forms/team-document-preferences-form.tsx
+++ /dev/null
@@ -1,328 +0,0 @@
-import { zodResolver } from '@hookform/resolvers/zod';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import type { Team, TeamGlobalSettings } from '@prisma/client';
-import { DocumentVisibility } from '@prisma/client';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-import { useSession } from '@documenso/lib/client-only/providers/session';
-import { DOCUMENT_SIGNATURE_TYPES, DocumentSignatureType } from '@documenso/lib/constants/document';
-import {
-  SUPPORTED_LANGUAGES,
-  SUPPORTED_LANGUAGE_CODES,
-  isValidLanguageCode,
-} from '@documenso/lib/constants/i18n';
-import { extractTeamSignatureSettings } from '@documenso/lib/utils/teams';
-import { trpc } from '@documenso/trpc/react';
-import { DocumentSignatureSettingsTooltip } from '@documenso/ui/components/document/document-signature-settings-tooltip';
-import { Alert } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Form,
-  FormControl,
-  FormDescription,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { MultiSelectCombobox } from '@documenso/ui/primitives/multi-select-combobox';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@documenso/ui/primitives/select';
-import { Switch } from '@documenso/ui/primitives/switch';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-const ZTeamDocumentPreferencesFormSchema = z.object({
-  documentVisibility: z.nativeEnum(DocumentVisibility),
-  documentLanguage: z.enum(SUPPORTED_LANGUAGE_CODES),
-  includeSenderDetails: z.boolean(),
-  includeSigningCertificate: z.boolean(),
-  signatureTypes: z.array(z.nativeEnum(DocumentSignatureType)).min(1, {
-    message: msg`At least one signature type must be enabled`.id,
-  }),
-});
-
-type TTeamDocumentPreferencesFormSchema = z.infer<typeof ZTeamDocumentPreferencesFormSchema>;
-
-export type TeamDocumentPreferencesFormProps = {
-  team: Team;
-  settings?: TeamGlobalSettings | null;
-};
-
-export const TeamDocumentPreferencesForm = ({
-  team,
-  settings,
-}: TeamDocumentPreferencesFormProps) => {
-  const { _ } = useLingui();
-  const { toast } = useToast();
-  const { user } = useSession();
-
-  const placeholderEmail = user.email ?? 'user@example.com';
-
-  const { mutateAsync: updateTeamDocumentPreferences } =
-    trpc.team.updateTeamDocumentSettings.useMutation();
-
-  const form = useForm<TTeamDocumentPreferencesFormSchema>({
-    defaultValues: {
-      documentVisibility: settings?.documentVisibility ?? 'EVERYONE',
-      documentLanguage: isValidLanguageCode(settings?.documentLanguage)
-        ? settings?.documentLanguage
-        : 'en',
-      includeSenderDetails: settings?.includeSenderDetails ?? false,
-      includeSigningCertificate: settings?.includeSigningCertificate ?? true,
-      signatureTypes: extractTeamSignatureSettings(settings),
-    },
-    resolver: zodResolver(ZTeamDocumentPreferencesFormSchema),
-  });
-
-  const includeSenderDetails = form.watch('includeSenderDetails');
-
-  const onSubmit = async (data: TTeamDocumentPreferencesFormSchema) => {
-    try {
-      const {
-        documentVisibility,
-        documentLanguage,
-        includeSenderDetails,
-        includeSigningCertificate,
-        signatureTypes,
-      } = data;
-
-      await updateTeamDocumentPreferences({
-        teamId: team.id,
-        settings: {
-          documentVisibility,
-          documentLanguage,
-          includeSenderDetails,
-          includeSigningCertificate,
-          typedSignatureEnabled: signatureTypes.includes(DocumentSignatureType.TYPE),
-          uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
-          drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
-        },
-      });
-
-      toast({
-        title: _(msg`Document preferences updated`),
-        description: _(msg`Your document preferences have been updated`),
-      });
-    } catch (err) {
-      toast({
-        title: _(msg`Something went wrong!`),
-        description: _(
-          msg`We were unable to update your document preferences at this time, please try again later`,
-        ),
-      });
-    }
-  };
-
-  return (
-    <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)}>
-        <fieldset
-          className="flex h-full max-w-xl flex-col gap-y-6"
-          disabled={form.formState.isSubmitting}
-        >
-          <FormField
-            control={form.control}
-            name="documentVisibility"
-            render={({ field }) => (
-              <FormItem className="flex-1">
-                <FormLabel>
-                  <Trans>Default Document Visibility</Trans>
-                </FormLabel>
-
-                <FormControl>
-                  <Select {...field} onValueChange={field.onChange}>
-                    <SelectTrigger className="bg-background text-muted-foreground">
-                      <SelectValue />
-                    </SelectTrigger>
-
-                    <SelectContent>
-                      <SelectItem value={DocumentVisibility.EVERYONE}>
-                        <Trans>Everyone can access and view the document</Trans>
-                      </SelectItem>
-                      <SelectItem value={DocumentVisibility.MANAGER_AND_ABOVE}>
-                        <Trans>Only managers and above can access and view the document</Trans>
-                      </SelectItem>
-                      <SelectItem value={DocumentVisibility.ADMIN}>
-                        <Trans>Only admins can access and view the document</Trans>
-                      </SelectItem>
-                    </SelectContent>
-                  </Select>
-                </FormControl>
-
-                <FormDescription>
-                  <Trans>Controls the default visibility of an uploaded document.</Trans>
-                </FormDescription>
-              </FormItem>
-            )}
-          />
-
-          <FormField
-            control={form.control}
-            name="documentLanguage"
-            render={({ field }) => (
-              <FormItem className="flex-1">
-                <FormLabel>
-                  <Trans>Default Document Language</Trans>
-                </FormLabel>
-
-                <FormControl>
-                  <Select {...field} onValueChange={field.onChange}>
-                    <SelectTrigger className="bg-background text-muted-foreground">
-                      <SelectValue />
-                    </SelectTrigger>
-
-                    <SelectContent>
-                      {Object.entries(SUPPORTED_LANGUAGES).map(([code, language]) => (
-                        <SelectItem key={code} value={code}>
-                          {language.full}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-                </FormControl>
-
-                <FormDescription>
-                  <Trans>
-                    Controls the default language of an uploaded document. This will be used as the
-                    language in email communications with the recipients.
-                  </Trans>
-                </FormDescription>
-              </FormItem>
-            )}
-          />
-
-          <FormField
-            control={form.control}
-            name="signatureTypes"
-            render={({ field }) => (
-              <FormItem className="flex-1">
-                <FormLabel className="flex flex-row items-center">
-                  <Trans>Default Signature Settings</Trans>
-                  <DocumentSignatureSettingsTooltip />
-                </FormLabel>
-
-                <FormControl>
-                  <MultiSelectCombobox
-                    options={Object.values(DOCUMENT_SIGNATURE_TYPES).map((option) => ({
-                      label: _(option.label),
-                      value: option.value,
-                    }))}
-                    selectedValues={field.value}
-                    onChange={field.onChange}
-                    className="bg-background w-full"
-                    enableSearch={false}
-                    emptySelectionPlaceholder="Select signature types"
-                    testId="signature-types-combobox"
-                  />
-                </FormControl>
-
-                {form.formState.errors.signatureTypes ? (
-                  <FormMessage />
-                ) : (
-                  <FormDescription>
-                    <Trans>
-                      Controls which signatures are allowed to be used when signing a document.
-                    </Trans>
-                  </FormDescription>
-                )}
-              </FormItem>
-            )}
-          />
-
-          <FormField
-            control={form.control}
-            name="includeSenderDetails"
-            render={({ field }) => (
-              <FormItem className="flex-1">
-                <FormLabel>
-                  <Trans>Send on Behalf of Team</Trans>
-                </FormLabel>
-
-                <div>
-                  <FormControl className="block">
-                    <Switch
-                      ref={field.ref}
-                      name={field.name}
-                      checked={field.value}
-                      onCheckedChange={field.onChange}
-                    />
-                  </FormControl>
-                </div>
-
-                <div className="pt-2">
-                  <div className="text-muted-foreground text-xs font-medium">
-                    <Trans>Preview</Trans>
-                  </div>
-
-                  <Alert variant="neutral" className="mt-1 px-2.5 py-1.5 text-sm">
-                    {includeSenderDetails ? (
-                      <Trans>
-                        "{placeholderEmail}" on behalf of "{team.name}" has invited you to sign
-                        "example document".
-                      </Trans>
-                    ) : (
-                      <Trans>"{team.name}" has invited you to sign "example document".</Trans>
-                    )}
-                  </Alert>
-                </div>
-
-                <FormDescription>
-                  <Trans>
-                    Controls the formatting of the message that will be sent when inviting a
-                    recipient to sign a document. If a custom message has been provided while
-                    configuring the document, it will be used instead.
-                  </Trans>
-                </FormDescription>
-              </FormItem>
-            )}
-          />
-
-          <FormField
-            control={form.control}
-            name="includeSigningCertificate"
-            render={({ field }) => (
-              <FormItem className="flex-1">
-                <FormLabel>
-                  <Trans>Include the Signing Certificate in the Document</Trans>
-                </FormLabel>
-
-                <div>
-                  <FormControl className="block">
-                    <Switch
-                      ref={field.ref}
-                      name={field.name}
-                      checked={field.value}
-                      onCheckedChange={field.onChange}
-                    />
-                  </FormControl>
-                </div>
-
-                <FormDescription>
-                  <Trans>
-                    Controls whether the signing certificate will be included in the document when
-                    it is downloaded. The signing certificate can still be downloaded from the logs
-                    page separately.
-                  </Trans>
-                </FormDescription>
-              </FormItem>
-            )}
-          />
-
-          <div className="flex flex-row justify-end space-x-4">
-            <Button type="submit" loading={form.formState.isSubmitting}>
-              <Trans>Update</Trans>
-            </Button>
-          </div>
-        </fieldset>
-      </form>
-    </Form>
-  );
-};
diff --git a/apps/remix/app/components/forms/team-update-form.tsx b/apps/remix/app/components/forms/team-update-form.tsx
index a5165e30f..bf6159443 100644
--- a/apps/remix/app/components/forms/team-update-form.tsx
+++ b/apps/remix/app/components/forms/team-update-form.tsx
@@ -10,7 +10,7 @@ import type { z } from 'zod';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { trpc } from '@documenso/trpc/react';
-import { ZUpdateTeamMutationSchema } from '@documenso/trpc/server/team-router/schema';
+import { ZUpdateTeamRequestSchema } from '@documenso/trpc/server/team-router/update-team.types';
 import { Button } from '@documenso/ui/primitives/button';
 import {
   Form,
@@ -29,7 +29,7 @@ export type UpdateTeamDialogProps = {
   teamUrl: string;
 };
 
-const ZTeamUpdateFormSchema = ZUpdateTeamMutationSchema.shape.data.pick({
+const ZTeamUpdateFormSchema = ZUpdateTeamRequestSchema.shape.data.pick({
   name: true,
   url: true,
 });
@@ -49,7 +49,7 @@ export const TeamUpdateForm = ({ teamId, teamName, teamUrl }: UpdateTeamDialogPr
     },
   });
 
-  const { mutateAsync: updateTeam } = trpc.team.updateTeam.useMutation();
+  const { mutateAsync: updateTeam } = trpc.team.update.useMutation();
 
   const onFormSubmit = async ({ name, url }: TTeamUpdateFormSchema) => {
     try {
diff --git a/apps/remix/app/components/forms/token.tsx b/apps/remix/app/components/forms/token.tsx
index d7bec0cba..13b7da0b1 100644
--- a/apps/remix/app/components/forms/token.tsx
+++ b/apps/remix/app/components/forms/token.tsx
@@ -8,12 +8,11 @@ import type { ApiToken } from '@prisma/client';
 import { AnimatePresence, motion } from 'framer-motion';
 import { useForm } from 'react-hook-form';
 import { match } from 'ts-pattern';
-import { z } from 'zod';
+import type { z } from 'zod';
 
 import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { trpc } from '@documenso/trpc/react';
-import type { TCreateTokenMutationSchema } from '@documenso/trpc/server/api-token-router/schema';
 import { ZCreateTokenMutationSchema } from '@documenso/trpc/server/api-token-router/schema';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@@ -38,7 +37,7 @@ import {
 import { Switch } from '@documenso/ui/primitives/switch';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 export const EXPIRATION_DATES = {
   ONE_WEEK: msg`7 days`,
@@ -48,8 +47,9 @@ export const EXPIRATION_DATES = {
   ONE_YEAR: msg`12 months`,
 } as const;
 
-const ZCreateTokenFormSchema = ZCreateTokenMutationSchema.extend({
-  enabled: z.boolean(),
+const ZCreateTokenFormSchema = ZCreateTokenMutationSchema.pick({
+  tokenName: true,
+  expirationDate: true,
 });
 
 type TCreateTokenFormSchema = z.infer<typeof ZCreateTokenFormSchema>;
@@ -67,7 +67,7 @@ export type ApiTokenFormProps = {
 export const ApiTokenForm = ({ className, tokens }: ApiTokenFormProps) => {
   const [, copy] = useCopyToClipboard();
 
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const { _ } = useLingui();
   const { toast } = useToast();
@@ -86,7 +86,6 @@ export const ApiTokenForm = ({ className, tokens }: ApiTokenFormProps) => {
     defaultValues: {
       tokenName: '',
       expirationDate: '',
-      enabled: false,
     },
   });
 
@@ -111,10 +110,10 @@ export const ApiTokenForm = ({ className, tokens }: ApiTokenFormProps) => {
     }
   };
 
-  const onSubmit = async ({ tokenName, expirationDate }: TCreateTokenMutationSchema) => {
+  const onSubmit = async ({ tokenName, expirationDate }: TCreateTokenFormSchema) => {
     try {
       await createTokenMutation({
-        teamId: team?.id,
+        teamId: team.id,
         tokenName,
         expirationDate: noExpirationDate ? null : expirationDate,
       });
@@ -149,7 +148,10 @@ export const ApiTokenForm = ({ className, tokens }: ApiTokenFormProps) => {
     <div className={cn(className)}>
       <Form {...form}>
         <form onSubmit={form.handleSubmit(onSubmit)}>
-          <fieldset className="mt-6 flex w-full flex-col gap-4">
+          <fieldset
+            className="mt-6 flex w-full flex-col gap-4"
+            disabled={form.formState.isSubmitting}
+          >
             <FormField
               control={form.control}
               name="tokenName"
@@ -209,47 +211,30 @@ export const ApiTokenForm = ({ className, tokens }: ApiTokenFormProps) => {
                 )}
               />
 
-              <FormField
-                control={form.control}
-                name="enabled"
-                render={({ field }) => (
-                  <FormItem className="">
-                    <FormLabel className="text-muted-foreground mt-2">
-                      <Trans>Never expire</Trans>
-                    </FormLabel>
-                    <FormControl>
-                      <div className="block md:py-1.5">
-                        <Switch
-                          className="bg-background"
-                          checked={field.value}
-                          onCheckedChange={(val) => {
-                            setNoExpirationDate((prev) => !prev);
-                            field.onChange(val);
-                          }}
-                        />
-                      </div>
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
+              <div>
+                <FormLabel className="text-muted-foreground mt-2">
+                  <Trans>Never expire</Trans>
+                </FormLabel>
+                <div className="block md:py-1.5">
+                  <Switch
+                    className="bg-background mt-2"
+                    checked={noExpirationDate}
+                    onCheckedChange={setNoExpirationDate}
+                  />
+                </div>
+              </div>
             </div>
 
             <Button
               type="submit"
               className="hidden md:inline-flex"
-              disabled={!form.formState.isDirty}
               loading={form.formState.isSubmitting}
             >
               <Trans>Create token</Trans>
             </Button>
 
             <div className="md:hidden">
-              <Button
-                type="submit"
-                disabled={!form.formState.isDirty}
-                loading={form.formState.isSubmitting}
-              >
+              <Button type="submit" loading={form.formState.isSubmitting}>
                 <Trans>Create token</Trans>
               </Button>
             </div>
diff --git a/apps/remix/app/components/general/app-command-menu.tsx b/apps/remix/app/components/general/app-command-menu.tsx
index d6dcfe395..9e9724d2e 100644
--- a/apps/remix/app/components/general/app-command-menu.tsx
+++ b/apps/remix/app/components/general/app-command-menu.tsx
@@ -9,6 +9,7 @@ import { useHotkeys } from 'react-hotkeys-hook';
 import { useNavigate } from 'react-router';
 import { Theme, useTheme } from 'remix-themes';
 
+import { useSession } from '@documenso/lib/client-only/providers/session';
 import { SUPPORTED_LANGUAGES } from '@documenso/lib/constants/i18n';
 import {
   DOCUMENTS_PAGE_SHORTCUT,
@@ -20,6 +21,7 @@ import {
   SKIP_QUERY_BATCH_META,
 } from '@documenso/lib/constants/trpc';
 import { dynamicActivate } from '@documenso/lib/utils/i18n';
+import { isPersonalLayout } from '@documenso/lib/utils/organisations';
 import { trpc as trpcReact } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import {
@@ -33,28 +35,7 @@ import {
 } from '@documenso/ui/primitives/command';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-const DOCUMENTS_PAGES = [
-  {
-    label: msg`All documents`,
-    path: '/documents?status=ALL',
-    shortcut: DOCUMENTS_PAGE_SHORTCUT.replace('+', ''),
-  },
-  { label: msg`Draft documents`, path: '/documents?status=DRAFT' },
-  {
-    label: msg`Completed documents`,
-    path: '/documents?status=COMPLETED',
-  },
-  { label: msg`Pending documents`, path: '/documents?status=PENDING' },
-  { label: msg`Inbox documents`, path: '/documents?status=INBOX' },
-];
-
-const TEMPLATES_PAGES = [
-  {
-    label: msg`All templates`,
-    path: '/templates',
-    shortcut: TEMPLATES_PAGE_SHORTCUT.replace('+', ''),
-  },
-];
+import { useOptionalCurrentTeam } from '~/providers/team';
 
 const SETTINGS_PAGES = [
   {
@@ -73,8 +54,10 @@ export type AppCommandMenuProps = {
 
 export function AppCommandMenu({ open, onOpenChange }: AppCommandMenuProps) {
   const { _ } = useLingui();
+  const { organisations } = useSession();
 
   const navigate = useNavigate();
+  const currentTeam = useOptionalCurrentTeam();
 
   const [isOpen, setIsOpen] = useState(() => open ?? false);
   const [search, setSearch] = useState('');
@@ -94,6 +77,60 @@ export function AppCommandMenu({ open, onOpenChange }: AppCommandMenuProps) {
       },
     );
 
+  const teamUrl = useMemo(() => {
+    let teamUrl = currentTeam?.url || null;
+
+    if (!teamUrl && isPersonalLayout(organisations)) {
+      teamUrl = organisations[0].teams[0]?.url || null;
+    }
+
+    return teamUrl;
+  }, [currentTeam, organisations]);
+
+  const documentPageLinks = useMemo(() => {
+    if (!teamUrl) {
+      return [];
+    }
+
+    return [
+      {
+        label: msg`All documents`,
+        path: `/t/${teamUrl}/documents?status=ALL`,
+        shortcut: DOCUMENTS_PAGE_SHORTCUT.replace('+', ''),
+      },
+      {
+        label: msg`Draft documents`,
+        path: `/t/${teamUrl}/documents?status=DRAFT`,
+      },
+      {
+        label: msg`Completed documents`,
+        path: `/t/${teamUrl}/documents?status=COMPLETED`,
+      },
+      {
+        label: msg`Pending documents`,
+        path: `/t/${teamUrl}/documents?status=PENDING`,
+      },
+      {
+        label: msg`Inbox documents`,
+        path: `/t/${teamUrl}/documents?status=INBOX`,
+      },
+    ];
+  }, [currentTeam, organisations]);
+
+  const templatePageLinks = useMemo(() => {
+    if (!teamUrl) {
+      return [];
+    }
+
+    return [
+      {
+        label: msg`All templates`,
+        path: `/t/${teamUrl}/templates`,
+        shortcut: TEMPLATES_PAGE_SHORTCUT.replace('+', ''),
+      },
+    ];
+  }, [currentTeam, organisations]);
+
   const searchResults = useMemo(() => {
     if (!searchDocumentsData) {
       return [];
@@ -145,8 +182,8 @@ export function AppCommandMenu({ open, onOpenChange }: AppCommandMenuProps) {
   };
 
   const goToSettings = useCallback(() => push(SETTINGS_PAGES[0].path), [push]);
-  const goToDocuments = useCallback(() => push(DOCUMENTS_PAGES[0].path), [push]);
-  const goToTemplates = useCallback(() => push(TEMPLATES_PAGES[0].path), [push]);
+  const goToDocuments = useCallback(() => push(documentPageLinks[0].path), [push]);
+  const goToTemplates = useCallback(() => push(templatePageLinks[0].path), [push]);
 
   useHotkeys(['ctrl+k', 'meta+k'], toggleOpen, { preventDefault: true });
   useHotkeys(SETTINGS_PAGE_SHORTCUT, goToSettings);
@@ -197,12 +234,16 @@ export function AppCommandMenu({ open, onOpenChange }: AppCommandMenuProps) {
         )}
         {!currentPage && (
           <>
-            <CommandGroup className="mx-2 p-0 pb-2" heading={_(msg`Documents`)}>
-              <Commands push={push} pages={DOCUMENTS_PAGES} />
-            </CommandGroup>
-            <CommandGroup className="mx-2 p-0 pb-2" heading={_(msg`Templates`)}>
-              <Commands push={push} pages={TEMPLATES_PAGES} />
-            </CommandGroup>
+            {documentPageLinks.length > 0 && (
+              <CommandGroup className="mx-2 p-0 pb-2" heading={_(msg`Documents`)}>
+                <Commands push={push} pages={documentPageLinks} />
+              </CommandGroup>
+            )}
+            {templatePageLinks.length > 0 && (
+              <CommandGroup className="mx-2 p-0 pb-2" heading={_(msg`Templates`)}>
+                <Commands push={push} pages={templatePageLinks} />
+              </CommandGroup>
+            )}
             <CommandGroup className="mx-2 p-0 pb-2" heading={_(msg`Settings`)}>
               <Commands push={push} pages={SETTINGS_PAGES} />
             </CommandGroup>
diff --git a/apps/remix/app/components/general/app-header.tsx b/apps/remix/app/components/general/app-header.tsx
index 4d8361e69..f907e7efd 100644
--- a/apps/remix/app/components/general/app-header.tsx
+++ b/apps/remix/app/components/general/app-header.tsx
@@ -1,12 +1,13 @@
 import { type HTMLAttributes, useEffect, useState } from 'react';
 
-import { MenuIcon, SearchIcon } from 'lucide-react';
-import { Link, useLocation, useParams } from 'react-router';
+import { InboxIcon, MenuIcon, SearchIcon } from 'lucide-react';
+import { Link, useParams } from 'react-router';
 
-import type { SessionUser } from '@documenso/auth/server/lib/session/session';
-import type { TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { isPersonalLayout } from '@documenso/lib/utils/organisations';
 import { getRootHref } from '@documenso/lib/utils/params';
 import { cn } from '@documenso/ui/lib/utils';
+import { Button } from '@documenso/ui/primitives/button';
 
 import { BrandingLogo } from '~/components/general/branding-logo';
 
@@ -14,15 +15,14 @@ import { AppCommandMenu } from './app-command-menu';
 import { AppNavDesktop } from './app-nav-desktop';
 import { AppNavMobile } from './app-nav-mobile';
 import { MenuSwitcher } from './menu-switcher';
+import { OrgMenuSwitcher } from './org-menu-switcher';
 
-export type HeaderProps = HTMLAttributes<HTMLDivElement> & {
-  user: SessionUser;
-  teams: TGetTeamsResponse;
-};
+export type HeaderProps = HTMLAttributes<HTMLDivElement>;
 
-export const Header = ({ className, user, teams, ...props }: HeaderProps) => {
+export const Header = ({ className, ...props }: HeaderProps) => {
   const params = useParams();
-  const { pathname } = useLocation();
+
+  const { organisations } = useSession();
 
   const [isCommandMenuOpen, setIsCommandMenuOpen] = useState(false);
   const [isHamburgerMenuOpen, setIsHamburgerMenuOpen] = useState(false);
@@ -38,16 +38,6 @@ export const Header = ({ className, user, teams, ...props }: HeaderProps) => {
     return () => window.removeEventListener('scroll', onScroll);
   }, []);
 
-  const isPathTeamUrl = (teamUrl: string) => {
-    if (!pathname || !pathname.startsWith(`/t/`)) {
-      return false;
-    }
-
-    return pathname.split('/')[2] === teamUrl;
-  };
-
-  const selectedTeam = teams?.find((team) => isPathTeamUrl(team.url));
-
   return (
     <header
       className={cn(
@@ -59,7 +49,7 @@ export const Header = ({ className, user, teams, ...props }: HeaderProps) => {
     >
       <div className="mx-auto flex w-full max-w-screen-xl items-center justify-between gap-x-4 px-4 md:justify-normal md:px-8">
         <Link
-          to={`${getRootHref(params, { returnEmptyRootString: true })}/documents`}
+          to={`${getRootHref(params, { returnEmptyRootString: true })}`}
           className="focus-visible:ring-ring ring-offset-background hidden rounded-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 md:inline"
         >
           <BrandingLogo className="h-6 w-auto" />
@@ -67,11 +57,21 @@ export const Header = ({ className, user, teams, ...props }: HeaderProps) => {
 
         <AppNavDesktop setIsCommandMenuOpen={setIsCommandMenuOpen} />
 
-        <div
-          className="flex gap-x-4 md:ml-8"
-          title={selectedTeam ? selectedTeam.name : (user.name ?? '')}
-        >
-          <MenuSwitcher user={user} teams={teams} />
+        <Button asChild variant="outline" className="relative hidden h-10 w-10 rounded-lg md:flex">
+          <Link to="/inbox" className="relative block h-10 w-10">
+            <InboxIcon className="text-muted-foreground hover:text-foreground h-5 w-5 flex-shrink-0 transition-colors" />
+
+            {/* Todo: Add counter. */}
+            {/* {unreadCount > 0 && (
+              <span className="bg-muted text-muted-foreground absolute -right-2 -top-2 flex h-5 w-5 items-center justify-center rounded-full text-[10px]">
+                1
+              </span>
+            )} */}
+          </Link>
+        </Button>
+
+        <div className="md:ml-4">
+          {isPersonalLayout(organisations) ? <MenuSwitcher /> : <OrgMenuSwitcher />}
         </div>
 
         <div className="flex flex-row items-center space-x-4 md:hidden">
diff --git a/apps/remix/app/components/general/app-nav-desktop.tsx b/apps/remix/app/components/general/app-nav-desktop.tsx
index 631fff212..1347e3487 100644
--- a/apps/remix/app/components/general/app-nav-desktop.tsx
+++ b/apps/remix/app/components/general/app-nav-desktop.tsx
@@ -1,26 +1,20 @@
 import type { HTMLAttributes } from 'react';
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
+import { motion } from 'framer-motion';
+import { AnimatePresence } from 'framer-motion';
 import { Search } from 'lucide-react';
-import { Link, useLocation, useParams } from 'react-router';
+import { Link, useLocation } from 'react-router';
 
-import { getRootHref } from '@documenso/lib/utils/params';
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { isPersonalLayout } from '@documenso/lib/utils/organisations';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 
-const navigationLinks = [
-  {
-    href: '/documents',
-    label: msg`Documents`,
-  },
-  {
-    href: '/templates',
-    label: msg`Templates`,
-  },
-];
+import { useOptionalCurrentTeam } from '~/providers/team';
 
 export type AppNavDesktopProps = HTMLAttributes<HTMLDivElement> & {
   setIsCommandMenuOpen: (value: boolean) => void;
@@ -32,13 +26,13 @@ export const AppNavDesktop = ({
   ...props
 }: AppNavDesktopProps) => {
   const { _ } = useLingui();
+  const { organisations } = useSession();
 
   const { pathname } = useLocation();
-  const params = useParams();
 
   const [modifierKey, setModifierKey] = useState(() => 'Ctrl');
 
-  const rootHref = getRootHref(params, { returnEmptyRootString: true });
+  const currentTeam = useOptionalCurrentTeam();
 
   useEffect(() => {
     const userAgent = typeof navigator !== 'undefined' ? navigator.userAgent : 'unknown';
@@ -47,6 +41,29 @@ export const AppNavDesktop = ({
     setModifierKey(isMacOS ? '⌘' : 'Ctrl');
   }, []);
 
+  const menuNavigationLinks = useMemo(() => {
+    let teamUrl = currentTeam?.url || null;
+
+    if (!teamUrl && isPersonalLayout(organisations)) {
+      teamUrl = organisations[0].teams[0]?.url || null;
+    }
+
+    if (!teamUrl) {
+      return [];
+    }
+
+    return [
+      {
+        href: `/t/${teamUrl}/documents`,
+        label: msg`Documents`,
+      },
+      {
+        href: `/t/${teamUrl}/templates`,
+        label: msg`Templates`,
+      },
+    ];
+  }, [currentTeam, organisations]);
+
   return (
     <div
       className={cn(
@@ -55,23 +72,32 @@ export const AppNavDesktop = ({
       )}
       {...props}
     >
-      <div className="flex items-baseline gap-x-6">
-        {navigationLinks.map(({ href, label }) => (
-          <Link
-            key={href}
-            to={`${rootHref}${href}`}
-            className={cn(
-              'text-muted-foreground dark:text-muted-foreground/60 focus-visible:ring-ring ring-offset-background rounded-md font-medium leading-5 hover:opacity-80 focus-visible:outline-none focus-visible:ring-2',
-              {
-                'text-foreground dark:text-muted-foreground': pathname?.startsWith(
-                  `${rootHref}${href}`,
-                ),
-              },
-            )}
-          >
-            {_(label)}
-          </Link>
-        ))}
+      <div>
+        <AnimatePresence>
+          {menuNavigationLinks.length > 0 && (
+            <motion.div
+              initial={{ opacity: 0 }}
+              animate={{ opacity: 1 }}
+              exit={{ opacity: 0 }}
+              className="flex items-baseline gap-x-6"
+            >
+              {menuNavigationLinks.map(({ href, label }) => (
+                <Link
+                  key={href}
+                  to={href}
+                  className={cn(
+                    'text-muted-foreground dark:text-muted-foreground/60 focus-visible:ring-ring ring-offset-background rounded-md font-medium leading-5 hover:opacity-80 focus-visible:outline-none focus-visible:ring-2',
+                    {
+                      'text-foreground dark:text-muted-foreground': pathname?.startsWith(href),
+                    },
+                  )}
+                >
+                  {_(label)}
+                </Link>
+              ))}
+            </motion.div>
+          )}
+        </AnimatePresence>
       </div>
 
       <Button
diff --git a/apps/remix/app/components/general/app-nav-mobile.tsx b/apps/remix/app/components/general/app-nav-mobile.tsx
index 0d48525e1..757a26f68 100644
--- a/apps/remix/app/components/general/app-nav-mobile.tsx
+++ b/apps/remix/app/components/general/app-nav-mobile.tsx
@@ -1,48 +1,73 @@
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
+import { useMemo } from 'react';
+
+import { useLingui } from '@lingui/react/macro';
 import { Trans } from '@lingui/react/macro';
-import { Link, useParams } from 'react-router';
+import { Link } from 'react-router';
 
 import LogoImage from '@documenso/assets/logo.png';
 import { authClient } from '@documenso/auth/client';
-import { getRootHref } from '@documenso/lib/utils/params';
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { isPersonalLayout } from '@documenso/lib/utils/organisations';
 import { Sheet, SheetContent } from '@documenso/ui/primitives/sheet';
 import { ThemeSwitcher } from '@documenso/ui/primitives/theme-switcher';
 
+import { useOptionalCurrentTeam } from '~/providers/team';
+
 export type AppNavMobileProps = {
   isMenuOpen: boolean;
   onMenuOpenChange?: (_value: boolean) => void;
 };
 
 export const AppNavMobile = ({ isMenuOpen, onMenuOpenChange }: AppNavMobileProps) => {
-  const { _ } = useLingui();
+  const { t } = useLingui();
 
-  const params = useParams();
+  const { organisations } = useSession();
+
+  const currentTeam = useOptionalCurrentTeam();
 
   const handleMenuItemClick = () => {
     onMenuOpenChange?.(false);
   };
 
-  const rootHref = getRootHref(params, { returnEmptyRootString: true });
+  const menuNavigationLinks = useMemo(() => {
+    let teamUrl = currentTeam?.url || null;
 
-  const menuNavigationLinks = [
-    {
-      href: `${rootHref}/documents`,
-      text: msg`Documents`,
-    },
-    {
-      href: `${rootHref}/templates`,
-      text: msg`Templates`,
-    },
-    {
-      href: '/settings/teams',
-      text: msg`Teams`,
-    },
-    {
-      href: '/settings/profile',
-      text: msg`Settings`,
-    },
-  ];
+    if (!teamUrl && isPersonalLayout(organisations)) {
+      teamUrl = organisations[0].teams[0]?.url || null;
+    }
+
+    if (!teamUrl) {
+      return [
+        {
+          href: '/inbox',
+          text: t`Inbox`,
+        },
+        {
+          href: '/settings/profile',
+          text: t`Settings`,
+        },
+      ];
+    }
+
+    return [
+      {
+        href: `/t/${teamUrl}/documents`,
+        label: t`Documents`,
+      },
+      {
+        href: `/t/${teamUrl}/templates`,
+        label: t`Templates`,
+      },
+      {
+        href: '/inbox',
+        text: t`Inbox`,
+      },
+      {
+        href: '/settings/profile',
+        text: t`Settings`,
+      },
+    ];
+  }, [currentTeam, organisations]);
 
   return (
     <Sheet open={isMenuOpen} onOpenChange={onMenuOpenChange}>
@@ -65,7 +90,7 @@ export const AppNavMobile = ({ isMenuOpen, onMenuOpenChange }: AppNavMobileProps
               to={href}
               onClick={() => handleMenuItemClick()}
             >
-              {_(text)}
+              {text}
             </Link>
           ))}
 
diff --git a/apps/remix/app/components/general/billing-plans.tsx b/apps/remix/app/components/general/billing-plans.tsx
index 2113da8fc..e1c92cc9f 100644
--- a/apps/remix/app/components/general/billing-plans.tsx
+++ b/apps/remix/app/components/general/billing-plans.tsx
@@ -1,91 +1,91 @@
-import { useState } from 'react';
+import { useMemo, useState } from 'react';
 
-import type { MessageDescriptor } from '@lingui/core';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useLingui } from '@lingui/react/macro';
 import { Trans } from '@lingui/react/macro';
 import { AnimatePresence, motion } from 'framer-motion';
+import { Building2Icon, PlusIcon } from 'lucide-react';
+import { useForm } from 'react-hook-form';
 
-import type { PriceIntervals } from '@documenso/ee/server-only/stripe/get-prices-by-interval';
+import type { InternalClaimPlans } from '@documenso/ee/server-only/stripe/get-internal-claim-plans';
 import { useIsMounted } from '@documenso/lib/client-only/hooks/use-is-mounted';
-import { toHumanPrice } from '@documenso/lib/universal/stripe/to-human-price';
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { INTERNAL_CLAIM_ID } from '@documenso/lib/types/subscription';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
 import { Card, CardContent, CardTitle } from '@documenso/ui/primitives/card';
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@documenso/ui/primitives/dialog';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+import { Label } from '@documenso/ui/primitives/label';
+import { RadioGroup, RadioGroupItem } from '@documenso/ui/primitives/radio-group';
 import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-type Interval = keyof PriceIntervals;
-
-const INTERVALS: Interval[] = ['day', 'week', 'month', 'year'];
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-const isInterval = (value: unknown): value is Interval => INTERVALS.includes(value as Interval);
-
-const FRIENDLY_INTERVALS: Record<Interval, MessageDescriptor> = {
-  day: msg`Daily`,
-  week: msg`Weekly`,
-  month: msg`Monthly`,
-  year: msg`Yearly`,
-};
+import { ZCreateOrganisationFormSchema } from '../dialogs/organisation-create-dialog';
 
 const MotionCard = motion(Card);
 
 export type BillingPlansProps = {
-  prices: PriceIntervals;
+  plans: InternalClaimPlans;
 };
 
-export const BillingPlans = ({ prices }: BillingPlansProps) => {
-  const { _ } = useLingui();
-  const { toast } = useToast();
-
+export const BillingPlans = ({ plans }: BillingPlansProps) => {
   const isMounted = useIsMounted();
 
-  const [interval, setInterval] = useState<Interval>('month');
-  const [checkoutSessionPriceId, setCheckoutSessionPriceId] = useState<string | null>(null);
+  const [interval, setInterval] = useState<'monthlyPrice' | 'yearlyPrice'>('yearlyPrice');
 
-  const { mutateAsync: createCheckoutSession } = trpc.profile.createCheckoutSession.useMutation();
+  const pricesToDisplay = useMemo(() => {
+    const prices = [];
 
-  const onSubscribeClick = async (priceId: string) => {
-    try {
-      setCheckoutSessionPriceId(priceId);
-
-      const url = await createCheckoutSession({ priceId });
-
-      if (!url) {
-        throw new Error('Unable to create session');
+    for (const plan of Object.values(plans)) {
+      if (plan[interval] && plan[interval].isVisibleInApp) {
+        prices.push({
+          ...plan[interval],
+          memberCount: plan.memberCount,
+          claim: plan.id,
+        });
       }
-
-      window.open(url);
-    } catch (_err) {
-      toast({
-        title: _(msg`Something went wrong`),
-        description: _(msg`An error occurred while trying to create a checkout session.`),
-        variant: 'destructive',
-      });
-    } finally {
-      setCheckoutSessionPriceId(null);
     }
-  };
+
+    return prices;
+  }, [plans, interval]);
 
   return (
     <div>
-      <Tabs value={interval} onValueChange={(value) => isInterval(value) && setInterval(value)}>
+      <Tabs
+        value={interval}
+        onValueChange={(value) => setInterval(value as 'monthlyPrice' | 'yearlyPrice')}
+      >
         <TabsList>
-          {INTERVALS.map(
-            (interval) =>
-              prices[interval].length > 0 && (
-                <TabsTrigger key={interval} className="min-w-[150px]" value={interval}>
-                  {_(FRIENDLY_INTERVALS[interval])}
-                </TabsTrigger>
-              ),
-          )}
+          <TabsTrigger className="min-w-[150px]" value="monthlyPrice">
+            <Trans>Monthly</Trans>
+          </TabsTrigger>
+          <TabsTrigger className="min-w-[150px]" value="yearlyPrice">
+            <Trans>Yearly</Trans>
+          </TabsTrigger>
         </TabsList>
       </Tabs>
 
       <div className="mt-8 grid gap-8 lg:grid-cols-2 2xl:grid-cols-3">
         <AnimatePresence mode="wait">
-          {prices[interval].map((price) => (
+          {pricesToDisplay.map((price) => (
             <MotionCard
               key={price.id}
               initial={{ opacity: isMounted ? 0 : 1, y: isMounted ? 20 : 0 }}
@@ -96,8 +96,14 @@ export const BillingPlans = ({ prices }: BillingPlansProps) => {
                 <CardTitle>{price.product.name}</CardTitle>
 
                 <div className="text-muted-foreground mt-2 text-lg font-medium">
-                  ${toHumanPrice(price.unit_amount ?? 0)} {price.currency.toUpperCase()}{' '}
-                  <span className="text-xs">per {interval}</span>
+                  {price.friendlyPrice + ' '}
+                  <span className="text-xs">
+                    {interval === 'monthlyPrice' ? (
+                      <Trans>per month</Trans>
+                    ) : (
+                      <Trans>per year</Trans>
+                    )}
+                  </span>
                 </div>
 
                 <div className="text-muted-foreground mt-1.5 text-sm">
@@ -120,14 +126,12 @@ export const BillingPlans = ({ prices }: BillingPlansProps) => {
 
                 <div className="flex-1" />
 
-                <Button
-                  className="mt-4"
-                  disabled={checkoutSessionPriceId !== null}
-                  loading={checkoutSessionPriceId === price.id}
-                  onClick={() => void onSubscribeClick(price.id)}
-                >
-                  <Trans>Subscribe</Trans>
-                </Button>
+                <BillingDialog
+                  priceId={price.id}
+                  planName={price.product.name}
+                  memberCount={price.memberCount}
+                  claim={price.claim}
+                />
               </CardContent>
             </MotionCard>
           ))}
@@ -136,3 +140,178 @@ export const BillingPlans = ({ prices }: BillingPlansProps) => {
     </div>
   );
 };
+
+const BillingDialog = ({
+  priceId,
+  planName,
+  claim,
+}: {
+  priceId: string;
+  planName: string;
+  memberCount: number;
+  claim: string;
+}) => {
+  const [isOpen, setIsOpen] = useState(false);
+
+  const { t } = useLingui();
+  const { toast } = useToast();
+
+  const organisation = useCurrentOrganisation();
+
+  const [subscriptionOption, setSubscriptionOption] = useState<'update' | 'create'>(
+    organisation.type === 'PERSONAL' && claim === INTERNAL_CLAIM_ID.INDIVIDUAL
+      ? 'update'
+      : 'create',
+  );
+
+  const [step, setStep] = useState(0);
+
+  const form = useForm({
+    resolver: zodResolver(ZCreateOrganisationFormSchema),
+    defaultValues: {
+      name: '',
+    },
+  });
+
+  const { mutateAsync: createSubscription, isPending: isCreatingSubscription } =
+    trpc.billing.subscription.create.useMutation();
+
+  const { mutateAsync: createOrganisation, isPending: isCreatingOrganisation } =
+    trpc.organisation.create.useMutation();
+
+  const isPending = isCreatingSubscription || isCreatingOrganisation;
+
+  const onSubscribeClick = async () => {
+    try {
+      let redirectUrl = '';
+
+      if (subscriptionOption === 'update') {
+        const createSubscriptionResponse = await createSubscription({
+          organisationId: organisation.id,
+          priceId,
+        });
+
+        redirectUrl = createSubscriptionResponse.redirectUrl;
+      } else {
+        const createOrganisationResponse = await createOrganisation({
+          name: form.getValues('name'),
+          priceId,
+        });
+
+        if (!createOrganisationResponse.paymentRequired) {
+          setIsOpen(false);
+          return;
+        }
+
+        redirectUrl = createOrganisationResponse.checkoutUrl;
+      }
+
+      window.location.href = redirectUrl;
+    } catch (_err) {
+      toast({
+        title: t`Something went wrong`,
+        description: t`An error occurred while trying to create a checkout session.`,
+        variant: 'destructive',
+      });
+    }
+  };
+
+  return (
+    <Dialog open={isOpen} onOpenChange={(value) => !isPending && setIsOpen(value)}>
+      <DialogTrigger asChild>
+        <Button>
+          <Trans>Subscribe</Trans>
+        </Button>
+      </DialogTrigger>
+
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>
+            <Trans>Subscribe</Trans>
+          </DialogTitle>
+
+          <DialogDescription>
+            <Trans>You are about to subscribe to the {planName}</Trans>
+          </DialogDescription>
+        </DialogHeader>
+
+        {step === 0 ? (
+          <div>
+            <RadioGroup
+              className="space-y-2"
+              value={subscriptionOption}
+              onValueChange={(value) => setSubscriptionOption(value as 'update' | 'create')}
+            >
+              <div className="flex items-start space-x-3 space-y-0">
+                <RadioGroupItem value="update" id="update" />
+                <div className="space-y-1.5 leading-none">
+                  <Label htmlFor="update" className="flex items-center gap-2 font-medium">
+                    <Building2Icon className="h-4 w-4" />
+                    <Trans>Update current organisation</Trans>
+                  </Label>
+                  <p className="text-muted-foreground text-sm">
+                    <Trans>
+                      Upgrade <strong>{organisation.name}</strong> to {planName}
+                    </Trans>
+                  </p>
+                </div>
+              </div>
+
+              <div className="flex items-start space-x-3 space-y-0">
+                <RadioGroupItem value="create" id="create" />
+                <div className="space-y-1.5 leading-none">
+                  <Label htmlFor="create" className="flex items-center gap-2 font-medium">
+                    <PlusIcon className="h-4 w-4" />
+                    <Trans>Create separate organisation</Trans>
+                  </Label>
+                  <p className="text-muted-foreground text-sm">
+                    <Trans>
+                      Create a new organisation with {planName} plan. Keep your current organisation
+                      on it's current plan
+                    </Trans>
+                  </p>
+                </div>
+              </div>
+            </RadioGroup>
+          </div>
+        ) : (
+          <Form {...form}>
+            <FormField
+              control={form.control}
+              name="name"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel required>
+                    <Trans>Organisation Name</Trans>
+                  </FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </Form>
+        )}
+
+        <DialogFooter>
+          <DialogClose>
+            <Button disabled={isPending} variant="secondary">
+              <Trans>Close</Trans>
+            </Button>
+          </DialogClose>
+
+          {subscriptionOption === 'create' && step === 0 ? (
+            <Button className="mt-4" loading={isPending} onClick={() => setStep(1)}>
+              <Trans>Continue</Trans>
+            </Button>
+          ) : (
+            <Button className="mt-4" loading={isPending} onClick={() => void onSubscribeClick()}>
+              <Trans>Checkout</Trans>
+            </Button>
+          )}
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/apps/remix/app/components/general/billing-portal-button.tsx b/apps/remix/app/components/general/billing-portal-button.tsx
deleted file mode 100644
index ea8735954..000000000
--- a/apps/remix/app/components/general/billing-portal-button.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-
-import { trpc } from '@documenso/trpc/react';
-import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type BillingPortalButtonProps = {
-  buttonProps?: React.ComponentProps<typeof Button>;
-  children?: React.ReactNode;
-};
-
-export const BillingPortalButton = ({ buttonProps, children }: BillingPortalButtonProps) => {
-  const { _ } = useLingui();
-  const { toast } = useToast();
-
-  const { mutateAsync: createBillingPortal, isPending } =
-    trpc.profile.createBillingPortal.useMutation({
-      onSuccess: (sessionUrl) => {
-        window.open(sessionUrl, '_blank');
-      },
-      onError: (err) => {
-        let description = _(
-          msg`We are unable to proceed to the billing portal at this time. Please try again, or contact support.`,
-        );
-
-        if (err.message === 'CUSTOMER_NOT_FOUND') {
-          description = _(
-            msg`You do not currently have a customer record, this should not happen. Please contact support for assistance.`,
-          );
-        }
-
-        toast({
-          title: _(msg`Something went wrong`),
-          description,
-          variant: 'destructive',
-          duration: 10000,
-        });
-      },
-    });
-
-  return (
-    <Button {...buttonProps} onClick={async () => createBillingPortal()} loading={isPending}>
-      {children || <Trans>Manage Subscription</Trans>}
-    </Button>
-  );
-};
diff --git a/apps/remix/app/components/general/document-signing/document-signing-page-view.tsx b/apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
index 33b553af9..98aa35893 100644
--- a/apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
+++ b/apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
@@ -47,6 +47,7 @@ export type DocumentSigningPageViewProps = {
   completedFields: CompletedField[];
   isRecipientsTurn: boolean;
   allRecipients?: RecipientWithFields[];
+  includeSenderDetails: boolean;
 };
 
 export const DocumentSigningPageView = ({
@@ -56,18 +57,16 @@ export const DocumentSigningPageView = ({
   completedFields,
   isRecipientsTurn,
   allRecipients = [],
+  includeSenderDetails,
 }: DocumentSigningPageViewProps) => {
   const { documentData, documentMeta } = document;
 
   const [selectedSignerId, setSelectedSignerId] = useState<number | null>(allRecipients?.[0]?.id);
 
-  const shouldUseTeamDetails =
-    document.teamId && document.team?.teamGlobalSettings?.includeSenderDetails === false;
-
   let senderName = document.user.name ?? '';
   let senderEmail = `(${document.user.email})`;
 
-  if (shouldUseTeamDetails) {
+  if (includeSenderDetails) {
     senderName = document.team?.name ?? '';
     senderEmail = document.team?.teamEmail?.email ? `(${document.team.teamEmail.email})` : '';
   }
@@ -92,7 +91,7 @@ export const DocumentSigningPageView = ({
             <span className="text-muted-foreground">
               {match(recipient.role)
                 .with(RecipientRole.VIEWER, () =>
-                  document.teamId && !shouldUseTeamDetails ? (
+                  includeSenderDetails ? (
                     <Trans>
                       on behalf of "{document.team?.name}" has invited you to view this document
                     </Trans>
@@ -101,7 +100,7 @@ export const DocumentSigningPageView = ({
                   ),
                 )
                 .with(RecipientRole.SIGNER, () =>
-                  document.teamId && !shouldUseTeamDetails ? (
+                  includeSenderDetails ? (
                     <Trans>
                       on behalf of "{document.team?.name}" has invited you to sign this document
                     </Trans>
@@ -110,7 +109,7 @@ export const DocumentSigningPageView = ({
                   ),
                 )
                 .with(RecipientRole.APPROVER, () =>
-                  document.teamId && !shouldUseTeamDetails ? (
+                  includeSenderDetails ? (
                     <Trans>
                       on behalf of "{document.team?.name}" has invited you to approve this document
                     </Trans>
@@ -119,7 +118,7 @@ export const DocumentSigningPageView = ({
                   ),
                 )
                 .with(RecipientRole.ASSISTANT, () =>
-                  document.teamId && !shouldUseTeamDetails ? (
+                  includeSenderDetails ? (
                     <Trans>
                       on behalf of "{document.team?.name}" has invited you to assist this document
                     </Trans>
diff --git a/apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx b/apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
index aadcca37e..f31abb5db 100644
--- a/apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
+++ b/apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
@@ -10,6 +10,7 @@ import { match } from 'ts-pattern';
 
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { useSession } from '@documenso/lib/client-only/providers/session';
 import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT, IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';
@@ -21,7 +22,7 @@ import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 export interface DocumentDropZoneWrapperProps {
   children: ReactNode;
@@ -34,10 +35,11 @@ export const DocumentDropZoneWrapper = ({ children, className }: DocumentDropZon
   const { user } = useSession();
   const { folderId } = useParams();
 
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const navigate = useNavigate();
   const analytics = useAnalytics();
+  const organisation = useCurrentOrganisation();
 
   const [isLoading, setIsLoading] = useState(false);
 
@@ -53,7 +55,7 @@ export const DocumentDropZoneWrapper = ({ children, className }: DocumentDropZon
 
   const onFileDrop = async (file: File) => {
     if (isUploadDisabled && IS_BILLING_ENABLED()) {
-      await navigate('/settings/billing');
+      await navigate(`/o/${organisation.url}/settings/billing`);
       return;
     }
 
@@ -83,11 +85,7 @@ export const DocumentDropZoneWrapper = ({ children, className }: DocumentDropZon
         timestamp: new Date().toISOString(),
       });
 
-      await navigate(
-        folderId
-          ? `${formatDocumentsPath(team?.url)}/f/${folderId}/${id}/edit`
-          : `${formatDocumentsPath(team?.url)}/${id}/edit`,
-      );
+      await navigate(`${formatDocumentsPath(team.url)}/${id}/edit`);
     } catch (err) {
       const error = AppError.parseError(err);
 
@@ -156,7 +154,7 @@ export const DocumentDropZoneWrapper = ({ children, className }: DocumentDropZon
 
             {isUploadDisabled && IS_BILLING_ENABLED() && (
               <Link
-                to="/settings/billing"
+                to={`/o/${organisation.url}/settings/billing`}
                 className="mt-4 text-sm text-amber-500 hover:underline dark:text-amber-400"
               >
                 <Trans>Upgrade your plan to upload more documents</Trans>
diff --git a/apps/remix/app/components/general/document/document-edit-form.tsx b/apps/remix/app/components/general/document/document-edit-form.tsx
index 7a0d0c875..5975a59d2 100644
--- a/apps/remix/app/components/general/document/document-edit-form.tsx
+++ b/apps/remix/app/components/general/document/document-edit-form.tsx
@@ -29,13 +29,12 @@ import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
 import { Stepper } from '@documenso/ui/primitives/stepper';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 export type DocumentEditFormProps = {
   className?: string;
   initialDocument: TDocument;
   documentRootPath: string;
-  isDocumentEnterprise: boolean;
 };
 
 type EditDocumentStep = 'settings' | 'signers' | 'fields' | 'subject';
@@ -45,7 +44,6 @@ export const DocumentEditForm = ({
   className,
   initialDocument,
   documentRootPath,
-  isDocumentEnterprise,
 }: DocumentEditFormProps) => {
   const { toast } = useToast();
   const { _ } = useLingui();
@@ -53,7 +51,7 @@ export const DocumentEditForm = ({
   const navigate = useNavigate();
 
   const [searchParams] = useSearchParams();
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const [isDocumentPdfLoaded, setIsDocumentPdfLoaded] = useState(false);
 
@@ -355,10 +353,9 @@ export const DocumentEditForm = ({
               key={recipients.length}
               documentFlow={documentFlow.settings}
               document={document}
-              currentTeamMemberRole={team?.currentTeamMember?.role}
+              currentTeamMemberRole={team.currentTeamRole}
               recipients={recipients}
               fields={fields}
-              isDocumentEnterprise={isDocumentEnterprise}
               isDocumentPdfLoaded={isDocumentPdfLoaded}
               onSubmit={onAddSettingsFormSubmit}
             />
@@ -370,7 +367,6 @@ export const DocumentEditForm = ({
               signingOrder={document.documentMeta?.signingOrder}
               allowDictateNextSigner={document.documentMeta?.allowDictateNextSigner}
               fields={fields}
-              isDocumentEnterprise={isDocumentEnterprise}
               onSubmit={onAddSignersFormSubmit}
               isDocumentPdfLoaded={isDocumentPdfLoaded}
             />
@@ -382,7 +378,7 @@ export const DocumentEditForm = ({
               fields={fields}
               onSubmit={onAddFieldsFormSubmit}
               isDocumentPdfLoaded={isDocumentPdfLoaded}
-              teamId={team?.id}
+              teamId={team.id}
             />
 
             <AddSubjectFormPartial
diff --git a/apps/remix/app/components/general/document/document-page-view-button.tsx b/apps/remix/app/components/general/document/document-page-view-button.tsx
index 64b12bb67..55f6d85c2 100644
--- a/apps/remix/app/components/general/document/document-page-view-button.tsx
+++ b/apps/remix/app/components/general/document/document-page-view-button.tsx
@@ -19,7 +19,7 @@ export type DocumentPageViewButtonProps = {
   document: Document & {
     user: Pick<User, 'id' | 'name' | 'email'>;
     recipients: Recipient[];
-    team: Pick<Team, 'id' | 'url'> | null;
+    team: Pick<Team, 'id' | 'url'>;
   };
 };
 
@@ -37,10 +37,8 @@ export const DocumentPageViewButton = ({ document }: DocumentPageViewButtonProps
   const isSigned = recipient?.signingStatus === SigningStatus.SIGNED;
   const role = recipient?.role;
 
-  const documentsPath = formatDocumentsPath(document.team?.url);
-  const formatPath = document.folderId
-    ? `${documentsPath}/f/${document.folderId}/${document.id}/edit`
-    : `${documentsPath}/${document.id}/edit`;
+  const documentsPath = formatDocumentsPath(document.team.url);
+  const formatPath = `${documentsPath}/${document.id}/edit`;
 
   const onDownloadClick = async () => {
     try {
diff --git a/apps/remix/app/components/general/document/document-page-view-dropdown.tsx b/apps/remix/app/components/general/document/document-page-view-dropdown.tsx
index bb2164f52..a57a849dd 100644
--- a/apps/remix/app/components/general/document/document-page-view-dropdown.tsx
+++ b/apps/remix/app/components/general/document/document-page-view-dropdown.tsx
@@ -36,7 +36,7 @@ import { DocumentDeleteDialog } from '~/components/dialogs/document-delete-dialo
 import { DocumentDuplicateDialog } from '~/components/dialogs/document-duplicate-dialog';
 import { DocumentResendDialog } from '~/components/dialogs/document-resend-dialog';
 import { DocumentRecipientLinkCopyDialog } from '~/components/general/document/document-recipient-link-copy-dialog';
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 export type DocumentPageViewDropdownProps = {
   document: Document & {
@@ -52,7 +52,7 @@ export const DocumentPageViewDropdown = ({ document }: DocumentPageViewDropdownP
   const { _ } = useLingui();
 
   const navigate = useNavigate();
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const [isDeleteDialogOpen, setDeleteDialogOpen] = useState(false);
   const [isDuplicateDialogOpen, setDuplicateDialogOpen] = useState(false);
@@ -67,7 +67,7 @@ export const DocumentPageViewDropdown = ({ document }: DocumentPageViewDropdownP
   const isCurrentTeamDocument = team && document.team?.url === team.url;
   const canManageDocument = Boolean(isOwner || isCurrentTeamDocument);
 
-  const documentsPath = formatDocumentsPath(team?.url);
+  const documentsPath = formatDocumentsPath(team.url);
 
   const onDownloadClick = async () => {
     try {
diff --git a/apps/remix/app/components/general/document/document-upload.tsx b/apps/remix/app/components/general/document/document-upload.tsx
index 66a04b014..c19929b66 100644
--- a/apps/remix/app/components/general/document/document-upload.tsx
+++ b/apps/remix/app/components/general/document/document-upload.tsx
@@ -3,12 +3,12 @@ import { useMemo, useState } from 'react';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import { Loader } from 'lucide-react';
 import { useNavigate, useParams } from 'react-router';
 import { match } from 'ts-pattern';
 
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { useSession } from '@documenso/lib/client-only/providers/session';
 import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT } from '@documenso/lib/constants/app';
 import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';
@@ -26,7 +26,7 @@ import {
 } from '@documenso/ui/primitives/tooltip';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 export type DocumentUploadDropzoneProps = {
   className?: string;
@@ -38,10 +38,11 @@ export const DocumentUploadDropzone = ({ className }: DocumentUploadDropzoneProp
   const { user } = useSession();
   const { folderId } = useParams();
 
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const navigate = useNavigate();
   const analytics = useAnalytics();
+  const organisation = useCurrentOrganisation();
 
   const userTimezone =
     TIME_ZONES.find((timezone) => timezone === Intl.DateTimeFormat().resolvedOptions().timeZone) ??
@@ -54,10 +55,12 @@ export const DocumentUploadDropzone = ({ className }: DocumentUploadDropzoneProp
   const { mutateAsync: createDocument } = trpc.document.createDocument.useMutation();
 
   const disabledMessage = useMemo(() => {
+    if (organisation.subscription && remaining.documents === 0) {
+      return msg`Document upload disabled due to unpaid invoices`;
+    }
+
     if (remaining.documents === 0) {
-      return team
-        ? msg`Document upload disabled due to unpaid invoices`
-        : msg`You have reached your document limit.`;
+      return msg`You have reached your document limit.`;
     }
 
     if (!user.emailVerified) {
@@ -81,6 +84,8 @@ export const DocumentUploadDropzone = ({ className }: DocumentUploadDropzoneProp
 
       void refreshLimits();
 
+      await navigate(`${formatDocumentsPath(team.url)}/${id}/edit`);
+
       toast({
         title: _(msg`Document uploaded`),
         description: _(msg`Your document has been uploaded successfully.`),
@@ -92,12 +97,6 @@ export const DocumentUploadDropzone = ({ className }: DocumentUploadDropzoneProp
         documentId: id,
         timestamp: new Date().toISOString(),
       });
-
-      await navigate(
-        folderId
-          ? `${formatDocumentsPath(team?.url)}/f/${folderId}/${id}/edit`
-          : `${formatDocumentsPath(team?.url)}/${id}/edit`,
-      );
     } catch (err) {
       const error = AppError.parseError(err);
 
@@ -138,6 +137,7 @@ export const DocumentUploadDropzone = ({ className }: DocumentUploadDropzoneProp
           <TooltipTrigger asChild>
             <div>
               <DocumentDropzone
+                loading={isLoading}
                 disabled={remaining.documents === 0 || !user.emailVerified}
                 disabledMessage={disabledMessage}
                 onDrop={onFileDrop}
@@ -145,6 +145,7 @@ export const DocumentUploadDropzone = ({ className }: DocumentUploadDropzoneProp
               />
             </div>
           </TooltipTrigger>
+
           {team?.id === undefined &&
             remaining.documents > 0 &&
             Number.isFinite(remaining.documents) && (
@@ -158,12 +159,6 @@ export const DocumentUploadDropzone = ({ className }: DocumentUploadDropzoneProp
             )}
         </Tooltip>
       </TooltipProvider>
-
-      {isLoading && (
-        <div className="bg-background/50 absolute inset-0 flex items-center justify-center rounded-lg">
-          <Loader className="text-muted-foreground h-12 w-12 animate-spin" />
-        </div>
-      )}
     </div>
   );
 };
diff --git a/apps/remix/app/components/general/generic-error-layout.tsx b/apps/remix/app/components/general/generic-error-layout.tsx
index 77b1eb04f..6a6263bd6 100644
--- a/apps/remix/app/components/general/generic-error-layout.tsx
+++ b/apps/remix/app/components/general/generic-error-layout.tsx
@@ -7,11 +7,8 @@ import { ChevronLeft } from 'lucide-react';
 import { Link, useNavigate } from 'react-router';
 
 import backgroundPattern from '@documenso/assets/images/background-pattern.png';
-import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import { Button } from '@documenso/ui/primitives/button';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
-
 type ErrorCodeMap = Record<
   number,
   { subHeading: MessageDescriptor; heading: MessageDescriptor; message: MessageDescriptor }
@@ -22,7 +19,7 @@ export type GenericErrorLayoutProps = {
   errorCode?: number;
   errorCodeMap?: ErrorCodeMap;
   /**
-   * The primary button to display. If left as undefined, the default /documents link will be displayed.
+   * The primary button to display. If left as undefined, the default home link will be displayed.
    *
    * Set to null if you want no button.
    */
@@ -59,8 +56,6 @@ export const GenericErrorLayout = ({
   const navigate = useNavigate();
   const { _ } = useLingui();
 
-  const team = useOptionalCurrentTeam();
-
   const { subHeading, heading, message } =
     errorCodeMap[errorCode || 500] ?? defaultErrorCodeMap[500];
 
@@ -110,8 +105,8 @@ export const GenericErrorLayout = ({
             {primaryButton ||
               (primaryButton !== null && (
                 <Button asChild>
-                  <Link to={formatDocumentsPath(team?.url)}>
-                    <Trans>Documents</Trans>
+                  <Link to={'/'}>
+                    <Trans>Home</Trans>
                   </Link>
                 </Button>
               ))}
diff --git a/apps/remix/app/components/general/menu-switcher.tsx b/apps/remix/app/components/general/menu-switcher.tsx
index c8ae7d719..726a970eb 100644
--- a/apps/remix/app/components/general/menu-switcher.tsx
+++ b/apps/remix/app/components/general/menu-switcher.tsx
@@ -3,19 +3,14 @@ import { useState } from 'react';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import { motion } from 'framer-motion';
-import { CheckCircle2, ChevronsUpDown, Plus, Settings2 } from 'lucide-react';
-import { Link, useLocation } from 'react-router';
+import { ChevronsUpDown, Plus } from 'lucide-react';
+import { Link } from 'react-router';
 
 import { authClient } from '@documenso/auth/client';
-import type { SessionUser } from '@documenso/auth/server/lib/session/session';
-import { TEAM_MEMBER_ROLE_MAP, TEAM_URL_REGEX } from '@documenso/lib/constants/teams';
-import type { TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import { useSession } from '@documenso/lib/client-only/providers/session';
 import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
 import { isAdmin } from '@documenso/lib/utils/is-admin';
 import { extractInitials } from '@documenso/lib/utils/recipient-formatter';
-import { canExecuteTeamAction } from '@documenso/lib/utils/teams';
-import { trpc } from '@documenso/trpc/react';
 import { LanguageSwitcherDialog } from '@documenso/ui/components/common/language-switcher-dialog';
 import { cn } from '@documenso/ui/lib/utils';
 import { AvatarWithText } from '@documenso/ui/primitives/avatar';
@@ -24,79 +19,27 @@ import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
-  DropdownMenuLabel,
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from '@documenso/ui/primitives/dropdown-menu';
 
-const MotionLink = motion(Link);
-
-export type MenuSwitcherProps = {
-  user: SessionUser;
-  teams: TGetTeamsResponse;
-};
-
-export const MenuSwitcher = ({ user, teams: initialTeamsData }: MenuSwitcherProps) => {
+export const MenuSwitcher = () => {
   const { _ } = useLingui();
 
-  const { pathname } = useLocation();
+  const { user } = useSession();
 
   const [languageSwitcherOpen, setLanguageSwitcherOpen] = useState(false);
 
   const isUserAdmin = isAdmin(user);
 
-  const { data: teamsQueryResult } = trpc.team.getTeams.useQuery(undefined, {
-    initialData: initialTeamsData,
-  });
-
-  const teams = teamsQueryResult && teamsQueryResult.length > 0 ? teamsQueryResult : null;
-
-  const isPathTeamUrl = (teamUrl: string) => {
-    if (!pathname || !pathname.startsWith(`/t/`)) {
-      return false;
-    }
-
-    return pathname.split('/')[2] === teamUrl;
-  };
-
-  const selectedTeam = teams?.find((team) => isPathTeamUrl(team.url));
-
-  const formatAvatarFallback = (teamName?: string) => {
-    if (teamName !== undefined) {
-      return teamName.slice(0, 1).toUpperCase();
+  const formatAvatarFallback = (name?: string) => {
+    if (name !== undefined) {
+      return name.slice(0, 1).toUpperCase();
     }
 
     return user.name ? extractInitials(user.name) : user.email.slice(0, 1).toUpperCase();
   };
 
-  const formatSecondaryAvatarText = (team?: typeof selectedTeam) => {
-    if (!team) {
-      return _(msg`Personal Account`);
-    }
-
-    if (team.ownerUserId === user.id) {
-      return _(msg`Owner`);
-    }
-
-    return _(TEAM_MEMBER_ROLE_MAP[team.currentTeamMember.role]);
-  };
-
-  /**
-   * Formats the redirect URL so we can switch between documents and templates page
-   * seemlessly between teams and personal accounts.
-   */
-  const formatRedirectUrlOnSwitch = (teamUrl?: string) => {
-    const baseUrl = teamUrl ? `/t/${teamUrl}` : '';
-
-    const currentPathname = (pathname ?? '/').replace(TEAM_URL_REGEX, '');
-
-    if (currentPathname === '/templates') {
-      return `${baseUrl}/templates`;
-    }
-
-    return baseUrl;
-  };
-
   return (
     <DropdownMenu>
       <DropdownMenuTrigger asChild>
@@ -106,12 +49,10 @@ export const MenuSwitcher = ({ user, teams: initialTeamsData }: MenuSwitcherProp
           className="relative flex h-12 flex-row items-center px-0 py-2 ring-0 focus:outline-none focus-visible:border-0 focus-visible:ring-0 focus-visible:ring-transparent md:px-2"
         >
           <AvatarWithText
-            avatarSrc={formatAvatarUrl(
-              selectedTeam ? selectedTeam.avatarImageId : user.avatarImageId,
-            )}
-            avatarFallback={formatAvatarFallback(selectedTeam?.name)}
-            primaryText={selectedTeam ? selectedTeam.name : user.name}
-            secondaryText={formatSecondaryAvatarText(selectedTeam)}
+            avatarSrc={formatAvatarUrl(user.avatarImageId)}
+            avatarFallback={formatAvatarFallback(user.name || user.email)}
+            primaryText={user.name}
+            secondaryText={_(msg`Personal Account`)}
             rightSideComponent={
               <ChevronsUpDown className="text-muted-foreground ml-auto h-4 w-4" />
             }
@@ -121,128 +62,19 @@ export const MenuSwitcher = ({ user, teams: initialTeamsData }: MenuSwitcherProp
       </DropdownMenuTrigger>
 
       <DropdownMenuContent
-        className={cn('z-[60] ml-6 w-full md:ml-0', teams ? 'min-w-[20rem]' : 'min-w-[12rem]')}
+        className={cn('z-[60] ml-6 w-full min-w-[12rem] md:ml-0')}
         align="end"
         forceMount
       >
-        {teams ? (
-          <>
-            <DropdownMenuLabel>
-              <Trans>Personal</Trans>
-            </DropdownMenuLabel>
-
-            <DropdownMenuItem asChild>
-              <Link to={formatRedirectUrlOnSwitch()}>
-                <AvatarWithText
-                  avatarSrc={formatAvatarUrl(user.avatarImageId)}
-                  avatarFallback={formatAvatarFallback()}
-                  primaryText={user.name}
-                  secondaryText={formatSecondaryAvatarText()}
-                  rightSideComponent={
-                    !pathname?.startsWith(`/t/`) && (
-                      <CheckCircle2 className="ml-auto fill-black text-white dark:fill-white dark:text-black" />
-                    )
-                  }
-                />
-              </Link>
-            </DropdownMenuItem>
-
-            <DropdownMenuSeparator className="mt-2" />
-
-            <DropdownMenuLabel>
-              <div className="flex flex-row items-center justify-between">
-                <p>
-                  <Trans>Teams</Trans>
-                </p>
-
-                <div className="flex flex-row space-x-2">
-                  <DropdownMenuItem asChild>
-                    <Button
-                      title={_(msg`Manage teams`)}
-                      variant="ghost"
-                      className="text-muted-foreground flex h-5 w-5 items-center justify-center p-0"
-                      asChild
-                    >
-                      <Link to="/settings/teams">
-                        <Settings2 className="h-4 w-4" />
-                      </Link>
-                    </Button>
-                  </DropdownMenuItem>
-
-                  <DropdownMenuItem asChild>
-                    <Button
-                      title={_(msg`Create team`)}
-                      variant="ghost"
-                      className="text-muted-foreground flex h-5 w-5 items-center justify-center p-0"
-                      asChild
-                    >
-                      <Link to="/settings/teams?action=add-team">
-                        <Plus className="h-4 w-4" />
-                      </Link>
-                    </Button>
-                  </DropdownMenuItem>
-                </div>
-              </div>
-            </DropdownMenuLabel>
-
-            <div className="custom-scrollbar max-h-[40vh] overflow-auto">
-              {teams.map((team) => (
-                <DropdownMenuItem asChild key={team.id}>
-                  <MotionLink
-                    initial="initial"
-                    animate="initial"
-                    whileHover="animate"
-                    to={formatRedirectUrlOnSwitch(team.url)}
-                  >
-                    <AvatarWithText
-                      avatarSrc={formatAvatarUrl(team.avatarImageId)}
-                      avatarFallback={formatAvatarFallback(team.name)}
-                      primaryText={team.name}
-                      textSectionClassName="w-[200px]"
-                      secondaryText={
-                        <div className="relative w-full">
-                          <motion.span
-                            className="overflow-hidden"
-                            variants={{
-                              initial: { opacity: 1, translateY: 0 },
-                              animate: { opacity: 0, translateY: '100%' },
-                            }}
-                          >
-                            {formatSecondaryAvatarText(team)}
-                          </motion.span>
-
-                          <motion.span
-                            className="absolute inset-0"
-                            variants={{
-                              initial: { opacity: 0, translateY: '100%' },
-                              animate: { opacity: 1, translateY: 0 },
-                            }}
-                          >{`/t/${team.url}`}</motion.span>
-                        </div>
-                      }
-                      rightSideComponent={
-                        isPathTeamUrl(team.url) && (
-                          <CheckCircle2 className="ml-auto fill-black text-white dark:fill-white dark:text-black" />
-                        )
-                      }
-                    />
-                  </MotionLink>
-                </DropdownMenuItem>
-              ))}
-            </div>
-          </>
-        ) : (
-          <DropdownMenuItem className="text-muted-foreground px-4 py-2" asChild>
-            <Link
-              to="/settings/teams?action=add-team"
-              className="flex items-center justify-between"
-            >
-              <Trans>Create team</Trans>
-              <Plus className="ml-2 h-4 w-4" />
-            </Link>
-          </DropdownMenuItem>
-        )}
-
+        <DropdownMenuItem className="text-muted-foreground px-4 py-2" asChild>
+          <Link
+            to="/settings/organisations?action=add-organisation"
+            className="flex items-center justify-between"
+          >
+            <Trans>Create Organisation</Trans>
+            <Plus className="ml-2 h-4 w-4" />
+          </Link>
+        </DropdownMenuItem>
         <DropdownMenuSeparator />
 
         {isUserAdmin && (
@@ -253,21 +85,18 @@ export const MenuSwitcher = ({ user, teams: initialTeamsData }: MenuSwitcherProp
           </DropdownMenuItem>
         )}
 
+        <DropdownMenuItem className="text-muted-foreground px-4 py-2" asChild>
+          <Link to="/inbox">
+            <Trans>Personal Inbox</Trans>
+          </Link>
+        </DropdownMenuItem>
+
         <DropdownMenuItem className="text-muted-foreground px-4 py-2" asChild>
           <Link to="/settings/profile">
             <Trans>User settings</Trans>
           </Link>
         </DropdownMenuItem>
 
-        {selectedTeam &&
-          canExecuteTeamAction('MANAGE_TEAM', selectedTeam.currentTeamMember.role) && (
-            <DropdownMenuItem className="text-muted-foreground px-4 py-2" asChild>
-              <Link to={`/t/${selectedTeam.url}/settings`}>
-                <Trans>Team settings</Trans>
-              </Link>
-            </DropdownMenuItem>
-          )}
-
         <DropdownMenuItem
           className="text-muted-foreground px-4 py-2"
           onClick={() => setLanguageSwitcherOpen(true)}
diff --git a/apps/remix/app/components/general/org-menu-switcher.tsx b/apps/remix/app/components/general/org-menu-switcher.tsx
new file mode 100644
index 000000000..5ba8dcea4
--- /dev/null
+++ b/apps/remix/app/components/general/org-menu-switcher.tsx
@@ -0,0 +1,338 @@
+import { useMemo, useState } from 'react';
+
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import {
+  Building2Icon,
+  ChevronsUpDown,
+  Plus,
+  Settings2Icon,
+  SettingsIcon,
+  UsersIcon,
+} from 'lucide-react';
+import { Link, useLocation } from 'react-router';
+
+import { authClient } from '@documenso/auth/client';
+import { useOptionalCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { EXTENDED_ORGANISATION_MEMBER_ROLE_MAP } from '@documenso/lib/constants/organisations-translations';
+import { EXTENDED_TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams-translations';
+import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
+import { isAdmin } from '@documenso/lib/utils/is-admin';
+import { canExecuteOrganisationAction } from '@documenso/lib/utils/organisations';
+import { extractInitials } from '@documenso/lib/utils/recipient-formatter';
+import { canExecuteTeamAction } from '@documenso/lib/utils/teams';
+import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';
+import { LanguageSwitcherDialog } from '@documenso/ui/components/common/language-switcher-dialog';
+import { cn } from '@documenso/ui/lib/utils';
+import { AvatarWithText } from '@documenso/ui/primitives/avatar';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@documenso/ui/primitives/dropdown-menu';
+
+import { useOptionalCurrentTeam } from '~/providers/team';
+
+export const OrgMenuSwitcher = () => {
+  const { _ } = useLingui();
+
+  const { user, organisations } = useSession();
+
+  const { pathname } = useLocation();
+
+  const [isOpen, setIsOpen] = useState(false);
+  const [languageSwitcherOpen, setLanguageSwitcherOpen] = useState(false);
+  const [hoveredOrgId, setHoveredOrgId] = useState<string | null>(null);
+
+  const isUserAdmin = isAdmin(user);
+
+  const isPathOrgUrl = (orgUrl: string) => {
+    if (!pathname || !pathname.startsWith(`/o/`)) {
+      return false;
+    }
+
+    return pathname.split('/')[2] === orgUrl;
+  };
+
+  const selectedOrg = organisations.find((org) => isPathOrgUrl(org.url));
+  const hoveredOrg = organisations.find(
+    (org) => org.id === hoveredOrgId || organisations.length === 1,
+  );
+
+  const currentOrganisation = useOptionalCurrentOrganisation();
+  const currentTeam = useOptionalCurrentTeam();
+
+  // Use hovered org for teams display if available,
+  // otherwise use current team's org if in a team,
+  // finally fallback to selected org
+  const displayedOrg = hoveredOrg || currentOrganisation || selectedOrg;
+
+  const formatAvatarFallback = (name?: string) => {
+    if (name !== undefined) {
+      return name.slice(0, 1).toUpperCase();
+    }
+
+    return user.name ? extractInitials(user.name) : user.email.slice(0, 1).toUpperCase();
+  };
+
+  const dropdownMenuAvatarText = useMemo(() => {
+    if (currentTeam) {
+      return {
+        avatarSrc: formatAvatarUrl(currentTeam.avatarImageId),
+        avatarFallback: formatAvatarFallback(currentTeam.name),
+        primaryText: currentTeam.name,
+        secondaryText: _(EXTENDED_TEAM_MEMBER_ROLE_MAP[currentTeam.currentTeamRole]),
+      };
+    }
+
+    if (currentOrganisation) {
+      return {
+        avatarSrc: formatAvatarUrl(currentOrganisation.avatarImageId),
+        avatarFallback: formatAvatarFallback(currentOrganisation.name),
+        primaryText: currentOrganisation.name,
+        secondaryText: _(
+          EXTENDED_ORGANISATION_MEMBER_ROLE_MAP[currentOrganisation.currentOrganisationRole],
+        ),
+      };
+    }
+
+    return {
+      avatarSrc: formatAvatarUrl(user.avatarImageId),
+      avatarFallback: formatAvatarFallback(user.name ?? user.email),
+      primaryText: user.name,
+      secondaryText: _(msg`Personal Account`),
+    };
+  }, [currentTeam, currentOrganisation, user]);
+
+  const handleOpenChange = (open: boolean) => {
+    if (open) {
+      setHoveredOrgId(currentOrganisation?.id || null);
+    }
+
+    setIsOpen(open);
+  };
+
+  return (
+    <DropdownMenu open={isOpen} onOpenChange={handleOpenChange}>
+      <DropdownMenuTrigger asChild>
+        <Button
+          data-testid="menu-switcher"
+          variant="none"
+          className="relative flex h-12 flex-row items-center px-0 py-2 ring-0 focus:outline-none focus-visible:border-0 focus-visible:ring-0 focus-visible:ring-transparent md:px-2"
+        >
+          <AvatarWithText
+            avatarSrc={dropdownMenuAvatarText.avatarSrc}
+            avatarFallback={dropdownMenuAvatarText.avatarFallback}
+            primaryText={dropdownMenuAvatarText.primaryText}
+            secondaryText={dropdownMenuAvatarText.secondaryText}
+            rightSideComponent={
+              <ChevronsUpDown className="text-muted-foreground ml-auto h-4 w-4" />
+            }
+            textSectionClassName="hidden lg:flex"
+          />
+        </Button>
+      </DropdownMenuTrigger>
+
+      <DropdownMenuContent
+        className={cn(
+          'divide-border z-[60] ml-6 flex w-full divide-x p-0 md:ml-0 md:min-w-[40rem]',
+        )}
+        align="end"
+        forceMount
+      >
+        <div className="flex h-[400px] w-full divide-x">
+          {/* Organisations column */}
+          <div className="flex w-full flex-col md:w-1/3">
+            <div className="flex h-12 items-center border-b p-2">
+              <h3 className="text-muted-foreground flex items-center px-2 text-sm font-medium">
+                <Building2Icon className="mr-2 h-3.5 w-3.5" />
+                <Trans>Organisations</Trans>
+              </h3>
+            </div>
+            <div className="flex-1 space-y-1 overflow-y-auto p-1.5">
+              {organisations.map((org) => (
+                <div
+                  className="group relative"
+                  key={org.id}
+                  onMouseEnter={() => setHoveredOrgId(org.id)}
+                >
+                  <DropdownMenuItem
+                    className={cn(
+                      'text-muted-foreground w-full px-4 py-2',
+                      org.id === currentOrganisation?.id && !hoveredOrgId && 'bg-accent',
+                      org.id === hoveredOrgId && 'bg-accent',
+                    )}
+                    asChild
+                  >
+                    <Link to={`/o/${org.url}`} className="flex items-center space-x-2 pr-8">
+                      <span
+                        className={cn('min-w-0 flex-1 truncate', {
+                          'font-semibold': org.id === selectedOrg?.id,
+                        })}
+                      >
+                        {org.name}
+                      </span>
+                    </Link>
+                  </DropdownMenuItem>
+
+                  {canExecuteOrganisationAction(
+                    'MANAGE_ORGANISATION',
+                    org.currentOrganisationRole,
+                  ) && (
+                    <div className="absolute bottom-0 right-0 top-0 flex items-center justify-center">
+                      <Link
+                        to={`/o/${org.url}/settings`}
+                        className="text-muted-foreground mr-2 rounded-sm border p-1 transition-opacity duration-200 group-hover:opacity-100 md:opacity-0"
+                      >
+                        <Settings2Icon className="h-3.5 w-3.5" />
+                      </Link>
+                    </div>
+                  )}
+                </div>
+              ))}
+
+              <Button variant="ghost" className="w-full justify-start" asChild>
+                <Link to="/settings/organisations?action=add-organisation">
+                  <Plus className="mr-2 h-4 w-4" />
+                  <Trans>Create Organisation</Trans>
+                </Link>
+              </Button>
+            </div>
+          </div>
+
+          {/* Teams column */}
+          <div className="hidden w-1/3 flex-col md:flex">
+            <div className="flex h-12 items-center border-b p-2">
+              <h3 className="text-muted-foreground flex items-center px-2 text-sm font-medium">
+                <UsersIcon className="mr-2 h-3.5 w-3.5" />
+                <Trans>Teams</Trans>
+              </h3>
+            </div>
+            <div className="flex-1 space-y-1 overflow-y-auto p-1.5">
+              <AnimateGenericFadeInOut key={displayedOrg ? 'displayed-org' : 'no-org'}>
+                {hoveredOrg ? (
+                  hoveredOrg.teams.map((team) => (
+                    <div className="group relative" key={team.id}>
+                      <DropdownMenuItem
+                        className={cn(
+                          'text-muted-foreground w-full px-4 py-2',
+                          team.id === currentTeam?.id && 'bg-accent',
+                        )}
+                        asChild
+                      >
+                        <Link to={`/t/${team.url}`} className="flex items-center space-x-2 pr-8">
+                          <span
+                            className={cn('min-w-0 flex-1 truncate', {
+                              'font-semibold': team.id === currentTeam?.id,
+                            })}
+                          >
+                            {team.name}
+                          </span>
+                        </Link>
+                      </DropdownMenuItem>
+
+                      {canExecuteTeamAction('MANAGE_TEAM', team.currentTeamRole) && (
+                        <div className="absolute bottom-0 right-0 top-0 flex items-center justify-center">
+                          <Link
+                            to={`/t/${team.url}/settings`}
+                            className="text-muted-foreground mr-2 rounded-sm border p-1 opacity-0 transition-opacity duration-200 group-hover:opacity-100"
+                          >
+                            <Settings2Icon className="h-3.5 w-3.5" />
+                          </Link>
+                        </div>
+                      )}
+                    </div>
+                  ))
+                ) : (
+                  <div className="text-muted-foreground my-12 flex items-center justify-center px-2 text-center text-sm">
+                    <Trans>Select an organisation to view teams</Trans>
+                  </div>
+                )}
+
+                {displayedOrg && (
+                  <Button variant="ghost" className="w-full justify-start" asChild>
+                    <Link to={`/o/${displayedOrg.url}/settings/teams?action=add-team`}>
+                      <Plus className="mr-2 h-4 w-4" />
+                      <Trans>Create Team</Trans>
+                    </Link>
+                  </Button>
+                )}
+              </AnimateGenericFadeInOut>
+            </div>
+          </div>
+
+          {/* Settings column */}
+          <div className="hidden w-1/3 flex-col md:flex">
+            <div className="flex h-12 items-center border-b p-2">
+              <h3 className="text-muted-foreground flex items-center px-2 text-sm font-medium">
+                <SettingsIcon className="mr-2 h-3.5 w-3.5" />
+                <Trans>Settings</Trans>
+              </h3>
+            </div>
+            <div className="flex-1 overflow-y-auto p-1.5">
+              {isUserAdmin && (
+                <DropdownMenuItem className="text-muted-foreground px-4 py-2" asChild>
+                  <Link to="/admin">
+                    <Trans>Admin panel</Trans>
+                  </Link>
+                </DropdownMenuItem>
+              )}
+
+              <DropdownMenuItem className="text-muted-foreground px-4 py-2" asChild>
+                <Link to="/inbox">
+                  <Trans>Personal Inbox</Trans>
+                </Link>
+              </DropdownMenuItem>
+
+              <DropdownMenuItem className="text-muted-foreground px-4 py-2" asChild>
+                <Link to="/settings/profile">
+                  <Trans>Account</Trans>
+                </Link>
+              </DropdownMenuItem>
+
+              {currentOrganisation &&
+                canExecuteOrganisationAction(
+                  'MANAGE_ORGANISATION',
+                  currentOrganisation.currentOrganisationRole,
+                ) && (
+                  <DropdownMenuItem className="text-muted-foreground px-4 py-2" asChild>
+                    <Link to={`/o/${currentOrganisation.url}/settings`}>
+                      <Trans>Organisation settings</Trans>
+                    </Link>
+                  </DropdownMenuItem>
+                )}
+
+              {currentTeam && canExecuteTeamAction('MANAGE_TEAM', currentTeam.currentTeamRole) && (
+                <DropdownMenuItem className="text-muted-foreground px-4 py-2" asChild>
+                  <Link to={`/t/${currentTeam.url}/settings`}>
+                    <Trans>Team settings</Trans>
+                  </Link>
+                </DropdownMenuItem>
+              )}
+
+              <DropdownMenuItem
+                className="text-muted-foreground px-4 py-2"
+                onClick={() => setLanguageSwitcherOpen(true)}
+              >
+                <Trans>Language</Trans>
+              </DropdownMenuItem>
+
+              <DropdownMenuItem
+                className="text-muted-foreground hover:!text-muted-foreground px-4 py-2"
+                onSelect={async () => authClient.signOut()}
+              >
+                <Trans>Sign Out</Trans>
+              </DropdownMenuItem>
+            </div>
+          </div>
+        </div>
+      </DropdownMenuContent>
+
+      <LanguageSwitcherDialog open={languageSwitcherOpen} setOpen={setLanguageSwitcherOpen} />
+    </DropdownMenu>
+  );
+};
diff --git a/apps/remix/app/components/general/teams/team-layout-billing-banner.tsx b/apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
similarity index 74%
rename from apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
rename to apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
index 68f013fac..e2fb7374c 100644
--- a/apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+++ b/apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
@@ -3,12 +3,12 @@ import { useState } from 'react';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import type { TeamMemberRole } from '@prisma/client';
 import { SubscriptionStatus } from '@prisma/client';
 import { AlertTriangle } from 'lucide-react';
 import { match } from 'ts-pattern';
 
-import { canExecuteTeamAction } from '@documenso/lib/utils/teams';
+import { useOptionalCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { canExecuteOrganisationAction } from '@documenso/lib/utils/organisations';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@@ -21,30 +21,22 @@ import {
 } from '@documenso/ui/primitives/dialog';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-export type TeamLayoutBillingBannerProps = {
-  subscriptionStatus: SubscriptionStatus;
-  teamId: number;
-  userRole: TeamMemberRole;
-};
-
-export const TeamLayoutBillingBanner = ({
-  subscriptionStatus,
-  teamId,
-  userRole,
-}: TeamLayoutBillingBannerProps) => {
+export const OrganisationBillingBanner = () => {
   const { _ } = useLingui();
   const { toast } = useToast();
 
   const [isOpen, setIsOpen] = useState(false);
 
-  const { mutateAsync: createBillingPortal, isPending } =
-    trpc.team.createBillingPortal.useMutation();
+  const organisation = useOptionalCurrentOrganisation();
 
-  const handleCreatePortal = async () => {
+  const { mutateAsync: manageSubscription, isPending } =
+    trpc.billing.subscription.manage.useMutation();
+
+  const handleCreatePortal = async (organisationId: string) => {
     try {
-      const sessionUrl = await createBillingPortal({ teamId });
+      const { redirectUrl } = await manageSubscription({ organisationId });
 
-      window.open(sessionUrl, '_blank');
+      window.open(redirectUrl, '_blank');
 
       setIsOpen(false);
     } catch (err) {
@@ -59,7 +51,13 @@ export const TeamLayoutBillingBanner = ({
     }
   };
 
-  if (subscriptionStatus === SubscriptionStatus.ACTIVE) {
+  const subscriptionStatus = organisation?.subscription?.status;
+
+  if (
+    !organisation ||
+    subscriptionStatus === undefined ||
+    subscriptionStatus === SubscriptionStatus.ACTIVE
+  ) {
     return null;
   }
 
@@ -79,14 +77,14 @@ export const TeamLayoutBillingBanner = ({
 
             {match(subscriptionStatus)
               .with(SubscriptionStatus.PAST_DUE, () => <Trans>Payment overdue</Trans>)
-              .with(SubscriptionStatus.INACTIVE, () => <Trans>Teams restricted</Trans>)
+              .with(SubscriptionStatus.INACTIVE, () => <Trans>Restricted Access</Trans>)
               .exhaustive()}
           </div>
 
           <Button
-            variant="ghost"
+            variant="outline"
             className={cn({
-              'text-yellow-900 hover:bg-yellow-100 hover:text-yellow-900 dark:hover:bg-yellow-500':
+              'text-yellow-900 hover:bg-yellow-100 dark:hover:bg-yellow-500':
                 subscriptionStatus === SubscriptionStatus.PAST_DUE,
               'text-destructive-foreground hover:bg-destructive-foreground hover:text-white':
                 subscriptionStatus === SubscriptionStatus.INACTIVE,
@@ -125,9 +123,9 @@ export const TeamLayoutBillingBanner = ({
             ))
             .otherwise(() => null)}
 
-          {canExecuteTeamAction('MANAGE_BILLING', userRole) && (
+          {canExecuteOrganisationAction('MANAGE_BILLING', organisation.currentOrganisationRole) && (
             <DialogFooter>
-              <Button loading={isPending} onClick={handleCreatePortal}>
+              <Button loading={isPending} onClick={async () => handleCreatePortal(organisation.id)}>
                 <Trans>Resolve payment</Trans>
               </Button>
             </DialogFooter>
diff --git a/apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx b/apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
new file mode 100644
index 000000000..cda0c4ab4
--- /dev/null
+++ b/apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
@@ -0,0 +1,58 @@
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { canExecuteOrganisationAction } from '@documenso/lib/utils/organisations';
+import { trpc } from '@documenso/trpc/react';
+import { Button } from '@documenso/ui/primitives/button';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+export type OrganisationBillingPortalButtonProps = {
+  buttonProps?: React.ComponentProps<typeof Button>;
+};
+
+export const OrganisationBillingPortalButton = ({
+  buttonProps,
+}: OrganisationBillingPortalButtonProps) => {
+  const organisation = useCurrentOrganisation();
+
+  const { _ } = useLingui();
+  const { toast } = useToast();
+
+  const { mutateAsync: manageSubscription, isPending } =
+    trpc.billing.subscription.manage.useMutation();
+
+  const canManageBilling = canExecuteOrganisationAction(
+    'MANAGE_BILLING',
+    organisation.currentOrganisationRole,
+  );
+
+  const handleCreatePortal = async () => {
+    try {
+      const { redirectUrl } = await manageSubscription({ organisationId: organisation.id });
+
+      window.open(redirectUrl, '_blank');
+    } catch (err) {
+      toast({
+        title: _(msg`Something went wrong`),
+        description: _(
+          msg`We are unable to proceed to the billing portal at this time. Please try again, or contact support.`,
+        ),
+        variant: 'destructive',
+        duration: 10000,
+      });
+    }
+  };
+
+  return (
+    <Button
+      {...buttonProps}
+      onClick={async () => handleCreatePortal()}
+      loading={isPending}
+      disabled={!canManageBilling}
+    >
+      <Trans>Manage billing</Trans>
+    </Button>
+  );
+};
diff --git a/apps/remix/app/components/general/teams/team-invitations.tsx b/apps/remix/app/components/general/organisations/organisation-invitations.tsx
similarity index 59%
rename from apps/remix/app/components/general/teams/team-invitations.tsx
rename to apps/remix/app/components/general/organisations/organisation-invitations.tsx
index 60b4c61c8..16adcc651 100644
--- a/apps/remix/app/components/general/teams/team-invitations.tsx
+++ b/apps/remix/app/components/general/organisations/organisation-invitations.tsx
@@ -1,11 +1,12 @@
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Plural, Trans } from '@lingui/react/macro';
+import { OrganisationMemberInviteStatus } from '@prisma/client';
 import { AnimatePresence } from 'framer-motion';
 import { BellIcon } from 'lucide-react';
 
+import { useSession } from '@documenso/lib/client-only/providers/session';
 import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
-import { formatTeamUrl } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
 import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';
 import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
@@ -21,14 +22,16 @@ import {
 } from '@documenso/ui/primitives/dialog';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-export const TeamInvitations = () => {
-  const { data, isLoading } = trpc.team.getTeamInvitations.useQuery();
+export const OrganisationInvitations = ({ className }: { className?: string }) => {
+  const { data, isLoading } = trpc.organisation.member.invite.getMany.useQuery({
+    status: OrganisationMemberInviteStatus.PENDING,
+  });
 
   return (
     <AnimatePresence>
       {data && data.length > 0 && !isLoading && (
         <AnimateGenericFadeInOut>
-          <Alert variant="secondary">
+          <Alert variant="secondary" className={className}>
             <div className="flex h-full flex-row items-center p-2">
               <BellIcon className="mr-4 h-5 w-5 text-blue-800" />
 
@@ -37,12 +40,12 @@ export const TeamInvitations = () => {
                   value={data.length}
                   one={
                     <span>
-                      You have <strong>1</strong> pending team invitation
+                      You have <strong>1</strong> pending invitation
                     </span>
                   }
                   other={
                     <span>
-                      You have <strong>#</strong> pending team invitations
+                      You have <strong>#</strong> pending invitations
                     </span>
                   }
                 />
@@ -66,12 +69,12 @@ export const TeamInvitations = () => {
                         value={data.length}
                         one={
                           <span>
-                            You have <strong>1</strong> pending team invitation
+                            You have <strong>1</strong> pending invitation
                           </span>
                         }
                         other={
                           <span>
-                            You have <strong>#</strong> pending team invitations
+                            You have <strong>#</strong> pending invitations
                           </span>
                         }
                       />
@@ -80,24 +83,26 @@ export const TeamInvitations = () => {
 
                   <ul className="-mx-6 -mb-6 max-h-[80vh] divide-y overflow-auto px-6 pb-6 xl:max-h-[70vh]">
                     {data.map((invitation) => (
-                      <li key={invitation.teamId}>
-                        <AvatarWithText
-                          avatarSrc={formatAvatarUrl(invitation.team.avatarImageId)}
-                          className="w-full max-w-none py-4"
-                          avatarFallback={invitation.team.name.slice(0, 1)}
-                          primaryText={
-                            <span className="text-foreground/80 font-semibold">
-                              {invitation.team.name}
-                            </span>
-                          }
-                          secondaryText={formatTeamUrl(invitation.team.url)}
-                          rightSideComponent={
-                            <div className="ml-auto space-x-2">
-                              <DeclineTeamInvitationButton teamId={invitation.team.id} />
-                              <AcceptTeamInvitationButton teamId={invitation.team.id} />
-                            </div>
-                          }
-                        />
+                      <li key={invitation.id}>
+                        <Alert variant="neutral" className="p-0 px-4">
+                          <AvatarWithText
+                            avatarSrc={formatAvatarUrl(invitation.organisation.avatarImageId)}
+                            className="w-full max-w-none py-4"
+                            avatarFallback={invitation.organisation.name.slice(0, 1)}
+                            primaryText={
+                              <span className="text-foreground/80 font-semibold">
+                                {invitation.organisation.name}
+                              </span>
+                            }
+                            secondaryText={`/o/${invitation.organisation.url}`}
+                            rightSideComponent={
+                              <div className="ml-auto space-x-2">
+                                <DeclineOrganisationInvitationButton token={invitation.token} />
+                                <AcceptOrganisationInvitationButton token={invitation.token} />
+                              </div>
+                            }
+                          />
+                        </Alert>
                       </li>
                     ))}
                   </ul>
@@ -111,26 +116,29 @@ export const TeamInvitations = () => {
   );
 };
 
-const AcceptTeamInvitationButton = ({ teamId }: { teamId: number }) => {
+const AcceptOrganisationInvitationButton = ({ token }: { token: string }) => {
   const { _ } = useLingui();
   const { toast } = useToast();
+  const { refreshSession } = useSession();
 
   const {
-    mutateAsync: acceptTeamInvitation,
+    mutateAsync: acceptOrganisationInvitation,
     isPending,
     isSuccess,
-  } = trpc.team.acceptTeamInvitation.useMutation({
-    onSuccess: () => {
+  } = trpc.organisation.member.invite.accept.useMutation({
+    onSuccess: async () => {
+      await refreshSession();
+
       toast({
         title: _(msg`Success`),
-        description: _(msg`Accepted team invitation`),
+        description: _(msg`Invitation accepted`),
         duration: 5000,
       });
     },
     onError: () => {
       toast({
         title: _(msg`Something went wrong`),
-        description: _(msg`Unable to join this team at this time.`),
+        description: _(msg`Unable to join this organisation at this time.`),
         variant: 'destructive',
         duration: 10000,
       });
@@ -139,7 +147,7 @@ const AcceptTeamInvitationButton = ({ teamId }: { teamId: number }) => {
 
   return (
     <Button
-      onClick={async () => acceptTeamInvitation({ teamId })}
+      onClick={async () => acceptOrganisationInvitation({ token })}
       loading={isPending}
       disabled={isPending || isSuccess}
     >
@@ -148,26 +156,29 @@ const AcceptTeamInvitationButton = ({ teamId }: { teamId: number }) => {
   );
 };
 
-const DeclineTeamInvitationButton = ({ teamId }: { teamId: number }) => {
+const DeclineOrganisationInvitationButton = ({ token }: { token: string }) => {
   const { _ } = useLingui();
   const { toast } = useToast();
+  const { refreshSession } = useSession();
 
   const {
-    mutateAsync: declineTeamInvitation,
+    mutateAsync: declineOrganisationInvitation,
     isPending,
     isSuccess,
-  } = trpc.team.declineTeamInvitation.useMutation({
-    onSuccess: () => {
+  } = trpc.organisation.member.invite.decline.useMutation({
+    onSuccess: async () => {
+      await refreshSession();
+
       toast({
         title: _(msg`Success`),
-        description: _(msg`Declined team invitation`),
+        description: _(msg`Invitation declined`),
         duration: 5000,
       });
     },
     onError: () => {
       toast({
         title: _(msg`Something went wrong`),
-        description: _(msg`Unable to decline this team invitation at this time.`),
+        description: _(msg`Unable to decline this invitation at this time.`),
         variant: 'destructive',
         duration: 10000,
       });
@@ -176,7 +187,7 @@ const DeclineTeamInvitationButton = ({ teamId }: { teamId: number }) => {
 
   return (
     <Button
-      onClick={async () => declineTeamInvitation({ teamId })}
+      onClick={async () => declineOrganisationInvitation({ token })}
       loading={isPending}
       disabled={isPending || isSuccess}
       variant="ghost"
diff --git a/apps/remix/app/components/general/settings-nav-desktop.tsx b/apps/remix/app/components/general/settings-nav-desktop.tsx
index 704637ff3..7f4100f87 100644
--- a/apps/remix/app/components/general/settings-nav-desktop.tsx
+++ b/apps/remix/app/components/general/settings-nav-desktop.tsx
@@ -1,11 +1,22 @@
 import type { HTMLAttributes } from 'react';
 
 import { Trans } from '@lingui/react/macro';
-import { Braces, CreditCard, Globe2Icon, Lock, User, Users, Webhook } from 'lucide-react';
+import {
+  BracesIcon,
+  CreditCardIcon,
+  Globe2Icon,
+  Lock,
+  Settings2Icon,
+  User,
+  Users,
+  WebhookIcon,
+} from 'lucide-react';
 import { useLocation } from 'react-router';
 import { Link } from 'react-router';
 
+import { useSession } from '@documenso/lib/client-only/providers/session';
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { isPersonalLayout } from '@documenso/lib/utils/organisations';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 
@@ -14,7 +25,9 @@ export type SettingsDesktopNavProps = HTMLAttributes<HTMLDivElement>;
 export const SettingsDesktopNav = ({ className, ...props }: SettingsDesktopNavProps) => {
   const { pathname } = useLocation();
 
-  const isBillingEnabled = IS_BILLING_ENABLED();
+  const { organisations } = useSession();
+
+  const isPersonalLayoutMode = isPersonalLayout(organisations);
 
   return (
     <div className={cn('flex flex-col gap-y-2', className)} {...props}>
@@ -31,29 +44,87 @@ export const SettingsDesktopNav = ({ className, ...props }: SettingsDesktopNavPr
         </Button>
       </Link>
 
-      <Link to="/settings/public-profile">
-        <Button
-          variant="ghost"
-          className={cn(
-            'w-full justify-start',
-            pathname?.startsWith('/settings/public-profile') && 'bg-secondary',
-          )}
-        >
-          <Globe2Icon className="mr-2 h-5 w-5" />
-          <Trans>Public Profile</Trans>
-        </Button>
-      </Link>
+      {isPersonalLayoutMode && (
+        <>
+          <Link to="/settings/preferences">
+            <Button
+              variant="ghost"
+              className={cn(
+                'w-full justify-start',
+                pathname?.startsWith('/settings/preferences') && 'bg-secondary',
+              )}
+            >
+              <Settings2Icon className="mr-2 h-5 w-5" />
+              <Trans>Preferences</Trans>
+            </Button>
+          </Link>
 
-      <Link to="/settings/teams">
+          <Link to="/settings/public-profile">
+            <Button
+              variant="ghost"
+              className={cn(
+                'w-full justify-start',
+                pathname?.startsWith('/settings/public-profile') && 'bg-secondary',
+              )}
+            >
+              <Globe2Icon className="mr-2 h-5 w-5" />
+              <Trans>Public Profile</Trans>
+            </Button>
+          </Link>
+
+          <Link to="/settings/tokens">
+            <Button
+              variant="ghost"
+              className={cn(
+                'w-full justify-start',
+                pathname?.startsWith('/settings/tokens') && 'bg-secondary',
+              )}
+            >
+              <BracesIcon className="mr-2 h-5 w-5" />
+              <Trans>API Tokens</Trans>
+            </Button>
+          </Link>
+
+          <Link to="/settings/webhooks">
+            <Button
+              variant="ghost"
+              className={cn(
+                'w-full justify-start',
+                pathname?.startsWith('/settings/webhooks') && 'bg-secondary',
+              )}
+            >
+              <WebhookIcon className="mr-2 h-5 w-5" />
+              <Trans>Webhooks</Trans>
+            </Button>
+          </Link>
+
+          {IS_BILLING_ENABLED() && (
+            <Link to="/settings/billing">
+              <Button
+                variant="ghost"
+                className={cn(
+                  'w-full justify-start',
+                  pathname?.startsWith('/settings/billing') && 'bg-secondary',
+                )}
+              >
+                <CreditCardIcon className="mr-2 h-5 w-5" />
+                <Trans>Billing</Trans>
+              </Button>
+            </Link>
+          )}
+        </>
+      )}
+
+      <Link to="/settings/organisations">
         <Button
           variant="ghost"
           className={cn(
             'w-full justify-start',
-            pathname?.startsWith('/settings/teams') && 'bg-secondary',
+            pathname?.startsWith('/settings/organisations') && 'bg-secondary',
           )}
         >
           <Users className="mr-2 h-5 w-5" />
-          <Trans>Teams</Trans>
+          <Trans>Organisations</Trans>
         </Button>
       </Link>
 
@@ -69,47 +140,6 @@ export const SettingsDesktopNav = ({ className, ...props }: SettingsDesktopNavPr
           <Trans>Security</Trans>
         </Button>
       </Link>
-
-      <Link to="/settings/tokens">
-        <Button
-          variant="ghost"
-          className={cn(
-            'w-full justify-start',
-            pathname?.startsWith('/settings/tokens') && 'bg-secondary',
-          )}
-        >
-          <Braces className="mr-2 h-5 w-5" />
-          <Trans>API Tokens</Trans>
-        </Button>
-      </Link>
-
-      <Link to="/settings/webhooks">
-        <Button
-          variant="ghost"
-          className={cn(
-            'w-full justify-start',
-            pathname?.startsWith('/settings/webhooks') && 'bg-secondary',
-          )}
-        >
-          <Webhook className="mr-2 h-5 w-5" />
-          <Trans>Webhooks</Trans>
-        </Button>
-      </Link>
-
-      {isBillingEnabled && (
-        <Link to="/settings/billing">
-          <Button
-            variant="ghost"
-            className={cn(
-              'w-full justify-start',
-              pathname?.startsWith('/settings/billing') && 'bg-secondary',
-            )}
-          >
-            <CreditCard className="mr-2 h-5 w-5" />
-            <Trans>Billing</Trans>
-          </Button>
-        </Link>
-      )}
     </div>
   );
 };
diff --git a/apps/remix/app/components/general/settings-nav-mobile.tsx b/apps/remix/app/components/general/settings-nav-mobile.tsx
index 86c98fecd..196b464ed 100644
--- a/apps/remix/app/components/general/settings-nav-mobile.tsx
+++ b/apps/remix/app/components/general/settings-nav-mobile.tsx
@@ -1,10 +1,21 @@
 import type { HTMLAttributes } from 'react';
 
 import { Trans } from '@lingui/react/macro';
-import { Braces, CreditCard, Globe2Icon, Lock, User, Users, Webhook } from 'lucide-react';
+import {
+  BracesIcon,
+  CreditCardIcon,
+  Globe2Icon,
+  Lock,
+  Settings2Icon,
+  User,
+  Users,
+  WebhookIcon,
+} from 'lucide-react';
 import { Link, useLocation } from 'react-router';
 
+import { useSession } from '@documenso/lib/client-only/providers/session';
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { isPersonalLayout } from '@documenso/lib/utils/organisations';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 
@@ -13,7 +24,9 @@ export type SettingsMobileNavProps = HTMLAttributes<HTMLDivElement>;
 export const SettingsMobileNav = ({ className, ...props }: SettingsMobileNavProps) => {
   const { pathname } = useLocation();
 
-  const isBillingEnabled = IS_BILLING_ENABLED();
+  const { organisations } = useSession();
+
+  const isPersonalLayoutMode = isPersonalLayout(organisations);
 
   return (
     <div
@@ -33,29 +46,87 @@ export const SettingsMobileNav = ({ className, ...props }: SettingsMobileNavProp
         </Button>
       </Link>
 
-      <Link to="/settings/public-profile">
-        <Button
-          variant="ghost"
-          className={cn(
-            'w-full justify-start',
-            pathname?.startsWith('/settings/public-profile') && 'bg-secondary',
-          )}
-        >
-          <Globe2Icon className="mr-2 h-5 w-5" />
-          <Trans>Public Profile</Trans>
-        </Button>
-      </Link>
+      {isPersonalLayoutMode && (
+        <>
+          <Link to="/settings/preferences">
+            <Button
+              variant="ghost"
+              className={cn(
+                'w-full justify-start',
+                pathname?.startsWith('/settings/preferences') && 'bg-secondary',
+              )}
+            >
+              <Settings2Icon className="mr-2 h-5 w-5" />
+              <Trans>Preferences</Trans>
+            </Button>
+          </Link>
 
-      <Link to="/settings/teams">
+          <Link to="/settings/public-profile">
+            <Button
+              variant="ghost"
+              className={cn(
+                'w-full justify-start',
+                pathname?.startsWith('/settings/public-profile') && 'bg-secondary',
+              )}
+            >
+              <Globe2Icon className="mr-2 h-5 w-5" />
+              <Trans>Public Profile</Trans>
+            </Button>
+          </Link>
+
+          <Link to="/settings/tokens">
+            <Button
+              variant="ghost"
+              className={cn(
+                'w-full justify-start',
+                pathname?.startsWith('/settings/tokens') && 'bg-secondary',
+              )}
+            >
+              <BracesIcon className="mr-2 h-5 w-5" />
+              <Trans>API Tokens</Trans>
+            </Button>
+          </Link>
+
+          <Link to="/settings/webhooks">
+            <Button
+              variant="ghost"
+              className={cn(
+                'w-full justify-start',
+                pathname?.startsWith('/settings/webhooks') && 'bg-secondary',
+              )}
+            >
+              <WebhookIcon className="mr-2 h-5 w-5" />
+              <Trans>Webhooks</Trans>
+            </Button>
+          </Link>
+
+          {IS_BILLING_ENABLED() && (
+            <Link to="/settings/billing">
+              <Button
+                variant="ghost"
+                className={cn(
+                  'w-full justify-start',
+                  pathname?.startsWith('/settings/billing') && 'bg-secondary',
+                )}
+              >
+                <CreditCardIcon className="mr-2 h-5 w-5" />
+                <Trans>Billing</Trans>
+              </Button>
+            </Link>
+          )}
+        </>
+      )}
+
+      <Link to="/settings/organisations">
         <Button
           variant="ghost"
           className={cn(
             'w-full justify-start',
-            pathname?.startsWith('/settings/teams') && 'bg-secondary',
+            pathname?.startsWith('/settings/organisations') && 'bg-secondary',
           )}
         >
           <Users className="mr-2 h-5 w-5" />
-          <Trans>Teams</Trans>
+          <Trans>Organisations</Trans>
         </Button>
       </Link>
 
@@ -71,47 +142,6 @@ export const SettingsMobileNav = ({ className, ...props }: SettingsMobileNavProp
           <Trans>Security</Trans>
         </Button>
       </Link>
-
-      <Link to="/settings/tokens">
-        <Button
-          variant="ghost"
-          className={cn(
-            'w-full justify-start',
-            pathname?.startsWith('/settings/tokens') && 'bg-secondary',
-          )}
-        >
-          <Braces className="mr-2 h-5 w-5" />
-          <Trans>API Tokens</Trans>
-        </Button>
-      </Link>
-
-      <Link to="/settings/webhooks">
-        <Button
-          variant="ghost"
-          className={cn(
-            'w-full justify-start',
-            pathname?.startsWith('/settings/webhooks') && 'bg-secondary',
-          )}
-        >
-          <Webhook className="mr-2 h-5 w-5" />
-          <Trans>Webhooks</Trans>
-        </Button>
-      </Link>
-
-      {isBillingEnabled && (
-        <Link to="/settings/billing">
-          <Button
-            variant="ghost"
-            className={cn(
-              'w-full justify-start',
-              pathname?.startsWith('/settings/billing') && 'bg-secondary',
-            )}
-          >
-            <CreditCard className="mr-2 h-5 w-5" />
-            <Trans>Billing</Trans>
-          </Button>
-        </Link>
-      )}
     </div>
   );
 };
diff --git a/apps/remix/app/components/general/skeletons/document-edit-skeleton.tsx b/apps/remix/app/components/general/skeletons/document-edit-skeleton.tsx
index 9a4273060..aba0c57b6 100644
--- a/apps/remix/app/components/general/skeletons/document-edit-skeleton.tsx
+++ b/apps/remix/app/components/general/skeletons/document-edit-skeleton.tsx
@@ -7,7 +7,7 @@ import { Skeleton } from '@documenso/ui/primitives/skeleton';
 export default function DocumentEditSkeleton() {
   return (
     <div className="mx-auto -mt-4 flex w-full max-w-screen-xl flex-col px-4 md:px-8">
-      <Link to="/documents" className="flex grow-0 items-center text-[#7AC455] hover:opacity-80">
+      <Link to="/" className="flex grow-0 items-center text-[#7AC455] hover:opacity-80">
         <ChevronLeft className="mr-2 inline-block h-5 w-5" />
         <Trans>Documents</Trans>
       </Link>
diff --git a/apps/remix/app/components/general/teams/team-billing-portal-button.tsx b/apps/remix/app/components/general/teams/team-billing-portal-button.tsx
deleted file mode 100644
index ce71fbc7e..000000000
--- a/apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-
-import { trpc } from '@documenso/trpc/react';
-import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type TeamBillingPortalButtonProps = {
-  buttonProps?: React.ComponentProps<typeof Button>;
-  teamId: number;
-};
-
-export const TeamBillingPortalButton = ({ buttonProps, teamId }: TeamBillingPortalButtonProps) => {
-  const { _ } = useLingui();
-  const { toast } = useToast();
-
-  const { mutateAsync: createBillingPortal, isPending } =
-    trpc.team.createBillingPortal.useMutation();
-
-  const handleCreatePortal = async () => {
-    try {
-      const sessionUrl = await createBillingPortal({ teamId });
-
-      window.open(sessionUrl, '_blank');
-    } catch (err) {
-      toast({
-        title: _(msg`Something went wrong`),
-        description: _(
-          msg`We are unable to proceed to the billing portal at this time. Please try again, or contact support.`,
-        ),
-        variant: 'destructive',
-        duration: 10000,
-      });
-    }
-  };
-
-  return (
-    <Button {...buttonProps} onClick={async () => handleCreatePortal()} loading={isPending}>
-      <Trans>Manage subscription</Trans>
-    </Button>
-  );
-};
diff --git a/apps/remix/app/components/general/teams/team-email-dropdown.tsx b/apps/remix/app/components/general/teams/team-email-dropdown.tsx
index 3c9be2dfb..faebc5a95 100644
--- a/apps/remix/app/components/general/teams/team-email-dropdown.tsx
+++ b/apps/remix/app/components/general/teams/team-email-dropdown.tsx
@@ -3,7 +3,7 @@ import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { Edit, Loader, Mail, MoreHorizontal, X } from 'lucide-react';
 
-import type { getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
+import type { getTeamWithEmail } from '@documenso/lib/server-only/team/get-team-email-by-email';
 import { trpc } from '@documenso/trpc/react';
 import {
   DropdownMenu,
@@ -17,7 +17,7 @@ import { TeamEmailDeleteDialog } from '~/components/dialogs/team-email-delete-di
 import { TeamEmailUpdateDialog } from '~/components/dialogs/team-email-update-dialog';
 
 export type TeamEmailDropdownProps = {
-  team: Awaited<ReturnType<typeof getTeamByUrl>>;
+  team: Awaited<ReturnType<typeof getTeamWithEmail>>;
 };
 
 export const TeamEmailDropdown = ({ team }: TeamEmailDropdownProps) => {
@@ -25,7 +25,7 @@ export const TeamEmailDropdown = ({ team }: TeamEmailDropdownProps) => {
   const { toast } = useToast();
 
   const { mutateAsync: resendEmailVerification, isPending: isResendingEmailVerification } =
-    trpc.team.resendTeamEmailVerification.useMutation({
+    trpc.team.email.verification.resend.useMutation({
       onSuccess: () => {
         toast({
           title: _(msg`Success`),
diff --git a/apps/remix/app/components/general/teams/team-email-usage.tsx b/apps/remix/app/components/general/teams/team-email-usage.tsx
index 5ae8eb1d6..6e93b6a06 100644
--- a/apps/remix/app/components/general/teams/team-email-usage.tsx
+++ b/apps/remix/app/components/general/teams/team-email-usage.tsx
@@ -30,7 +30,7 @@ export const TeamEmailUsage = ({ teamEmail }: TeamEmailUsageProps) => {
   const { toast } = useToast();
 
   const { mutateAsync: deleteTeamEmail, isPending: isDeletingTeamEmail } =
-    trpc.team.deleteTeamEmail.useMutation({
+    trpc.team.email.delete.useMutation({
       onSuccess: () => {
         toast({
           title: _(msg`Success`),
diff --git a/apps/remix/app/components/general/teams/team-inherit-member-alert.tsx b/apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
new file mode 100644
index 000000000..67291ad88
--- /dev/null
+++ b/apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
@@ -0,0 +1,43 @@
+import { Trans } from '@lingui/react/macro';
+import type { TeamGroup } from '@prisma/client';
+
+import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
+
+import { TeamMemberInheritDisableDialog } from '~/components/dialogs/team-inherit-member-disable-dialog';
+import { TeamMemberInheritEnableDialog } from '~/components/dialogs/team-inherit-member-enable-dialog';
+
+type TeamInheritMemberAlertProps = {
+  memberAccessTeamGroup: TeamGroup | null;
+};
+
+export const TeamInheritMemberAlert = ({ memberAccessTeamGroup }: TeamInheritMemberAlertProps) => {
+  return (
+    <Alert
+      className="flex flex-col justify-between p-6 sm:flex-row sm:items-center"
+      variant="neutral"
+    >
+      <div className="mb-4 sm:mb-0">
+        <AlertTitle>
+          <Trans>Inherit organisation members</Trans>
+        </AlertTitle>
+
+        <AlertDescription className="mr-2">
+          {memberAccessTeamGroup ? (
+            <Trans>Currently all organisation members can access this team</Trans>
+          ) : (
+            <Trans>
+              You can enable access to allow all organisation members to access this team by
+              default.
+            </Trans>
+          )}
+        </AlertDescription>
+      </div>
+
+      {memberAccessTeamGroup ? (
+        <TeamMemberInheritDisableDialog group={memberAccessTeamGroup} />
+      ) : (
+        <TeamMemberInheritEnableDialog />
+      )}
+    </Alert>
+  );
+};
diff --git a/apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx b/apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
index e3d01bbaa..0429b5db2 100644
--- a/apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
+++ b/apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
@@ -1,10 +1,9 @@
 import type { HTMLAttributes } from 'react';
 
 import { Trans } from '@lingui/react/macro';
-import { Braces, CreditCard, Globe2Icon, Settings, Settings2, Users, Webhook } from 'lucide-react';
+import { Braces, Globe2Icon, GroupIcon, Settings, Settings2, Users, Webhook } from 'lucide-react';
 import { Link, useLocation, useParams } from 'react-router';
 
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 
@@ -20,9 +19,9 @@ export const TeamSettingsNavDesktop = ({ className, ...props }: TeamSettingsNavD
   const preferencesPath = `/t/${teamUrl}/settings/preferences`;
   const publicProfilePath = `/t/${teamUrl}/settings/public-profile`;
   const membersPath = `/t/${teamUrl}/settings/members`;
+  const groupsPath = `/t/${teamUrl}/settings/groups`;
   const tokensPath = `/t/${teamUrl}/settings/tokens`;
   const webhooksPath = `/t/${teamUrl}/settings/webhooks`;
-  const billingPath = `/t/${teamUrl}/settings/billing`;
 
   return (
     <div className={cn('flex flex-col gap-y-2', className)} {...props}>
@@ -76,6 +75,16 @@ export const TeamSettingsNavDesktop = ({ className, ...props }: TeamSettingsNavD
         </Button>
       </Link>
 
+      <Link to={groupsPath}>
+        <Button
+          variant="ghost"
+          className={cn('w-full justify-start', pathname?.startsWith(groupsPath) && 'bg-secondary')}
+        >
+          <GroupIcon className="mr-2 h-5 w-5" />
+          <Trans>Groups</Trans>
+        </Button>
+      </Link>
+
       <Link to={tokensPath}>
         <Button
           variant="ghost"
@@ -98,21 +107,6 @@ export const TeamSettingsNavDesktop = ({ className, ...props }: TeamSettingsNavD
           <Trans>Webhooks</Trans>
         </Button>
       </Link>
-
-      {IS_BILLING_ENABLED() && (
-        <Link to={billingPath}>
-          <Button
-            variant="ghost"
-            className={cn(
-              'w-full justify-start',
-              pathname?.startsWith(billingPath) && 'bg-secondary',
-            )}
-          >
-            <CreditCard className="mr-2 h-5 w-5" />
-            <Trans>Billing</Trans>
-          </Button>
-        </Link>
-      )}
     </div>
   );
 };
diff --git a/apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx b/apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
index a5288d019..c769cb27d 100644
--- a/apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
+++ b/apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -1,10 +1,9 @@
 import type { HTMLAttributes } from 'react';
 
 import { Trans } from '@lingui/react/macro';
-import { Braces, CreditCard, Globe2Icon, Key, Settings2, User, Webhook } from 'lucide-react';
+import { Braces, Globe2Icon, GroupIcon, Key, Settings2, User, Webhook } from 'lucide-react';
 import { Link, useLocation, useParams } from 'react-router';
 
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 
@@ -20,9 +19,9 @@ export const TeamSettingsNavMobile = ({ className, ...props }: TeamSettingsNavMo
   const preferencesPath = `/t/${teamUrl}/preferences`;
   const publicProfilePath = `/t/${teamUrl}/settings/public-profile`;
   const membersPath = `/t/${teamUrl}/settings/members`;
+  const groupsPath = `/t/${teamUrl}/settings/groups`;
   const tokensPath = `/t/${teamUrl}/settings/tokens`;
   const webhooksPath = `/t/${teamUrl}/settings/webhooks`;
-  const billingPath = `/t/${teamUrl}/settings/billing`;
 
   return (
     <div
@@ -85,6 +84,16 @@ export const TeamSettingsNavMobile = ({ className, ...props }: TeamSettingsNavMo
         </Button>
       </Link>
 
+      <Link to={groupsPath}>
+        <Button
+          variant="ghost"
+          className={cn('w-full justify-start', pathname?.startsWith(groupsPath) && 'bg-secondary')}
+        >
+          <GroupIcon className="mr-2 h-5 w-5" />
+          <Trans>Groups</Trans>
+        </Button>
+      </Link>
+
       <Link to={tokensPath}>
         <Button
           variant="ghost"
@@ -107,21 +116,6 @@ export const TeamSettingsNavMobile = ({ className, ...props }: TeamSettingsNavMo
           <Trans>Webhooks</Trans>
         </Button>
       </Link>
-
-      {IS_BILLING_ENABLED() && (
-        <Link to={billingPath}>
-          <Button
-            variant="ghost"
-            className={cn(
-              'w-full justify-start',
-              pathname?.startsWith(billingPath) && 'bg-secondary',
-            )}
-          >
-            <CreditCard className="mr-2 h-5 w-5" />
-            <Trans>Billing</Trans>
-          </Button>
-        </Link>
-      )}
     </div>
   );
 };
diff --git a/apps/remix/app/components/general/teams/team-transfer-status.tsx b/apps/remix/app/components/general/teams/team-transfer-status.tsx
deleted file mode 100644
index e259139c5..000000000
--- a/apps/remix/app/components/general/teams/team-transfer-status.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import type { TeamMemberRole, TeamTransferVerification } from '@prisma/client';
-import { AnimatePresence } from 'framer-motion';
-import { useRevalidator } from 'react-router';
-
-import { canExecuteTeamAction } from '@documenso/lib/utils/teams';
-import { isTokenExpired } from '@documenso/lib/utils/token-verification';
-import { trpc } from '@documenso/trpc/react';
-import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';
-import { cn } from '@documenso/ui/lib/utils';
-import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type TeamTransferStatusProps = {
-  className?: string;
-  currentUserTeamRole: TeamMemberRole;
-  teamId: number;
-  transferVerification: Pick<TeamTransferVerification, 'email' | 'expiresAt' | 'name'> | null;
-};
-
-export const TeamTransferStatus = ({
-  className,
-  currentUserTeamRole,
-  teamId,
-  transferVerification,
-}: TeamTransferStatusProps) => {
-  const { _ } = useLingui();
-  const { toast } = useToast();
-  const { revalidate } = useRevalidator();
-
-  const isExpired = transferVerification && isTokenExpired(transferVerification.expiresAt);
-
-  const { mutateAsync: deleteTeamTransferRequest, isPending } =
-    trpc.team.deleteTeamTransferRequest.useMutation({
-      onSuccess: async () => {
-        if (!isExpired) {
-          toast({
-            title: _(msg`Success`),
-            description: _(msg`The team transfer invitation has been successfully deleted.`),
-            duration: 5000,
-          });
-        }
-
-        await revalidate();
-      },
-      onError: () => {
-        toast({
-          title: _(msg`An unknown error occurred`),
-          description: _(
-            msg`We encountered an unknown error while attempting to remove this transfer. Please try again or contact support.`,
-          ),
-          variant: 'destructive',
-        });
-      },
-    });
-
-  return (
-    <AnimatePresence>
-      {transferVerification && (
-        <AnimateGenericFadeInOut>
-          <Alert
-            variant={isExpired ? 'destructive' : 'warning'}
-            className={cn(
-              'flex flex-col justify-between p-6 sm:flex-row sm:items-center',
-              className,
-            )}
-          >
-            <div>
-              <AlertTitle>
-                {isExpired ? (
-                  <Trans>Team transfer request expired</Trans>
-                ) : (
-                  <Trans>Team transfer in progress</Trans>
-                )}
-              </AlertTitle>
-
-              <AlertDescription>
-                {isExpired ? (
-                  <p className="text-sm">
-                    <Trans>
-                      The team transfer request to <strong>{transferVerification.name}</strong> has
-                      expired.
-                    </Trans>
-                  </p>
-                ) : (
-                  <section className="text-sm">
-                    <p>
-                      <Trans>
-                        A request to transfer the ownership of this team has been sent to{' '}
-                        <strong>
-                          {transferVerification.name} ({transferVerification.email})
-                        </strong>
-                      </Trans>
-                    </p>
-
-                    <p>
-                      <Trans>
-                        If they accept this request, the team will be transferred to their account.
-                      </Trans>
-                    </p>
-                  </section>
-                )}
-              </AlertDescription>
-            </div>
-
-            {canExecuteTeamAction('DELETE_TEAM_TRANSFER_REQUEST', currentUserTeamRole) && (
-              <Button
-                onClick={async () => deleteTeamTransferRequest({ teamId })}
-                loading={isPending}
-                variant={isExpired ? 'destructive' : 'ghost'}
-                className={cn('ml-auto', {
-                  'hover:bg-transparent hover:text-blue-800': !isExpired,
-                })}
-              >
-                {isExpired ? <Trans>Close</Trans> : <Trans>Cancel</Trans>}
-              </Button>
-            )}
-          </Alert>
-        </AnimateGenericFadeInOut>
-      )}
-    </AnimatePresence>
-  );
-};
diff --git a/apps/remix/app/components/general/template/template-edit-form.tsx b/apps/remix/app/components/general/template/template-edit-form.tsx
index fd120fc87..4cd0f0f8a 100644
--- a/apps/remix/app/components/general/template/template-edit-form.tsx
+++ b/apps/remix/app/components/general/template/template-edit-form.tsx
@@ -26,12 +26,11 @@ import { AddTemplateSettingsFormPartial } from '@documenso/ui/primitives/templat
 import type { TAddTemplateSettingsFormSchema } from '@documenso/ui/primitives/template-flow/add-template-settings.types';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 export type TemplateEditFormProps = {
   className?: string;
   initialTemplate: TTemplate;
-  isEnterprise: boolean;
   templateRootPath: string;
 };
 
@@ -41,14 +40,13 @@ const EditTemplateSteps: EditTemplateStep[] = ['settings', 'signers', 'fields'];
 export const TemplateEditForm = ({
   initialTemplate,
   className,
-  isEnterprise,
   templateRootPath,
 }: TemplateEditFormProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
 
   const navigate = useNavigate();
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const [step, setStep] = useState<EditTemplateStep>('settings');
 
@@ -260,12 +258,11 @@ export const TemplateEditForm = ({
             <AddTemplateSettingsFormPartial
               key={recipients.length}
               template={template}
-              currentTeamMemberRole={team?.currentTeamMember?.role}
+              currentTeamMemberRole={team.currentTeamRole}
               documentFlow={documentFlow.settings}
               recipients={recipients}
               fields={fields}
               onSubmit={onAddSettingsFormSubmit}
-              isEnterprise={isEnterprise}
               isDocumentPdfLoaded={isDocumentPdfLoaded}
             />
 
@@ -278,7 +275,6 @@ export const TemplateEditForm = ({
               allowDictateNextSigner={template.templateMeta?.allowDictateNextSigner}
               templateDirectLink={template.directLink}
               onSubmit={onAddTemplatePlaceholderFormSubmit}
-              isEnterprise={isEnterprise}
               isDocumentPdfLoaded={isDocumentPdfLoaded}
             />
 
diff --git a/apps/remix/app/components/general/template/template-page-view-documents-table.tsx b/apps/remix/app/components/general/template/template-page-view-documents-table.tsx
index b96d83ef2..bef9189d5 100644
--- a/apps/remix/app/components/general/template/template-page-view-documents-table.tsx
+++ b/apps/remix/app/components/general/template/template-page-view-documents-table.tsx
@@ -28,7 +28,7 @@ import { StackAvatarsWithTooltip } from '~/components/general/stack-avatars-with
 import { DocumentsTableActionButton } from '~/components/tables/documents-table-action-button';
 import { DocumentsTableActionDropdown } from '~/components/tables/documents-table-action-dropdown';
 import { DataTableTitle } from '~/components/tables/documents-table-title';
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 import { PeriodSelector } from '../period-selector';
 
@@ -61,7 +61,7 @@ export const TemplatePageViewDocumentsTable = ({
   const [searchParams] = useSearchParams();
   const updateSearchParams = useUpdateSearchParams();
 
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const parsedSearchParams = ZDocumentSearchParamsSchema.parse(
     Object.fromEntries(searchParams ?? []),
diff --git a/apps/remix/app/components/general/user-profile-skeleton.tsx b/apps/remix/app/components/general/user-profile-skeleton.tsx
index e4baacd9f..8966d98d2 100644
--- a/apps/remix/app/components/general/user-profile-skeleton.tsx
+++ b/apps/remix/app/components/general/user-profile-skeleton.tsx
@@ -1,5 +1,4 @@
 import { Trans } from '@lingui/react/macro';
-import type { User } from '@prisma/client';
 import { File, User2 } from 'lucide-react';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
@@ -9,7 +8,10 @@ import { Button } from '@documenso/ui/primitives/button';
 
 export type UserProfileSkeletonProps = {
   className?: string;
-  user: Pick<User, 'name' | 'url'>;
+  user: {
+    name: string;
+    url: string;
+  };
   rows?: number;
 };
 
diff --git a/apps/remix/app/components/tables/admin-claims-table.tsx b/apps/remix/app/components/tables/admin-claims-table.tsx
new file mode 100644
index 000000000..425472d0a
--- /dev/null
+++ b/apps/remix/app/components/tables/admin-claims-table.tsx
@@ -0,0 +1,199 @@
+import { useMemo } from 'react';
+
+import { useLingui } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
+import { EditIcon, MoreHorizontalIcon, Trash2Icon } from 'lucide-react';
+import { Link, useSearchParams } from 'react-router';
+
+import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
+import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { SUBSCRIPTION_CLAIM_FEATURE_FLAGS } from '@documenso/lib/types/subscription';
+import { trpc } from '@documenso/trpc/react';
+import { CopyTextButton } from '@documenso/ui/components/common/copy-text-button';
+import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
+import { DataTable } from '@documenso/ui/primitives/data-table';
+import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuTrigger,
+} from '@documenso/ui/primitives/dropdown-menu';
+import { Skeleton } from '@documenso/ui/primitives/skeleton';
+import { TableCell } from '@documenso/ui/primitives/table';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { ClaimDeleteDialog } from '../dialogs/claim-delete-dialog';
+import { ClaimUpdateDialog } from '../dialogs/claim-update-dialog';
+
+export const AdminClaimsTable = () => {
+  const { t } = useLingui();
+  const { toast } = useToast();
+
+  const [searchParams] = useSearchParams();
+  const updateSearchParams = useUpdateSearchParams();
+
+  const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
+
+  const { data, isLoading, isLoadingError } = trpc.admin.claims.find.useQuery({
+    query: parsedSearchParams.query,
+    page: parsedSearchParams.page,
+    perPage: parsedSearchParams.perPage,
+  });
+
+  const onPaginationChange = (page: number, perPage: number) => {
+    updateSearchParams({
+      page,
+      perPage,
+    });
+  };
+
+  const results = data ?? {
+    data: [],
+    perPage: 10,
+    currentPage: 1,
+    totalPages: 1,
+  };
+
+  const columns = useMemo(() => {
+    return [
+      {
+        header: t`ID`,
+        accessorKey: 'id',
+        maxSize: 50,
+        cell: ({ row }) => (
+          <CopyTextButton
+            value={row.original.id}
+            onCopySuccess={() => toast({ title: t`ID copied to clipboard` })}
+          />
+        ),
+      },
+      {
+        header: t`Name`,
+        accessorKey: 'name',
+        cell: ({ row }) => (
+          <Link to={`/admin/organisations?query=claim:${row.original.id}`}>
+            {row.original.name}
+          </Link>
+        ),
+      },
+      {
+        header: t`Allowed teams`,
+        accessorKey: 'teamCount',
+        cell: ({ row }) => {
+          if (row.original.teamCount === 0) {
+            return <p className="text-muted-foreground">{t`Unlimited`}</p>;
+          }
+
+          return <p className="text-muted-foreground">{row.original.teamCount}</p>;
+        },
+      },
+      {
+        header: t`Feature Flags`,
+        cell: ({ row }) => {
+          const flags = Object.values(SUBSCRIPTION_CLAIM_FEATURE_FLAGS).filter(
+            ({ key }) => row.original.flags[key],
+          );
+
+          if (flags.length === 0) {
+            return <p className="text-muted-foreground text-xs">{t`None`}</p>;
+          }
+
+          return (
+            <ul className="text-muted-foreground list-disc space-y-1 text-xs">
+              {flags.map(({ key, label }) => (
+                <li key={key}>{label}</li>
+              ))}
+            </ul>
+          );
+        },
+      },
+      {
+        id: 'actions',
+        cell: ({ row }) => (
+          <DropdownMenu>
+            <DropdownMenuTrigger>
+              <MoreHorizontalIcon className="text-muted-foreground h-5 w-5" />
+            </DropdownMenuTrigger>
+
+            <DropdownMenuContent className="w-52" align="start" forceMount>
+              <DropdownMenuLabel>
+                <Trans>Actions</Trans>
+              </DropdownMenuLabel>
+
+              <ClaimUpdateDialog
+                claim={row.original}
+                trigger={
+                  <DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>
+                    <div>
+                      <EditIcon className="mr-2 h-4 w-4" />
+                      <Trans>Update</Trans>
+                    </div>
+                  </DropdownMenuItem>
+                }
+              />
+
+              <ClaimDeleteDialog
+                claimId={row.original.id}
+                claimName={row.original.name}
+                claimLocked={row.original.locked}
+                trigger={
+                  <DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>
+                    <div>
+                      <Trash2Icon className="mr-2 h-4 w-4" />
+                      <Trans>Delete</Trans>
+                    </div>
+                  </DropdownMenuItem>
+                }
+              />
+            </DropdownMenuContent>
+          </DropdownMenu>
+        ),
+      },
+    ] satisfies DataTableColumnDef<(typeof results)['data'][number]>[];
+  }, []);
+
+  return (
+    <div>
+      <DataTable
+        columns={columns}
+        data={results.data}
+        perPage={results.perPage}
+        currentPage={results.currentPage}
+        totalPages={results.totalPages}
+        onPaginationChange={onPaginationChange}
+        error={{
+          enable: isLoadingError,
+        }}
+        skeleton={{
+          enable: isLoading,
+          rows: 3,
+          component: (
+            <>
+              <TableCell className="py-4 pr-4">
+                <Skeleton className="h-4 w-20 rounded-full" />
+              </TableCell>
+              <TableCell>
+                <Skeleton className="h-4 w-12 rounded-full" />
+              </TableCell>
+              <TableCell>
+                <Skeleton className="h-4 w-12 rounded-full" />
+              </TableCell>
+              <TableCell>
+                <Skeleton className="h-4 w-12 rounded-full" />
+              </TableCell>
+              <TableCell>
+                <div className="flex flex-row justify-end space-x-2">
+                  <Skeleton className="h-2 w-6 rounded" />
+                </div>
+              </TableCell>
+            </>
+          ),
+        }}
+      >
+        {(table) => <DataTablePagination additionalInformation="VisibleCount" table={table} />}
+      </DataTable>
+    </div>
+  );
+};
diff --git a/apps/remix/app/components/tables/admin-dashboard-users-table.tsx b/apps/remix/app/components/tables/admin-dashboard-users-table.tsx
index b5b7737f9..6c3919b4c 100644
--- a/apps/remix/app/components/tables/admin-dashboard-users-table.tsx
+++ b/apps/remix/app/components/tables/admin-dashboard-users-table.tsx
@@ -35,7 +35,6 @@ type AdminDashboardUsersTableProps = {
   totalPages: number;
   perPage: number;
   page: number;
-  individualPriceIds: string[];
 };
 
 export const AdminDashboardUsersTable = ({
@@ -43,7 +42,6 @@ export const AdminDashboardUsersTable = ({
   totalPages,
   perPage,
   page,
-  individualPriceIds,
 }: AdminDashboardUsersTableProps) => {
   const { _ } = useLingui();
 
@@ -74,17 +72,6 @@ export const AdminDashboardUsersTable = ({
         accessorKey: 'roles',
         cell: ({ row }) => row.original.roles.join(', '),
       },
-      {
-        header: _(msg`Subscription`),
-        accessorKey: 'subscription',
-        cell: ({ row }) => {
-          const foundIndividualSubscription = (row.original.subscriptions ?? []).find((sub) =>
-            individualPriceIds.includes(sub.priceId),
-          );
-
-          return foundIndividualSubscription?.status ?? 'NONE';
-        },
-      },
       {
         header: _(msg`Documents`),
         accessorKey: 'documents',
@@ -107,7 +94,7 @@ export const AdminDashboardUsersTable = ({
         },
       },
     ] satisfies DataTableColumnDef<(typeof users)[number]>[];
-  }, [individualPriceIds]);
+  }, []);
 
   useEffect(() => {
     startTransition(() => {
diff --git a/apps/remix/app/components/tables/admin-leaderboard-table.tsx b/apps/remix/app/components/tables/admin-leaderboard-table.tsx
index d7baf2cb9..eca409eb9 100644
--- a/apps/remix/app/components/tables/admin-leaderboard-table.tsx
+++ b/apps/remix/app/components/tables/admin-leaderboard-table.tsx
@@ -14,13 +14,9 @@ import { Input } from '@documenso/ui/primitives/input';
 export type SigningVolume = {
   id: number;
   name: string;
-  email: string;
   signingVolume: number;
   createdAt: Date;
   planId: string;
-  userId?: number | null;
-  teamId?: number | null;
-  isTeam: boolean;
 };
 
 type LeaderboardTableProps = {
diff --git a/apps/remix/app/components/tables/admin-organisations-table.tsx b/apps/remix/app/components/tables/admin-organisations-table.tsx
new file mode 100644
index 000000000..577cfa028
--- /dev/null
+++ b/apps/remix/app/components/tables/admin-organisations-table.tsx
@@ -0,0 +1,210 @@
+import { useMemo } from 'react';
+
+import { useLingui } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
+import {
+  CreditCardIcon,
+  ExternalLinkIcon,
+  MoreHorizontalIcon,
+  SettingsIcon,
+  UserIcon,
+} from 'lucide-react';
+import { Link, useSearchParams } from 'react-router';
+
+import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
+import { SUBSCRIPTION_STATUS_MAP } from '@documenso/lib/constants/billing';
+import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { trpc } from '@documenso/trpc/react';
+import { Badge } from '@documenso/ui/primitives/badge';
+import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
+import { DataTable } from '@documenso/ui/primitives/data-table';
+import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuTrigger,
+} from '@documenso/ui/primitives/dropdown-menu';
+import { Skeleton } from '@documenso/ui/primitives/skeleton';
+import { TableCell } from '@documenso/ui/primitives/table';
+
+type AdminOrganisationsTableOptions = {
+  ownerUserId?: number;
+  memberUserId?: number;
+  showOwnerColumn?: boolean;
+  hidePaginationUntilOverflow?: boolean;
+};
+
+export const AdminOrganisationsTable = ({
+  ownerUserId,
+  memberUserId,
+  showOwnerColumn = true,
+  hidePaginationUntilOverflow,
+}: AdminOrganisationsTableOptions) => {
+  const { t, i18n } = useLingui();
+
+  const [searchParams] = useSearchParams();
+  const updateSearchParams = useUpdateSearchParams();
+
+  const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
+
+  const { data, isLoading, isLoadingError } = trpc.admin.organisation.find.useQuery({
+    query: parsedSearchParams.query,
+    page: parsedSearchParams.page,
+    perPage: parsedSearchParams.perPage,
+    ownerUserId,
+    memberUserId,
+  });
+
+  const onPaginationChange = (page: number, perPage: number) => {
+    updateSearchParams({
+      page,
+      perPage,
+    });
+  };
+
+  const results = data ?? {
+    data: [],
+    perPage: 10,
+    currentPage: 1,
+    totalPages: 1,
+  };
+
+  const columns = useMemo(() => {
+    return [
+      {
+        header: t`Organisation`,
+        accessorKey: 'name',
+        cell: ({ row }) => (
+          <Link to={`/admin/organisations/${row.original.id}`}>{row.original.name}</Link>
+        ),
+      },
+      {
+        header: t`Created At`,
+        accessorKey: 'createdAt',
+        cell: ({ row }) => i18n.date(row.original.createdAt),
+      },
+      {
+        header: t`Owner`,
+        accessorKey: 'owner',
+        cell: ({ row }) => (
+          <Link to={`/admin/users/${row.original.owner.id}`}>{row.original.owner.name}</Link>
+        ),
+      },
+      {
+        header: t`Status`,
+        cell: ({ row }) => (
+          <Badge variant="neutral">
+            {row.original.owner.id === memberUserId ? t`Owner` : t`Member`}
+          </Badge>
+        ),
+      },
+      {
+        header: t`Subscription`,
+        cell: ({ row }) =>
+          row.original.subscription ? (
+            <Link
+              to={`https://dashboard.stripe.com/subscriptions/${row.original.subscription.planId}`}
+              target="_blank"
+              className="flex flex-row items-center gap-2"
+            >
+              {SUBSCRIPTION_STATUS_MAP[row.original.subscription.status]}
+              <ExternalLinkIcon className="h-4 w-4" />
+            </Link>
+          ) : (
+            'None'
+          ),
+      },
+      {
+        id: 'actions',
+        cell: ({ row }) => (
+          <DropdownMenu>
+            <DropdownMenuTrigger>
+              <MoreHorizontalIcon className="text-muted-foreground h-5 w-5" />
+            </DropdownMenuTrigger>
+
+            <DropdownMenuContent className="w-52" align="start" forceMount>
+              <DropdownMenuLabel>
+                <Trans>Actions</Trans>
+              </DropdownMenuLabel>
+
+              <DropdownMenuItem asChild>
+                <Link to={`/admin/organisations/${row.original.id}`}>
+                  <SettingsIcon className="mr-2 h-4 w-4" />
+                  <Trans>Manage</Trans>
+                </Link>
+              </DropdownMenuItem>
+
+              <DropdownMenuItem asChild>
+                <Link to={`/admin/users/${row.original.owner.id}`}>
+                  <UserIcon className="mr-2 h-4 w-4" />
+                  <Trans>View owner</Trans>
+                </Link>
+              </DropdownMenuItem>
+
+              <DropdownMenuItem disabled={!row.original.customerId} asChild>
+                <Link to={`https://dashboard.stripe.com/customers/${row.original.customerId}`}>
+                  <CreditCardIcon className="mr-2 h-4 w-4" />
+                  <Trans>Stripe</Trans>
+                  {!row.original.customerId && <span>&nbsp;(N/A)</span>}
+                </Link>
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
+        ),
+      },
+    ] satisfies DataTableColumnDef<(typeof results)['data'][number]>[];
+  }, []);
+
+  return (
+    <div>
+      <DataTable
+        columns={columns}
+        data={results.data}
+        perPage={results.perPage}
+        currentPage={results.currentPage}
+        totalPages={results.totalPages}
+        onPaginationChange={onPaginationChange}
+        columnVisibility={{
+          owner: showOwnerColumn,
+          status: memberUserId !== undefined,
+        }}
+        error={{
+          enable: isLoadingError,
+        }}
+        skeleton={{
+          enable: isLoading,
+          rows: 3,
+          component: (
+            <>
+              <TableCell className="py-4 pr-4">
+                <Skeleton className="h-4 w-20 rounded-full" />
+              </TableCell>
+              <TableCell>
+                <Skeleton className="h-4 w-12 rounded-full" />
+              </TableCell>
+              <TableCell>
+                <Skeleton className="h-4 w-12 rounded-full" />
+              </TableCell>
+              <TableCell>
+                <Skeleton className="h-4 w-12 rounded-full" />
+              </TableCell>
+              <TableCell>
+                <div className="flex flex-row justify-end space-x-2">
+                  <Skeleton className="h-2 w-6 rounded" />
+                </div>
+              </TableCell>
+            </>
+          ),
+        }}
+      >
+        {(table) =>
+          !hidePaginationUntilOverflow || 1 > table.getPageCount() ? (
+            <DataTablePagination additionalInformation="VisibleCount" table={table} />
+          ) : null
+        }
+      </DataTable>
+    </div>
+  );
+};
diff --git a/apps/remix/app/components/tables/documents-table-action-button.tsx b/apps/remix/app/components/tables/documents-table-action-button.tsx
index f3a605907..1333ca912 100644
--- a/apps/remix/app/components/tables/documents-table-action-button.tsx
+++ b/apps/remix/app/components/tables/documents-table-action-button.tsx
@@ -15,7 +15,7 @@ import { trpc as trpcClient } from '@documenso/trpc/client';
 import { Button } from '@documenso/ui/primitives/button';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 export type DocumentsTableActionButtonProps = {
   row: TDocumentRow;
@@ -26,7 +26,7 @@ export const DocumentsTableActionButton = ({ row }: DocumentsTableActionButtonPr
   const { toast } = useToast();
   const { _ } = useLingui();
 
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const recipient = row.recipients.find((recipient) => recipient.email === user.email);
 
@@ -39,10 +39,8 @@ export const DocumentsTableActionButton = ({ row }: DocumentsTableActionButtonPr
   const role = recipient?.role;
   const isCurrentTeamDocument = team && row.team?.url === team.url;
 
-  const documentsPath = formatDocumentsPath(team?.url);
-  const formatPath = row.folderId
-    ? `${documentsPath}/f/${row.folderId}/${row.id}/edit`
-    : `${documentsPath}/${row.id}/edit`;
+  const documentsPath = formatDocumentsPath(team.url);
+  const formatPath = `${documentsPath}/${row.id}/edit`;
 
   const onDownloadClick = async () => {
     try {
diff --git a/apps/remix/app/components/tables/documents-table-action-dropdown.tsx b/apps/remix/app/components/tables/documents-table-action-dropdown.tsx
index ef367112b..0a2d71dfd 100644
--- a/apps/remix/app/components/tables/documents-table-action-dropdown.tsx
+++ b/apps/remix/app/components/tables/documents-table-action-dropdown.tsx
@@ -14,7 +14,6 @@ import {
   FolderInput,
   Loader,
   MoreHorizontal,
-  MoveRight,
   Pencil,
   Share,
   Trash2,
@@ -39,10 +38,9 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { DocumentDeleteDialog } from '~/components/dialogs/document-delete-dialog';
 import { DocumentDuplicateDialog } from '~/components/dialogs/document-duplicate-dialog';
-import { DocumentMoveDialog } from '~/components/dialogs/document-move-dialog';
 import { DocumentResendDialog } from '~/components/dialogs/document-resend-dialog';
 import { DocumentRecipientLinkCopyDialog } from '~/components/general/document/document-recipient-link-copy-dialog';
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 export type DocumentsTableActionDropdownProps = {
   row: TDocumentRow;
@@ -54,14 +52,13 @@ export const DocumentsTableActionDropdown = ({
   onMoveDocument,
 }: DocumentsTableActionDropdownProps) => {
   const { user } = useSession();
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
 
   const { toast } = useToast();
   const { _ } = useLingui();
 
   const [isDeleteDialogOpen, setDeleteDialogOpen] = useState(false);
   const [isDuplicateDialogOpen, setDuplicateDialogOpen] = useState(false);
-  const [isMoveDialogOpen, setMoveDialogOpen] = useState(false);
 
   const recipient = row.recipients.find((recipient) => recipient.email === user.email);
 
@@ -74,10 +71,8 @@ export const DocumentsTableActionDropdown = ({
   const isCurrentTeamDocument = team && row.team?.url === team.url;
   const canManageDocument = Boolean(isOwner || isCurrentTeamDocument);
 
-  const documentsPath = formatDocumentsPath(team?.url);
-  const formatPath = row.folderId
-    ? `${documentsPath}/f/${row.folderId}/${row.id}/edit`
-    : `${documentsPath}/${row.id}/edit`;
+  const documentsPath = formatDocumentsPath(team.url);
+  const formatPath = `${documentsPath}/${row.id}/edit`;
 
   const onDownloadClick = async () => {
     try {
@@ -193,14 +188,6 @@ export const DocumentsTableActionDropdown = ({
           <Trans>Duplicate</Trans>
         </DropdownMenuItem>
 
-        {/* We don't want to allow teams moving documents across at the moment. */}
-        {!team && !row.teamId && (
-          <DropdownMenuItem onClick={() => setMoveDialogOpen(true)}>
-            <MoveRight className="mr-2 h-4 w-4" />
-            <Trans>Move to Team</Trans>
-          </DropdownMenuItem>
-        )}
-
         {onMoveDocument && (
           <DropdownMenuItem onClick={onMoveDocument} onSelect={(e) => e.preventDefault()}>
             <FolderInput className="mr-2 h-4 w-4" />
@@ -259,16 +246,9 @@ export const DocumentsTableActionDropdown = ({
         documentTitle={row.title}
         open={isDeleteDialogOpen}
         onOpenChange={setDeleteDialogOpen}
-        teamId={team?.id}
         canManageDocument={canManageDocument}
       />
 
-      <DocumentMoveDialog
-        documentId={row.id}
-        open={isMoveDialogOpen}
-        onOpenChange={setMoveDialogOpen}
-      />
-
       <DocumentDuplicateDialog
         id={row.id}
         open={isDuplicateDialogOpen}
diff --git a/apps/remix/app/components/tables/documents-table-sender-filter.tsx b/apps/remix/app/components/tables/documents-table-sender-filter.tsx
index 6251dc980..4a44edd51 100644
--- a/apps/remix/app/components/tables/documents-table-sender-filter.tsx
+++ b/apps/remix/app/components/tables/documents-table-sender-filter.tsx
@@ -3,7 +3,6 @@ import { Trans } from '@lingui/react/macro';
 import { useLocation, useNavigate, useSearchParams } from 'react-router';
 
 import { useIsMounted } from '@documenso/lib/client-only/hooks/use-is-mounted';
-import { parseToIntegerArray } from '@documenso/lib/utils/params';
 import { trpc } from '@documenso/trpc/react';
 import { MultiSelectCombobox } from '@documenso/ui/primitives/multi-select-combobox';
 
@@ -18,18 +17,20 @@ export const DocumentsTableSenderFilter = ({ teamId }: DocumentsTableSenderFilte
 
   const isMounted = useIsMounted();
 
-  const senderIds = parseToIntegerArray(searchParams?.get('senderIds') ?? '');
+  const senderIds = (searchParams?.get('senderIds') ?? '')
+    .split(',')
+    .filter((value) => value !== '');
 
-  const { data, isLoading } = trpc.team.getTeamMembers.useQuery({
+  const { data, isLoading } = trpc.team.member.getMany.useQuery({
     teamId,
   });
 
   const comboBoxOptions = (data ?? []).map((member) => ({
-    label: member.user.name ?? member.user.email,
-    value: member.user.id,
+    label: member.name ?? member.email,
+    value: member.userId.toString(),
   }));
 
-  const onChange = (newSenderIds: number[]) => {
+  const onChange = (newSenderIds: string[]) => {
     if (!pathname) {
       return;
     }
diff --git a/apps/remix/app/components/tables/documents-table-title.tsx b/apps/remix/app/components/tables/documents-table-title.tsx
index 7946b4ea9..0705b60b3 100644
--- a/apps/remix/app/components/tables/documents-table-title.tsx
+++ b/apps/remix/app/components/tables/documents-table-title.tsx
@@ -7,7 +7,7 @@ import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 
 export type DataTableTitleProps = {
   row: TDocumentRow;
-  teamUrl?: string;
+  teamUrl: string;
 };
 
 export const DataTableTitle = ({ row, teamUrl }: DataTableTitleProps) => {
@@ -19,7 +19,7 @@ export const DataTableTitle = ({ row, teamUrl }: DataTableTitleProps) => {
   const isRecipient = !!recipient;
   const isCurrentTeamDocument = teamUrl && row.team?.url === teamUrl;
 
-  const documentsPath = formatDocumentsPath(isCurrentTeamDocument ? teamUrl : undefined);
+  const documentsPath = formatDocumentsPath(teamUrl);
 
   return match({
     isOwner,
diff --git a/apps/remix/app/components/tables/documents-table.tsx b/apps/remix/app/components/tables/documents-table.tsx
index 4b7cdca3d..fa5be7d2d 100644
--- a/apps/remix/app/components/tables/documents-table.tsx
+++ b/apps/remix/app/components/tables/documents-table.tsx
@@ -19,7 +19,7 @@ import { Skeleton } from '@documenso/ui/primitives/skeleton';
 import { TableCell } from '@documenso/ui/primitives/table';
 
 import { DocumentStatus } from '~/components/general/document/document-status';
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 import { StackAvatarsWithTooltip } from '../general/stack-avatars-with-tooltip';
 import { DocumentsTableActionButton } from './documents-table-action-button';
@@ -42,7 +42,7 @@ export const DocumentsTable = ({
 }: DocumentsTableProps) => {
   const { _, i18n } = useLingui();
 
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
   const [isPending, startTransition] = useTransition();
 
   const updateSearchParams = useUpdateSearchParams();
@@ -167,7 +167,7 @@ export const DocumentsTable = ({
 
 type DataTableTitleProps = {
   row: DocumentsTableRow;
-  teamUrl?: string;
+  teamUrl: string;
 };
 
 const DataTableTitle = ({ row, teamUrl }: DataTableTitleProps) => {
@@ -179,10 +179,8 @@ const DataTableTitle = ({ row, teamUrl }: DataTableTitleProps) => {
   const isRecipient = !!recipient;
   const isCurrentTeamDocument = teamUrl && row.team?.url === teamUrl;
 
-  const documentsPath = formatDocumentsPath(isCurrentTeamDocument ? teamUrl : undefined);
-  const formatPath = row.folderId
-    ? `${documentsPath}/f/${row.folderId}/${row.id}`
-    : `${documentsPath}/${row.id}`;
+  const documentsPath = formatDocumentsPath(teamUrl);
+  const formatPath = `${documentsPath}/${row.id}`;
 
   return match({
     isOwner,
diff --git a/apps/remix/app/components/tables/inbox-table.tsx b/apps/remix/app/components/tables/inbox-table.tsx
new file mode 100644
index 000000000..45f837c17
--- /dev/null
+++ b/apps/remix/app/components/tables/inbox-table.tsx
@@ -0,0 +1,273 @@
+import { useMemo, useTransition } from 'react';
+
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { DocumentStatus as DocumentStatusEnum } from '@prisma/client';
+import { RecipientRole, SigningStatus } from '@prisma/client';
+import { CheckCircleIcon, DownloadIcon, EyeIcon, Loader, PencilIcon } from 'lucide-react';
+import { DateTime } from 'luxon';
+import { Link, useSearchParams } from 'react-router';
+import { match } from 'ts-pattern';
+
+import { downloadPDF } from '@documenso/lib/client-only/download-pdf';
+import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { isDocumentCompleted } from '@documenso/lib/utils/document';
+import { trpc as trpcClient } from '@documenso/trpc/client';
+import { trpc } from '@documenso/trpc/react';
+import type { TFindInboxResponse } from '@documenso/trpc/server/document-router/find-inbox.types';
+import type { TFindDocumentsResponse } from '@documenso/trpc/server/document-router/schema';
+import { Button } from '@documenso/ui/primitives/button';
+import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
+import { DataTable } from '@documenso/ui/primitives/data-table';
+import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
+import { Skeleton } from '@documenso/ui/primitives/skeleton';
+import { TableCell } from '@documenso/ui/primitives/table';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { DocumentStatus } from '~/components/general/document/document-status';
+import { useOptionalCurrentTeam } from '~/providers/team';
+
+import { StackAvatarsWithTooltip } from '../general/stack-avatars-with-tooltip';
+
+export type DocumentsTableProps = {
+  data?: TFindDocumentsResponse;
+  isLoading?: boolean;
+  isLoadingError?: boolean;
+};
+
+type DocumentsTableRow = TFindDocumentsResponse['data'][number];
+
+export const InboxTable = () => {
+  const { _, i18n } = useLingui();
+
+  const team = useOptionalCurrentTeam();
+  const [isPending, startTransition] = useTransition();
+
+  const [searchParams] = useSearchParams();
+  const updateSearchParams = useUpdateSearchParams();
+
+  const page = searchParams?.get?.('page') ? Number(searchParams.get('page')) : undefined;
+  const perPage = searchParams?.get?.('perPage') ? Number(searchParams.get('perPage')) : undefined;
+
+  const { data, isLoading, isLoadingError } = trpc.document.inbox.find.useQuery({
+    page: page || 1,
+    perPage: perPage || 10,
+  });
+
+  const columns = useMemo(() => {
+    return [
+      {
+        header: _(msg`Created`),
+        accessorKey: 'createdAt',
+        cell: ({ row }) =>
+          i18n.date(row.original.createdAt, { ...DateTime.DATETIME_SHORT, hourCycle: 'h12' }),
+      },
+      {
+        header: _(msg`Title`),
+        cell: ({ row }) => (
+          <span className="block max-w-[10rem] truncate font-medium md:max-w-[20rem]">
+            {row.original.title}
+          </span>
+        ),
+      },
+      {
+        id: 'sender',
+        header: _(msg`Sender`),
+        cell: ({ row }) => row.original.user.name ?? row.original.user.email,
+      },
+      {
+        header: _(msg`Recipient`),
+        accessorKey: 'recipient',
+        cell: ({ row }) => (
+          <StackAvatarsWithTooltip
+            recipients={row.original.recipients}
+            documentStatus={row.original.status}
+          />
+        ),
+      },
+      {
+        header: _(msg`Status`),
+        accessorKey: 'status',
+        cell: ({ row }) => <DocumentStatus status={row.original.status} />,
+        size: 140,
+      },
+      {
+        header: _(msg`Actions`),
+        cell: ({ row }) => <InboxTableActionButton row={row.original} />,
+      },
+    ] satisfies DataTableColumnDef<DocumentsTableRow>[];
+  }, [team]);
+
+  const onPaginationChange = (page: number, perPage: number) => {
+    startTransition(() => {
+      updateSearchParams({
+        page,
+        perPage,
+      });
+    });
+  };
+
+  const results = data ?? {
+    data: [],
+    perPage: 10,
+    currentPage: 1,
+    totalPages: 1,
+  };
+
+  return (
+    <div className="relative">
+      <DataTable
+        columns={columns}
+        data={results.data}
+        perPage={results.perPage}
+        currentPage={results.currentPage}
+        totalPages={results.totalPages}
+        onPaginationChange={onPaginationChange}
+        columnVisibility={{
+          sender: team !== undefined,
+        }}
+        error={{
+          enable: isLoadingError || false,
+        }}
+        emptyState={
+          <div className="text-muted-foreground/60 flex h-60 flex-col items-center justify-center gap-y-4">
+            <p>
+              <Trans>Documents that require your attention will appear here</Trans>
+            </p>
+          </div>
+        }
+        skeleton={{
+          enable: isLoading || false,
+          rows: 5,
+          component: (
+            <>
+              <TableCell>
+                <Skeleton className="h-4 w-40 rounded-full" />
+              </TableCell>
+              <TableCell>
+                <Skeleton className="h-4 w-20 rounded-full" />
+              </TableCell>
+              <TableCell className="py-4">
+                <div className="flex w-full flex-row items-center">
+                  <Skeleton className="h-10 w-10 flex-shrink-0 rounded-full" />
+                </div>
+              </TableCell>
+              <TableCell>
+                <Skeleton className="h-4 w-20 rounded-full" />
+              </TableCell>
+              <TableCell>
+                <Skeleton className="h-10 w-24 rounded" />
+              </TableCell>
+            </>
+          ),
+        }}
+      >
+        {(table) =>
+          results.totalPages > 1 && (
+            <DataTablePagination additionalInformation="VisibleCount" table={table} />
+          )
+        }
+      </DataTable>
+
+      {isPending && (
+        <div className="bg-background/50 absolute inset-0 flex items-center justify-center">
+          <Loader className="text-muted-foreground h-8 w-8 animate-spin" />
+        </div>
+      )}
+    </div>
+  );
+};
+
+export type InboxTableActionButtonProps = {
+  row: TFindInboxResponse['data'][number];
+};
+
+export const InboxTableActionButton = ({ row }: InboxTableActionButtonProps) => {
+  const { user } = useSession();
+  const { toast } = useToast();
+  const { _ } = useLingui();
+
+  const recipient = row.recipients.find((recipient) => recipient.email === user.email);
+
+  const isPending = row.status === DocumentStatusEnum.PENDING;
+  const isComplete = isDocumentCompleted(row.status);
+  const isSigned = recipient?.signingStatus === SigningStatus.SIGNED;
+  const role = recipient?.role;
+
+  if (!recipient) {
+    return null;
+  }
+
+  const onDownloadClick = async () => {
+    try {
+      const document = await trpcClient.document.getDocumentByToken.query({
+        token: recipient.token,
+      });
+
+      const documentData = document?.documentData;
+
+      if (!documentData) {
+        throw Error('No document available');
+      }
+
+      await downloadPDF({ documentData, fileName: row.title });
+    } catch (err) {
+      toast({
+        title: _(msg`Something went wrong`),
+        description: _(msg`An error occurred while downloading your document.`),
+        variant: 'destructive',
+      });
+    }
+  };
+
+  // TODO: Consider if want to keep this logic for hiding viewing for CC'ers
+  if (recipient?.role === RecipientRole.CC && isComplete === false) {
+    return null;
+  }
+
+  return match({
+    isPending,
+    isComplete,
+    isSigned,
+  })
+    .with({ isPending: true, isSigned: false }, () => (
+      <Button className="w-32" asChild>
+        <Link to={`/sign/${recipient?.token}`}>
+          {match(role)
+            .with(RecipientRole.SIGNER, () => (
+              <>
+                <PencilIcon className="-ml-1 mr-2 h-4 w-4" />
+                <Trans>Sign</Trans>
+              </>
+            ))
+            .with(RecipientRole.APPROVER, () => (
+              <>
+                <CheckCircleIcon className="-ml-1 mr-2 h-4 w-4" />
+                <Trans>Approve</Trans>
+              </>
+            ))
+            .otherwise(() => (
+              <>
+                <EyeIcon className="-ml-1 mr-2 h-4 w-4" />
+                <Trans>View</Trans>
+              </>
+            ))}
+        </Link>
+      </Button>
+    ))
+    .with({ isPending: true, isSigned: true }, () => (
+      <Button className="w-32" disabled={true}>
+        <EyeIcon className="-ml-1 mr-2 h-4 w-4" />
+        <Trans>View</Trans>
+      </Button>
+    ))
+    .with({ isComplete: true }, () => (
+      <Button className="w-32" onClick={onDownloadClick}>
+        <DownloadIcon className="-ml-1 mr-2 inline h-4 w-4" />
+        <Trans>Download</Trans>
+      </Button>
+    ))
+    .otherwise(() => <div></div>);
+};
diff --git a/apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx b/apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
similarity index 73%
rename from apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
rename to apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
index 14e843c36..43af226df 100644
--- a/apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+++ b/apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
@@ -2,7 +2,7 @@ import { useMemo } from 'react';
 
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
-import { Plural, Trans } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
 import { File } from 'lucide-react';
 import { DateTime } from 'luxon';
 import { Link } from 'react-router';
@@ -11,22 +11,23 @@ import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
 import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
 import { DataTable } from '@documenso/ui/primitives/data-table';
-import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
 import { Skeleton } from '@documenso/ui/primitives/skeleton';
 import { TableCell } from '@documenso/ui/primitives/table';
 
-export type TeamSettingsBillingInvoicesTableProps = {
-  teamId: number;
+export type OrganisationBillingInvoicesTableProps = {
+  organisationId: string;
+  subscriptionExists: boolean;
 };
 
-export const TeamSettingsBillingInvoicesTable = ({
-  teamId,
-}: TeamSettingsBillingInvoicesTableProps) => {
+export const OrganisationBillingInvoicesTable = ({
+  organisationId,
+  subscriptionExists,
+}: OrganisationBillingInvoicesTableProps) => {
   const { _ } = useLingui();
 
-  const { data, isLoading, isLoadingError } = trpc.team.findTeamInvoices.useQuery(
+  const { data, isLoading, isLoadingError } = trpc.billing.invoices.get.useQuery(
     {
-      teamId,
+      organisationId,
     },
     {
       placeholderData: (previousData) => previousData,
@@ -43,7 +44,7 @@ export const TeamSettingsBillingInvoicesTable = ({
   };
 
   const results = {
-    data: data?.data ?? [],
+    data: data || [],
     perPage: 100,
     currentPage: 1,
     totalPages: 1,
@@ -58,13 +59,8 @@ export const TeamSettingsBillingInvoicesTable = ({
           <div className="flex max-w-xs items-center gap-2">
             <File className="h-6 w-6" />
 
-            <div className="flex flex-col text-sm">
-              <span className="text-foreground/80 font-semibold">
-                {DateTime.fromSeconds(row.original.created).toFormat('MMMM yyyy')}
-              </span>
-              <span className="text-muted-foreground">
-                <Plural value={row.original.quantity} one="# Seat" other="# Seats" />
-              </span>
+            <div className="text-foreground/80 text-sm font-semibold">
+              {DateTime.fromSeconds(row.original.created).toFormat('MMMM yyyy')}
             </div>
           </div>
         ),
@@ -73,10 +69,10 @@ export const TeamSettingsBillingInvoicesTable = ({
         header: _(msg`Status`),
         accessorKey: 'status',
         cell: ({ row }) => {
-          const { status, paid } = row.original;
+          const { status } = row.original;
 
           if (!status) {
-            return paid ? <Trans>Paid</Trans> : <Trans>Unpaid</Trans>;
+            return 'N/A';
           }
 
           return status.charAt(0).toUpperCase() + status.slice(1);
@@ -94,9 +90,9 @@ export const TeamSettingsBillingInvoicesTable = ({
             <Button
               variant="outline"
               asChild
-              disabled={typeof row.original.hostedInvoicePdf !== 'string'}
+              disabled={typeof row.original.hosted_invoice_url !== 'string'}
             >
-              <Link to={row.original.hostedInvoicePdf ?? ''} target="_blank">
+              <Link to={row.original.hosted_invoice_url ?? ''} target="_blank">
                 <Trans>View</Trans>
               </Link>
             </Button>
@@ -104,9 +100,9 @@ export const TeamSettingsBillingInvoicesTable = ({
             <Button
               variant="outline"
               asChild
-              disabled={typeof row.original.hostedInvoicePdf !== 'string'}
+              disabled={typeof row.original.invoice_pdf !== 'string'}
             >
-              <Link to={row.original.invoicePdf ?? ''} target="_blank">
+              <Link to={row.original.invoice_pdf ?? ''} target="_blank">
                 <Trans>Download</Trans>
               </Link>
             </Button>
@@ -116,6 +112,10 @@ export const TeamSettingsBillingInvoicesTable = ({
     ] satisfies DataTableColumnDef<(typeof results)['data'][number]>[];
   }, []);
 
+  if (results.data.length === 0 && !subscriptionExists) {
+    return null;
+  }
+
   return (
     <DataTable
       columns={columns}
@@ -157,7 +157,7 @@ export const TeamSettingsBillingInvoicesTable = ({
         ),
       }}
     >
-      {(table) => <DataTablePagination additionalInformation="VisibleCount" table={table} />}
+      {/* {(table) => <DataTablePagination additionalInformation="VisibleCount" table={table} />} */}
     </DataTable>
   );
 };
diff --git a/apps/remix/app/components/tables/organisation-groups-table.tsx b/apps/remix/app/components/tables/organisation-groups-table.tsx
new file mode 100644
index 000000000..b7a8e2582
--- /dev/null
+++ b/apps/remix/app/components/tables/organisation-groups-table.tsx
@@ -0,0 +1,149 @@
+import { useMemo } from 'react';
+
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { OrganisationGroupType } from '@prisma/client';
+import { Link, useSearchParams } from 'react-router';
+
+import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { EXTENDED_ORGANISATION_MEMBER_ROLE_MAP } from '@documenso/lib/constants/organisations-translations';
+import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { trpc } from '@documenso/trpc/react';
+import { Button } from '@documenso/ui/primitives/button';
+import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
+import { DataTable } from '@documenso/ui/primitives/data-table';
+import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
+import { Skeleton } from '@documenso/ui/primitives/skeleton';
+import { TableCell } from '@documenso/ui/primitives/table';
+
+import { OrganisationGroupDeleteDialog } from '../dialogs/organisation-group-delete-dialog';
+
+export const OrganisationGroupsDataTable = () => {
+  const { _ } = useLingui();
+
+  const [searchParams] = useSearchParams();
+  const updateSearchParams = useUpdateSearchParams();
+  const organisation = useCurrentOrganisation();
+
+  const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
+
+  const { data, isLoading, isLoadingError } = trpc.organisation.group.find.useQuery(
+    {
+      organisationId: organisation.id,
+      query: parsedSearchParams.query,
+      page: parsedSearchParams.page,
+      perPage: parsedSearchParams.perPage,
+      types: [OrganisationGroupType.CUSTOM],
+    },
+    {
+      placeholderData: (previousData) => previousData,
+    },
+  );
+
+  const onPaginationChange = (page: number, perPage: number) => {
+    updateSearchParams({
+      page,
+      perPage,
+    });
+  };
+
+  const results = data ?? {
+    data: [],
+    perPage: 10,
+    currentPage: 1,
+    totalPages: 1,
+  };
+
+  const columns = useMemo(() => {
+    return [
+      {
+        header: _(msg`Group`),
+        accessorKey: 'name',
+      },
+      {
+        header: _(msg`Role`),
+        accessorKey: 'organisationRole',
+        cell: ({ row }) => _(EXTENDED_ORGANISATION_MEMBER_ROLE_MAP[row.original.organisationRole]),
+      },
+      {
+        header: _(msg`Members`),
+        accessorKey: 'members',
+        cell: ({ row }) => row.original.members.length,
+      },
+      {
+        header: _(msg`Assigned Teams`),
+        accessorKey: 'teams',
+        cell: ({ row }) => row.original.teams.length,
+      },
+      {
+        header: _(msg`Actions`),
+        cell: ({ row }) => (
+          <div className="flex justify-end space-x-2">
+            <Button asChild variant="outline">
+              <Link to={`/o/${organisation.url}/settings/groups/${row.original.id}`}>Manage</Link>
+            </Button>
+
+            <OrganisationGroupDeleteDialog
+              organisationGroupId={row.original.id}
+              organisationGroupName={row.original.name ?? ''}
+              trigger={
+                <Button variant="destructive" title={_(msg`Remove organisation group`)}>
+                  <Trans>Delete</Trans>
+                </Button>
+              }
+            />
+          </div>
+        ),
+      },
+    ] satisfies DataTableColumnDef<(typeof results)['data'][number]>[];
+  }, []);
+
+  return (
+    <DataTable
+      columns={columns}
+      data={results.data}
+      perPage={results.perPage}
+      currentPage={results.currentPage}
+      totalPages={results.totalPages}
+      onPaginationChange={onPaginationChange}
+      error={{
+        enable: isLoadingError,
+      }}
+      skeleton={{
+        enable: isLoading,
+        rows: 3,
+        component: (
+          <>
+            <TableCell className="w-1/2 py-4 pr-4">
+              <div className="flex w-full flex-row items-center">
+                <Skeleton className="h-12 w-12 flex-shrink-0 rounded-full" />
+
+                <div className="ml-2 flex flex-grow flex-col">
+                  <Skeleton className="h-4 w-1/3 max-w-[8rem]" />
+                  <Skeleton className="mt-1 h-4 w-1/2 max-w-[12rem]" />
+                </div>
+              </div>
+            </TableCell>
+            <TableCell>
+              <Skeleton className="h-4 w-12 rounded-full" />
+            </TableCell>
+            <TableCell>
+              <Skeleton className="h-4 w-20 rounded-full" />
+            </TableCell>
+            <TableCell>
+              <Skeleton className="h-4 w-6 rounded-full" />
+            </TableCell>
+          </>
+        ),
+      }}
+    >
+      {(table) =>
+        results.totalPages > 1 && (
+          <DataTablePagination additionalInformation="VisibleCount" table={table} />
+        )
+      }
+    </DataTable>
+  );
+};
diff --git a/apps/remix/app/components/tables/team-settings-member-invites-table.tsx b/apps/remix/app/components/tables/organisation-member-invites-table.tsx
similarity index 81%
rename from apps/remix/app/components/tables/team-settings-member-invites-table.tsx
rename to apps/remix/app/components/tables/organisation-member-invites-table.tsx
index fbe1346df..ba7fbf030 100644
--- a/apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+++ b/apps/remix/app/components/tables/organisation-member-invites-table.tsx
@@ -3,11 +3,13 @@ import { useMemo } from 'react';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
+import { OrganisationMemberInviteStatus } from '@prisma/client';
 import { History, MoreHorizontal, Trash2 } from 'lucide-react';
 import { useSearchParams } from 'react-router';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams';
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { ORGANISATION_MEMBER_ROLE_MAP } from '@documenso/lib/constants/organisations-translations';
 import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
 import { trpc } from '@documenso/trpc/react';
 import { AvatarWithText } from '@documenso/ui/primitives/avatar';
@@ -25,32 +27,31 @@ import { Skeleton } from '@documenso/ui/primitives/skeleton';
 import { TableCell } from '@documenso/ui/primitives/table';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { useCurrentTeam } from '~/providers/team';
-
-export const TeamSettingsMemberInvitesTable = () => {
+export const OrganisationMemberInvitesTable = () => {
   const [searchParams] = useSearchParams();
   const updateSearchParams = useUpdateSearchParams();
-  const team = useCurrentTeam();
+  const organisation = useCurrentOrganisation();
 
   const { _, i18n } = useLingui();
   const { toast } = useToast();
 
   const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
 
-  const { data, isLoading, isLoadingError } = trpc.team.findTeamMemberInvites.useQuery(
+  const { data, isLoading, isLoadingError } = trpc.organisation.member.invite.find.useQuery(
     {
-      teamId: team.id,
+      organisationId: organisation.id,
       query: parsedSearchParams.query,
       page: parsedSearchParams.page,
       perPage: parsedSearchParams.perPage,
+      status: OrganisationMemberInviteStatus.PENDING,
     },
     {
       placeholderData: (previousData) => previousData,
     },
   );
 
-  const { mutateAsync: resendTeamMemberInvitation } =
-    trpc.team.resendTeamMemberInvitation.useMutation({
+  const { mutateAsync: resendOrganisationMemberInvitation } =
+    trpc.organisation.member.invite.resend.useMutation({
       onSuccess: () => {
         toast({
           title: _(msg`Success`),
@@ -66,8 +67,8 @@ export const TeamSettingsMemberInvitesTable = () => {
       },
     });
 
-  const { mutateAsync: deleteTeamMemberInvitations } =
-    trpc.team.deleteTeamMemberInvitations.useMutation({
+  const { mutateAsync: deleteOrganisationMemberInvitations } =
+    trpc.organisation.member.invite.deleteMany.useMutation({
       onSuccess: () => {
         toast({
           title: _(msg`Success`),
@@ -100,7 +101,7 @@ export const TeamSettingsMemberInvitesTable = () => {
   const columns = useMemo(() => {
     return [
       {
-        header: _(msg`Team Member`),
+        header: _(msg`Organisation Member`),
         cell: ({ row }) => {
           return (
             <AvatarWithText
@@ -116,7 +117,7 @@ export const TeamSettingsMemberInvitesTable = () => {
       {
         header: _(msg`Role`),
         accessorKey: 'role',
-        cell: ({ row }) => _(TEAM_MEMBER_ROLE_MAP[row.original.role]) ?? row.original.role,
+        cell: ({ row }) => _(ORGANISATION_MEMBER_ROLE_MAP[row.original.organisationRole]),
       },
       {
         header: _(msg`Invited At`),
@@ -138,8 +139,8 @@ export const TeamSettingsMemberInvitesTable = () => {
 
               <DropdownMenuItem
                 onClick={async () =>
-                  resendTeamMemberInvitation({
-                    teamId: team.id,
+                  resendOrganisationMemberInvitation({
+                    organisationId: organisation.id,
                     invitationId: row.original.id,
                   })
                 }
@@ -150,8 +151,8 @@ export const TeamSettingsMemberInvitesTable = () => {
 
               <DropdownMenuItem
                 onClick={async () =>
-                  deleteTeamMemberInvitations({
-                    teamId: team.id,
+                  deleteOrganisationMemberInvitations({
+                    organisationId: organisation.id,
                     invitationIds: [row.original.id],
                   })
                 }
@@ -201,7 +202,11 @@ export const TeamSettingsMemberInvitesTable = () => {
         ),
       }}
     >
-      {(table) => <DataTablePagination additionalInformation="VisibleCount" table={table} />}
+      {(table) =>
+        results.totalPages > 1 && (
+          <DataTablePagination additionalInformation="VisibleCount" table={table} />
+        )
+      }
     </DataTable>
   );
 };
diff --git a/apps/remix/app/components/tables/team-settings-members-table.tsx b/apps/remix/app/components/tables/organisation-members-table.tsx
similarity index 63%
rename from apps/remix/app/components/tables/team-settings-members-table.tsx
rename to apps/remix/app/components/tables/organisation-members-table.tsx
index d1d658ecd..8295efe2a 100644
--- a/apps/remix/app/components/tables/team-settings-members-table.tsx
+++ b/apps/remix/app/components/tables/organisation-members-table.tsx
@@ -3,14 +3,16 @@ import { useMemo } from 'react';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
+import { OrganisationGroupType } from '@prisma/client';
 import { Edit, MoreHorizontal, Trash2 } from 'lucide-react';
 import { useSearchParams } from 'react-router';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams';
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { EXTENDED_ORGANISATION_MEMBER_ROLE_MAP } from '@documenso/lib/constants/organisations-translations';
 import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { isOrganisationRoleWithinUserHierarchy } from '@documenso/lib/utils/organisations';
 import { extractInitials } from '@documenso/lib/utils/recipient-formatter';
-import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
 import { AvatarWithText } from '@documenso/ui/primitives/avatar';
 import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
@@ -26,22 +28,21 @@ import {
 import { Skeleton } from '@documenso/ui/primitives/skeleton';
 import { TableCell } from '@documenso/ui/primitives/table';
 
-import { TeamMemberDeleteDialog } from '~/components/dialogs/team-member-delete-dialog';
-import { TeamMemberUpdateDialog } from '~/components/dialogs/team-member-update-dialog';
-import { useCurrentTeam } from '~/providers/team';
+import { OrganisationMemberDeleteDialog } from '~/components/dialogs/organisation-member-delete-dialog';
+import { OrganisationMemberUpdateDialog } from '~/components/dialogs/organisation-member-update-dialog';
 
-export const TeamSettingsMembersDataTable = () => {
+export const OrganisationMembersDataTable = () => {
   const { _, i18n } = useLingui();
 
   const [searchParams] = useSearchParams();
   const updateSearchParams = useUpdateSearchParams();
-  const team = useCurrentTeam();
+  const organisation = useCurrentOrganisation();
 
   const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
 
-  const { data, isLoading, isLoadingError } = trpc.team.findTeamMembers.useQuery(
+  const { data, isLoading, isLoadingError } = trpc.organisation.member.find.useQuery(
     {
-      teamId: team.id,
+      organisationId: organisation.id,
       query: parsedSearchParams.query,
       page: parsedSearchParams.page,
       perPage: parsedSearchParams.perPage,
@@ -68,20 +69,20 @@ export const TeamSettingsMembersDataTable = () => {
   const columns = useMemo(() => {
     return [
       {
-        header: _(msg`Team Member`),
+        header: _(msg`Organisation Member`),
         cell: ({ row }) => {
-          const avatarFallbackText = row.original.user.name
-            ? extractInitials(row.original.user.name)
-            : row.original.user.email.slice(0, 1).toUpperCase();
+          const avatarFallbackText = row.original.name
+            ? extractInitials(row.original.name)
+            : row.original.email.slice(0, 1).toUpperCase();
 
           return (
             <AvatarWithText
               avatarClass="h-12 w-12"
               avatarFallback={avatarFallbackText}
               primaryText={
-                <span className="text-foreground/80 font-semibold">{row.original.user.name}</span>
+                <span className="text-foreground/80 font-semibold">{row.original.name}</span>
               }
-              secondaryText={row.original.user.email}
+              secondaryText={row.original.email}
             />
           );
         },
@@ -90,15 +91,20 @@ export const TeamSettingsMembersDataTable = () => {
         header: _(msg`Role`),
         accessorKey: 'role',
         cell: ({ row }) =>
-          team.ownerUserId === row.original.userId
+          organisation.ownerUserId === row.original.userId
             ? _(msg`Owner`)
-            : _(TEAM_MEMBER_ROLE_MAP[row.original.role]),
+            : _(EXTENDED_ORGANISATION_MEMBER_ROLE_MAP[row.original.currentOrganisationRole]),
       },
       {
         header: _(msg`Member Since`),
         accessorKey: 'createdAt',
         cell: ({ row }) => i18n.date(row.original.createdAt),
       },
+      {
+        header: _(msg`Groups`),
+        cell: ({ row }) =>
+          row.original.groups.filter((group) => group.type === OrganisationGroupType.CUSTOM).length,
+      },
       {
         header: _(msg`Actions`),
         cell: ({ row }) => (
@@ -112,20 +118,23 @@ export const TeamSettingsMembersDataTable = () => {
                 <Trans>Actions</Trans>
               </DropdownMenuLabel>
 
-              <TeamMemberUpdateDialog
-                currentUserTeamRole={team.currentTeamMember.role}
-                teamId={row.original.teamId}
-                teamMemberId={row.original.id}
-                teamMemberName={row.original.user.name ?? ''}
-                teamMemberRole={row.original.role}
+              <OrganisationMemberUpdateDialog
+                currentUserOrganisationRole={organisation.currentOrganisationRole}
+                organisationId={organisation.id}
+                organisationMemberId={row.original.id}
+                organisationMemberName={row.original.name ?? ''}
+                organisationMemberRole={row.original.currentOrganisationRole}
                 trigger={
                   <DropdownMenuItem
                     disabled={
-                      team.ownerUserId === row.original.userId ||
-                      !isTeamRoleWithinUserHierarchy(team.currentTeamMember.role, row.original.role)
+                      organisation.ownerUserId === row.original.userId ||
+                      !isOrganisationRoleWithinUserHierarchy(
+                        organisation.currentOrganisationRole,
+                        row.original.currentOrganisationRole,
+                      )
                     }
                     onSelect={(e) => e.preventDefault()}
-                    title="Update team member role"
+                    title="Update organisation member role"
                   >
                     <Edit className="mr-2 h-4 w-4" />
                     <Trans>Update role</Trans>
@@ -133,20 +142,21 @@ export const TeamSettingsMembersDataTable = () => {
                 }
               />
 
-              <TeamMemberDeleteDialog
-                teamId={team.id}
-                teamName={team.name}
-                teamMemberId={row.original.id}
-                teamMemberName={row.original.user.name ?? ''}
-                teamMemberEmail={row.original.user.email}
+              <OrganisationMemberDeleteDialog
+                organisationMemberId={row.original.id}
+                organisationMemberName={row.original.name ?? ''}
+                organisationMemberEmail={row.original.email}
                 trigger={
                   <DropdownMenuItem
                     onSelect={(e) => e.preventDefault()}
                     disabled={
-                      team.ownerUserId === row.original.userId ||
-                      !isTeamRoleWithinUserHierarchy(team.currentTeamMember.role, row.original.role)
+                      organisation.ownerUserId === row.original.userId ||
+                      !isOrganisationRoleWithinUserHierarchy(
+                        organisation.currentOrganisationRole,
+                        row.original.currentOrganisationRole,
+                      )
                     }
-                    title={_(msg`Remove team member`)}
+                    title={_(msg`Remove organisation member`)}
                   >
                     <Trash2 className="mr-2 h-4 w-4" />
                     <Trans>Remove</Trans>
@@ -199,7 +209,11 @@ export const TeamSettingsMembersDataTable = () => {
         ),
       }}
     >
-      {(table) => <DataTablePagination additionalInformation="VisibleCount" table={table} />}
+      {(table) =>
+        results.totalPages > 1 && (
+          <DataTablePagination additionalInformation="VisibleCount" table={table} />
+        )
+      }
     </DataTable>
   );
 };
diff --git a/apps/remix/app/components/tables/user-settings-current-teams-table.tsx b/apps/remix/app/components/tables/organisation-teams-table.tsx
similarity index 71%
rename from apps/remix/app/components/tables/user-settings-current-teams-table.tsx
rename to apps/remix/app/components/tables/organisation-teams-table.tsx
index 688a5cb62..ff5085a93 100644
--- a/apps/remix/app/components/tables/user-settings-current-teams-table.tsx
+++ b/apps/remix/app/components/tables/organisation-teams-table.tsx
@@ -7,11 +7,10 @@ import { useSearchParams } from 'react-router';
 import { Link } from 'react-router';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams';
 import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
 import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
-import { canExecuteTeamAction } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
 import { AvatarWithText } from '@documenso/ui/primitives/avatar';
 import { Button } from '@documenso/ui/primitives/button';
@@ -21,26 +20,23 @@ import { DataTablePagination } from '@documenso/ui/primitives/data-table-paginat
 import { Skeleton } from '@documenso/ui/primitives/skeleton';
 import { TableCell } from '@documenso/ui/primitives/table';
 
-import { TeamLeaveDialog } from '~/components/dialogs/team-leave-dialog';
+import { TeamDeleteDialog } from '../dialogs/team-delete-dialog';
 
-export const UserSettingsCurrentTeamsDataTable = () => {
+export const OrganisationTeamsTable = () => {
   const { _, i18n } = useLingui();
 
   const [searchParams] = useSearchParams();
   const updateSearchParams = useUpdateSearchParams();
+  const organisation = useCurrentOrganisation();
 
   const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
 
-  const { data, isLoading, isLoadingError } = trpc.team.findTeams.useQuery(
-    {
-      query: parsedSearchParams.query,
-      page: parsedSearchParams.page,
-      perPage: parsedSearchParams.perPage,
-    },
-    {
-      placeholderData: (previousData) => previousData,
-    },
-  );
+  const { data, isLoading, isLoadingError } = trpc.team.find.useQuery({
+    organisationId: organisation.id,
+    query: parsedSearchParams.query,
+    page: parsedSearchParams.page,
+    perPage: parsedSearchParams.perPage,
+  });
 
   const onPaginationChange = (page: number, perPage: number) => {
     updateSearchParams({
@@ -76,15 +72,7 @@ export const UserSettingsCurrentTeamsDataTable = () => {
         ),
       },
       {
-        header: _(msg`Role`),
-        accessorKey: 'role',
-        cell: ({ row }) =>
-          row.original.ownerUserId === row.original.currentTeamMember.userId
-            ? _(msg`Owner`)
-            : _(TEAM_MEMBER_ROLE_MAP[row.original.currentTeamMember.role]),
-      },
-      {
-        header: _(msg`Member Since`),
+        header: _(msg`Created`),
         accessorKey: 'createdAt',
         cell: ({ row }) => i18n.date(row.original.createdAt),
       },
@@ -92,26 +80,18 @@ export const UserSettingsCurrentTeamsDataTable = () => {
         id: 'actions',
         cell: ({ row }) => (
           <div className="flex justify-end space-x-2">
-            {canExecuteTeamAction('MANAGE_TEAM', row.original.currentTeamMember.role) && (
-              <Button variant="outline" asChild>
-                <Link to={`/t/${row.original.url}/settings`}>
-                  <Trans>Manage</Trans>
-                </Link>
-              </Button>
-            )}
+            <Button variant="outline" asChild>
+              <Link to={`/t/${row.original.url}/settings`}>
+                <Trans>Manage</Trans>
+              </Link>
+            </Button>
 
-            <TeamLeaveDialog
+            <TeamDeleteDialog
               teamId={row.original.id}
               teamName={row.original.name}
-              teamAvatarImageId={row.original.avatarImageId}
-              role={row.original.currentTeamMember.role}
               trigger={
-                <Button
-                  variant="destructive"
-                  disabled={row.original.ownerUserId === row.original.currentTeamMember.userId}
-                  onSelect={(e) => e.preventDefault()}
-                >
-                  <Trans>Leave</Trans>
+                <Button variant="destructive" onSelect={(e) => e.preventDefault()}>
+                  <Trans>Delete</Trans>
                 </Button>
               }
             />
@@ -163,7 +143,11 @@ export const UserSettingsCurrentTeamsDataTable = () => {
         ),
       }}
     >
-      {(table) => <DataTablePagination additionalInformation="VisibleCount" table={table} />}
+      {(table) =>
+        results.totalPages > 1 && (
+          <DataTablePagination additionalInformation="VisibleCount" table={table} />
+        )
+      }
     </DataTable>
   );
 };
diff --git a/apps/remix/app/components/tables/team-groups-table.tsx b/apps/remix/app/components/tables/team-groups-table.tsx
new file mode 100644
index 000000000..3bbf072b4
--- /dev/null
+++ b/apps/remix/app/components/tables/team-groups-table.tsx
@@ -0,0 +1,183 @@
+import { useMemo } from 'react';
+
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { OrganisationGroupType } from '@prisma/client';
+import { EditIcon, MoreHorizontalIcon, Trash2Icon } from 'lucide-react';
+import { useSearchParams } from 'react-router';
+
+import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
+import { EXTENDED_TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams-translations';
+import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { trpc } from '@documenso/trpc/react';
+import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
+import { DataTable } from '@documenso/ui/primitives/data-table';
+import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuTrigger,
+} from '@documenso/ui/primitives/dropdown-menu';
+import { Skeleton } from '@documenso/ui/primitives/skeleton';
+import { TableCell } from '@documenso/ui/primitives/table';
+
+import { useCurrentTeam } from '~/providers/team';
+
+import { TeamGroupDeleteDialog } from '../dialogs/team-group-delete-dialog';
+import { TeamGroupUpdateDialog } from '../dialogs/team-group-update-dialog';
+
+export const TeamGroupsTable = () => {
+  const { _, i18n } = useLingui();
+
+  const [searchParams] = useSearchParams();
+  const updateSearchParams = useUpdateSearchParams();
+  const team = useCurrentTeam();
+
+  const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
+
+  const { data, isLoading, isLoadingError } = trpc.team.group.find.useQuery(
+    {
+      teamId: team.id,
+      query: parsedSearchParams.query,
+      page: parsedSearchParams.page,
+      perPage: parsedSearchParams.perPage,
+      types: [OrganisationGroupType.CUSTOM],
+    },
+    {
+      placeholderData: (previousData) => previousData,
+    },
+  );
+
+  const onPaginationChange = (page: number, perPage: number) => {
+    updateSearchParams({
+      page,
+      perPage,
+    });
+  };
+
+  const results = data ?? {
+    data: [],
+    perPage: 10,
+    currentPage: 1,
+    totalPages: 1,
+  };
+
+  const columns = useMemo(() => {
+    return [
+      {
+        header: _(msg`Group`),
+        accessorKey: 'name',
+      },
+      {
+        header: _(msg`Role`),
+        accessorKey: 'teamRole',
+        cell: ({ row }) => _(EXTENDED_TEAM_MEMBER_ROLE_MAP[row.original.teamRole]),
+      },
+      {
+        header: _(msg`Members`),
+        accessorKey: 'members',
+        cell: ({ row }) => row.original.members.length,
+      },
+      {
+        header: _(msg`Actions`),
+        cell: ({ row }) => (
+          <DropdownMenu>
+            <DropdownMenuTrigger>
+              <MoreHorizontalIcon className="text-muted-foreground h-5 w-5" />
+            </DropdownMenuTrigger>
+
+            <DropdownMenuContent className="w-52" align="start" forceMount>
+              <DropdownMenuLabel>
+                <Trans>Actions</Trans>
+              </DropdownMenuLabel>
+
+              <TeamGroupUpdateDialog
+                teamGroupId={row.original.id}
+                teamGroupName={row.original.name ?? ''}
+                teamGroupRole={row.original.teamRole}
+                trigger={
+                  <DropdownMenuItem
+                    onSelect={(e) => e.preventDefault()}
+                    title="Update team group role"
+                  >
+                    <EditIcon className="mr-2 h-4 w-4" />
+                    <Trans>Update role</Trans>
+                  </DropdownMenuItem>
+                }
+              />
+
+              <TeamGroupDeleteDialog
+                teamGroupId={row.original.id}
+                teamGroupName={row.original.name ?? ''}
+                teamGroupRole={row.original.teamRole}
+                trigger={
+                  <DropdownMenuItem onSelect={(e) => e.preventDefault()}>
+                    <Trash2Icon className="mr-2 h-4 w-4" />
+                    <Trans>Remove</Trans>
+                  </DropdownMenuItem>
+                }
+              />
+            </DropdownMenuContent>
+          </DropdownMenu>
+        ),
+      },
+    ] satisfies DataTableColumnDef<(typeof results)['data'][number]>[];
+  }, []);
+
+  return (
+    <DataTable
+      columns={columns}
+      data={results.data}
+      perPage={results.perPage}
+      currentPage={results.currentPage}
+      totalPages={results.totalPages}
+      onPaginationChange={onPaginationChange}
+      error={{
+        enable: isLoadingError,
+      }}
+      emptyState={
+        <div className="text-muted-foreground/60 flex h-60 flex-col items-center justify-center gap-y-4">
+          <p>
+            <Trans>No team groups found</Trans>
+          </p>
+        </div>
+      }
+      skeleton={{
+        enable: isLoading,
+        rows: 3,
+        component: (
+          <>
+            <TableCell className="w-1/2 py-4 pr-4">
+              <div className="flex w-full flex-row items-center">
+                <Skeleton className="h-12 w-12 flex-shrink-0 rounded-full" />
+
+                <div className="ml-2 flex flex-grow flex-col">
+                  <Skeleton className="h-4 w-1/3 max-w-[8rem]" />
+                  <Skeleton className="mt-1 h-4 w-1/2 max-w-[12rem]" />
+                </div>
+              </div>
+            </TableCell>
+            <TableCell>
+              <Skeleton className="h-4 w-12 rounded-full" />
+            </TableCell>
+            <TableCell>
+              <Skeleton className="h-4 w-20 rounded-full" />
+            </TableCell>
+            <TableCell>
+              <Skeleton className="h-4 w-6 rounded-full" />
+            </TableCell>
+          </>
+        ),
+      }}
+    >
+      {(table) =>
+        results.totalPages > 1 && (
+          <DataTablePagination additionalInformation="VisibleCount" table={table} />
+        )
+      }
+    </DataTable>
+  );
+};
diff --git a/apps/remix/app/components/tables/team-members-table.tsx b/apps/remix/app/components/tables/team-members-table.tsx
new file mode 100644
index 000000000..02771c322
--- /dev/null
+++ b/apps/remix/app/components/tables/team-members-table.tsx
@@ -0,0 +1,240 @@
+import { useMemo } from 'react';
+
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { OrganisationGroupType, OrganisationMemberRole } from '@prisma/client';
+import { EditIcon, MoreHorizontal, Trash2Icon } from 'lucide-react';
+import { useSearchParams } from 'react-router';
+
+import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { EXTENDED_TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams-translations';
+import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { extractInitials } from '@documenso/lib/utils/recipient-formatter';
+import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
+import { trpc } from '@documenso/trpc/react';
+import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';
+import { AvatarWithText } from '@documenso/ui/primitives/avatar';
+import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
+import { DataTable } from '@documenso/ui/primitives/data-table';
+import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuTrigger,
+} from '@documenso/ui/primitives/dropdown-menu';
+import { Skeleton } from '@documenso/ui/primitives/skeleton';
+import { TableCell } from '@documenso/ui/primitives/table';
+
+import { useCurrentTeam } from '~/providers/team';
+
+import { TeamMemberDeleteDialog } from '../dialogs/team-member-delete-dialog';
+import { TeamMemberUpdateDialog } from '../dialogs/team-member-update-dialog';
+import { TeamInheritMemberAlert } from '../general/teams/team-inherit-member-alert';
+
+export const TeamMembersTable = () => {
+  const { _ } = useLingui();
+
+  const [searchParams] = useSearchParams();
+  const updateSearchParams = useUpdateSearchParams();
+
+  const organisation = useCurrentOrganisation();
+  const team = useCurrentTeam();
+
+  const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
+
+  const groupQuery = trpc.team.group.find.useQuery({
+    teamId: team.id,
+    types: [OrganisationGroupType.INTERNAL_ORGANISATION, OrganisationGroupType.INTERNAL_TEAM],
+    organisationRoles: [OrganisationMemberRole.MEMBER],
+    perPage: 100, // Lets hope this is enough.
+  });
+
+  const { data, isLoading, isLoadingError } = trpc.team.member.find.useQuery(
+    {
+      teamId: team.id,
+      query: parsedSearchParams.query,
+      page: parsedSearchParams.page,
+      perPage: parsedSearchParams.perPage,
+    },
+    {
+      placeholderData: (previousData) => previousData,
+    },
+  );
+
+  const onPaginationChange = (page: number, perPage: number) => {
+    updateSearchParams({
+      page,
+      perPage,
+    });
+  };
+
+  const results = data ?? {
+    data: [],
+    perPage: 10,
+    currentPage: 1,
+    totalPages: 1,
+  };
+
+  const groups = groupQuery.data?.data ?? [];
+
+  const memberAccessTeamGroup = groups.find(
+    (group) =>
+      group.organisationGroupType === OrganisationGroupType.INTERNAL_ORGANISATION &&
+      group.teamRole === OrganisationMemberRole.MEMBER,
+  );
+
+  const columns = useMemo(() => {
+    return [
+      {
+        header: _(msg`Team Member`),
+        cell: ({ row }) => {
+          const avatarFallbackText = row.original.name
+            ? extractInitials(row.original.name)
+            : row.original.email.slice(0, 1).toUpperCase();
+
+          return (
+            <AvatarWithText
+              avatarClass="h-12 w-12"
+              avatarFallback={avatarFallbackText}
+              primaryText={
+                <span className="text-foreground/80 font-semibold">{row.original.name}</span>
+              }
+              secondaryText={row.original.email}
+            />
+          );
+        },
+      },
+      {
+        header: _(msg`Role`),
+        accessorKey: 'role',
+        cell: ({ row }) => _(EXTENDED_TEAM_MEMBER_ROLE_MAP[row.original.teamRole]),
+      },
+      {
+        header: _(msg`Source`),
+        cell: ({ row }) => {
+          const internalTeamGroupFound = groups.find(
+            (group) =>
+              group.organisationGroupType === OrganisationGroupType.INTERNAL_TEAM &&
+              group.members.some((member) => member.id === row.original.id),
+          );
+
+          return internalTeamGroupFound ? _(msg`Member`) : _(msg`Group`);
+        },
+      },
+      {
+        header: _(msg`Actions`),
+        cell: ({ row }) => (
+          <DropdownMenu>
+            <DropdownMenuTrigger>
+              <MoreHorizontal className="text-muted-foreground h-5 w-5" />
+            </DropdownMenuTrigger>
+
+            <DropdownMenuContent className="w-52" align="start" forceMount>
+              <DropdownMenuLabel>
+                <Trans>Actions</Trans>
+              </DropdownMenuLabel>
+
+              <TeamMemberUpdateDialog
+                currentUserTeamRole={team.currentTeamRole}
+                teamId={team.id}
+                memberId={row.original.id}
+                memberName={row.original.name ?? ''}
+                memberTeamRole={row.original.teamRole}
+                trigger={
+                  <DropdownMenuItem
+                    disabled={
+                      organisation.ownerUserId === row.original.userId ||
+                      !isTeamRoleWithinUserHierarchy(team.currentTeamRole, row.original.teamRole)
+                    }
+                    onSelect={(e) => e.preventDefault()}
+                    title="Update team member role"
+                  >
+                    <EditIcon className="mr-2 h-4 w-4" />
+                    <Trans>Update role</Trans>
+                  </DropdownMenuItem>
+                }
+              />
+
+              <TeamMemberDeleteDialog
+                teamId={team.id}
+                teamName={team.name}
+                memberId={row.original.id}
+                memberName={row.original.name ?? ''}
+                memberEmail={row.original.email}
+                isInheritMemberEnabled={memberAccessTeamGroup !== undefined}
+                trigger={
+                  <DropdownMenuItem
+                    onSelect={(e) => e.preventDefault()}
+                    disabled={
+                      organisation.ownerUserId === row.original.userId ||
+                      !isTeamRoleWithinUserHierarchy(team.currentTeamRole, row.original.teamRole)
+                    }
+                    title={_(msg`Remove team member`)}
+                  >
+                    <Trash2Icon className="mr-2 h-4 w-4" />
+                    <Trans>Remove</Trans>
+                  </DropdownMenuItem>
+                }
+              />
+            </DropdownMenuContent>
+          </DropdownMenu>
+        ),
+      },
+    ] satisfies DataTableColumnDef<(typeof results)['data'][number]>[];
+  }, [groups]);
+
+  return (
+    <div className="space-y-8">
+      <DataTable
+        columns={columns}
+        data={results.data}
+        perPage={results.perPage}
+        currentPage={results.currentPage}
+        totalPages={results.totalPages}
+        onPaginationChange={onPaginationChange}
+        error={{
+          enable: isLoadingError,
+        }}
+        skeleton={{
+          enable: isLoading || groupQuery.isPending,
+          rows: 3,
+          component: (
+            <>
+              <TableCell className="w-1/2 py-4 pr-4">
+                <div className="flex w-full flex-row items-center">
+                  <Skeleton className="h-12 w-12 flex-shrink-0 rounded-full" />
+
+                  <div className="ml-2 flex flex-grow flex-col">
+                    <Skeleton className="h-4 w-1/3 max-w-[8rem]" />
+                    <Skeleton className="mt-1 h-4 w-1/2 max-w-[12rem]" />
+                  </div>
+                </div>
+              </TableCell>
+              <TableCell>
+                <Skeleton className="h-4 w-12 rounded-full" />
+              </TableCell>
+              <TableCell>
+                <Skeleton className="h-4 w-20 rounded-full" />
+              </TableCell>
+              <TableCell>
+                <Skeleton className="h-4 w-6 rounded-full" />
+              </TableCell>
+            </>
+          ),
+        }}
+      >
+        {(table) => <DataTablePagination additionalInformation="VisibleCount" table={table} />}
+      </DataTable>
+
+      <AnimateGenericFadeInOut key={groupQuery.isPending ? 'pending' : 'fetched'}>
+        {!groupQuery.isPending && (
+          <TeamInheritMemberAlert memberAccessTeamGroup={memberAccessTeamGroup || null} />
+        )}
+      </AnimateGenericFadeInOut>
+    </div>
+  );
+};
diff --git a/apps/remix/app/components/tables/templates-table-action-dropdown.tsx b/apps/remix/app/components/tables/templates-table-action-dropdown.tsx
index f52b9967b..91f8ec9b2 100644
--- a/apps/remix/app/components/tables/templates-table-action-dropdown.tsx
+++ b/apps/remix/app/components/tables/templates-table-action-dropdown.tsx
@@ -2,16 +2,7 @@ import { useState } from 'react';
 
 import { Trans } from '@lingui/react/macro';
 import type { Recipient, Template, TemplateDirectLink } from '@prisma/client';
-import {
-  Copy,
-  Edit,
-  FolderIcon,
-  MoreHorizontal,
-  MoveRight,
-  Share2Icon,
-  Trash2,
-  Upload,
-} from 'lucide-react';
+import { Copy, Edit, FolderIcon, MoreHorizontal, Share2Icon, Trash2, Upload } from 'lucide-react';
 import { Link } from 'react-router';
 
 import { useSession } from '@documenso/lib/client-only/providers/session';
@@ -27,7 +18,6 @@ import { TemplateBulkSendDialog } from '../dialogs/template-bulk-send-dialog';
 import { TemplateDeleteDialog } from '../dialogs/template-delete-dialog';
 import { TemplateDirectLinkDialog } from '../dialogs/template-direct-link-dialog';
 import { TemplateDuplicateDialog } from '../dialogs/template-duplicate-dialog';
-import { TemplateMoveDialog } from '../dialogs/template-move-dialog';
 import { TemplateMoveToFolderDialog } from '../dialogs/template-move-to-folder-dialog';
 
 export type TemplatesTableActionDropdownProps = {
@@ -36,15 +26,8 @@ export type TemplatesTableActionDropdownProps = {
     recipients: Recipient[];
   };
   templateRootPath: string;
-  teamId?: number;
+  teamId: number;
   onDelete?: () => Promise<void> | void;
-  onMove?: ({
-    templateId,
-    teamUrl,
-  }: {
-    templateId: number;
-    teamUrl: string;
-  }) => Promise<void> | void;
 };
 
 export const TemplatesTableActionDropdown = ({
@@ -52,22 +35,18 @@ export const TemplatesTableActionDropdown = ({
   templateRootPath,
   teamId,
   onDelete,
-  onMove,
 }: TemplatesTableActionDropdownProps) => {
   const { user } = useSession();
 
   const [isDeleteDialogOpen, setDeleteDialogOpen] = useState(false);
   const [isTemplateDirectLinkDialogOpen, setTemplateDirectLinkDialogOpen] = useState(false);
   const [isDuplicateDialogOpen, setDuplicateDialogOpen] = useState(false);
-  const [isMoveDialogOpen, setMoveDialogOpen] = useState(false);
   const [isMoveToFolderDialogOpen, setMoveToFolderDialogOpen] = useState(false);
 
   const isOwner = row.userId === user.id;
   const isTeamTemplate = row.teamId === teamId;
 
-  const formatPath = row.folderId
-    ? `${templateRootPath}/f/${row.folderId}/${row.id}/edit`
-    : `${templateRootPath}/${row.id}/edit`;
+  const formatPath = `${templateRootPath}/${row.id}/edit`;
 
   return (
     <DropdownMenu>
@@ -103,13 +82,6 @@ export const TemplatesTableActionDropdown = ({
           <Trans>Move to Folder</Trans>
         </DropdownMenuItem>
 
-        {!teamId && !row.teamId && (
-          <DropdownMenuItem onClick={() => setMoveDialogOpen(true)}>
-            <MoveRight className="mr-2 h-4 w-4" />
-            <Trans>Move to Team</Trans>
-          </DropdownMenuItem>
-        )}
-
         <TemplateBulkSendDialog
           templateId={row.id}
           recipients={row.recipients}
@@ -142,13 +114,6 @@ export const TemplatesTableActionDropdown = ({
         onOpenChange={setTemplateDirectLinkDialogOpen}
       />
 
-      <TemplateMoveDialog
-        templateId={row.id}
-        open={isMoveDialogOpen}
-        onOpenChange={setMoveDialogOpen}
-        onMove={onMove}
-      />
-
       <TemplateDeleteDialog
         id={row.id}
         open={isDeleteDialogOpen}
diff --git a/apps/remix/app/components/tables/templates-table.tsx b/apps/remix/app/components/tables/templates-table.tsx
index 10ff18ef7..f1423970a 100644
--- a/apps/remix/app/components/tables/templates-table.tsx
+++ b/apps/remix/app/components/tables/templates-table.tsx
@@ -8,6 +8,7 @@ import { Link } from 'react-router';
 
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { formatTemplatesPath } from '@documenso/lib/utils/teams';
 import type { TFindTemplatesResponse } from '@documenso/trpc/server/template-router/schema';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
@@ -19,7 +20,7 @@ import { TableCell } from '@documenso/ui/primitives/table';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
 
 import { TemplateType } from '~/components/general/template/template-type';
-import { useOptionalCurrentTeam } from '~/providers/team';
+import { useCurrentTeam } from '~/providers/team';
 
 import { TemplateUseDialog } from '../dialogs/template-use-dialog';
 import { TemplateDirectLinkBadge } from '../general/template/template-direct-link-badge';
@@ -45,19 +46,15 @@ export const TemplatesTable = ({
   const { _, i18n } = useLingui();
   const { remaining } = useLimits();
 
-  const team = useOptionalCurrentTeam();
+  const team = useCurrentTeam();
+  const organisation = useCurrentOrganisation();
 
   const [isPending, startTransition] = useTransition();
 
   const updateSearchParams = useUpdateSearchParams();
 
   const formatTemplateLink = (row: TemplatesTableRow) => {
-    const isCurrentTeamTemplate = team?.url && row.team?.url === team?.url;
-    const path = formatTemplatesPath(isCurrentTeamTemplate ? team?.url : undefined);
-
-    if (row.folderId) {
-      return `${path}/f/${row.folderId}/${row.id}`;
-    }
+    const path = formatTemplatesPath(team.url);
 
     return `${path}/${row.id}`;
   };
@@ -208,7 +205,10 @@ export const TemplatesTable = ({
           <AlertDescription className="mt-2">
             <Trans>
               You have reached your document limit.{' '}
-              <Link className="underline underline-offset-4" to="/settings/billing">
+              <Link
+                className="underline underline-offset-4"
+                to={`/o/${organisation.url}/settings/billing`}
+              >
                 Upgrade your account to continue!
               </Link>
             </Trans>
diff --git a/apps/remix/app/components/tables/user-organisations-table.tsx b/apps/remix/app/components/tables/user-organisations-table.tsx
new file mode 100644
index 000000000..5259e64b4
--- /dev/null
+++ b/apps/remix/app/components/tables/user-organisations-table.tsx
@@ -0,0 +1,169 @@
+import { useMemo } from 'react';
+
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { Link } from 'react-router';
+
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { ORGANISATION_MEMBER_ROLE_MAP } from '@documenso/lib/constants/organisations-translations';
+import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
+import { canExecuteOrganisationAction, isPersonalLayout } from '@documenso/lib/utils/organisations';
+import { trpc } from '@documenso/trpc/react';
+import { AvatarWithText } from '@documenso/ui/primitives/avatar';
+import { Button } from '@documenso/ui/primitives/button';
+import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
+import { DataTable } from '@documenso/ui/primitives/data-table';
+import { Skeleton } from '@documenso/ui/primitives/skeleton';
+import { TableCell } from '@documenso/ui/primitives/table';
+
+import { OrganisationLeaveDialog } from '../dialogs/organisation-leave-dialog';
+
+export const UserOrganisationsTable = () => {
+  const { _, i18n } = useLingui();
+  const { user, organisations } = useSession();
+
+  const { data, isLoading, isLoadingError } = trpc.organisation.getMany.useQuery(undefined, {
+    initialData: organisations.map((org) => ({
+      ...org,
+      currentMemberId: '', // Unsed dummy data.
+    })),
+  });
+
+  const isPersonalLayoutMode = isPersonalLayout(data);
+
+  const results = {
+    data: data || [],
+    perPage: 10,
+    currentPage: 1,
+    totalPages: 1,
+  };
+
+  const columns = useMemo(() => {
+    return [
+      {
+        header: _(msg`Organisation`),
+        accessorKey: 'name',
+        cell: ({ row }) => (
+          <Link
+            to={isPersonalLayoutMode ? `/settings/organisations` : `/o/${row.original.url}`}
+            preventScrollReset={true}
+          >
+            <AvatarWithText
+              avatarSrc={formatAvatarUrl(row.original.avatarImageId)}
+              avatarClass="h-12 w-12"
+              avatarFallback={row.original.name.slice(0, 1).toUpperCase()}
+              primaryText={
+                <span className="text-foreground/80 font-semibold">
+                  {isPersonalLayoutMode ? _(msg`Personal`) : row.original.name}
+                </span>
+              }
+              secondaryText={
+                isPersonalLayoutMode
+                  ? _(msg`Your personal organisation`)
+                  : `${NEXT_PUBLIC_WEBAPP_URL()}/o/${row.original.url}`
+              }
+            />
+          </Link>
+        ),
+      },
+      {
+        header: _(msg`Role`),
+        accessorKey: 'role',
+        cell: ({ row }) =>
+          row.original.ownerUserId === user.id
+            ? _(msg`Owner`)
+            : _(ORGANISATION_MEMBER_ROLE_MAP[row.original.currentOrganisationRole]),
+      },
+      {
+        header: _(msg`Created At`),
+        accessorKey: 'createdAt',
+        cell: ({ row }) => i18n.date(row.original.createdAt),
+      },
+      {
+        id: 'actions',
+        cell: ({ row }) => (
+          <div className="flex justify-end space-x-2">
+            {canExecuteOrganisationAction(
+              'MANAGE_ORGANISATION',
+              row.original.currentOrganisationRole,
+            ) && (
+              <Button variant="outline" asChild>
+                <Link to={`/o/${row.original.url}/settings`}>
+                  <Trans>Manage</Trans>
+                </Link>
+              </Button>
+            )}
+
+            <OrganisationLeaveDialog
+              organisationId={row.original.id}
+              organisationName={row.original.name}
+              organisationAvatarImageId={row.original.avatarImageId}
+              role={row.original.currentOrganisationRole}
+              trigger={
+                <Button
+                  variant="destructive"
+                  disabled={row.original.ownerUserId === user.id}
+                  onSelect={(e) => e.preventDefault()}
+                >
+                  <Trans>Leave</Trans>
+                </Button>
+              }
+            />
+          </div>
+        ),
+      },
+    ] satisfies DataTableColumnDef<(typeof results)['data'][number]>[];
+  }, [isPersonalLayoutMode]);
+
+  return (
+    <div>
+      <DataTable
+        columns={columns}
+        data={results.data}
+        perPage={results.perPage}
+        currentPage={results.currentPage}
+        totalPages={results.totalPages}
+        error={{
+          enable: isLoadingError,
+        }}
+        columnVisibility={{
+          actions: !isPersonalLayoutMode,
+        }}
+        skeleton={{
+          enable: isLoading,
+          rows: 3,
+          component: (
+            <>
+              <TableCell className="w-1/3 py-4 pr-4">
+                <div className="flex w-full flex-row items-center">
+                  <Skeleton className="h-12 w-12 flex-shrink-0 rounded-full" />
+
+                  <div className="ml-2 flex flex-grow flex-col">
+                    <Skeleton className="h-4 w-1/2 max-w-[8rem]" />
+                    <Skeleton className="mt-1 h-4 w-2/3 max-w-[12rem]" />
+                  </div>
+                </div>
+              </TableCell>
+              <TableCell>
+                <Skeleton className="h-4 w-12 rounded-full" />
+              </TableCell>
+              <TableCell>
+                <Skeleton className="h-4 w-20 rounded-full" />
+              </TableCell>
+              {!isPersonalLayoutMode && (
+                <TableCell>
+                  <div className="flex flex-row justify-end space-x-2">
+                    <Skeleton className="h-10 w-20 rounded" />
+                    <Skeleton className="h-10 w-16 rounded" />
+                  </div>
+                </TableCell>
+              )}
+            </>
+          ),
+        }}
+      />
+    </div>
+  );
+};
diff --git a/apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx b/apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
deleted file mode 100644
index f57edfb96..000000000
--- a/apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-
-import { trpc } from '@documenso/trpc/react';
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export type UserSettingsPendingTeamsTableActionsProps = {
-  className?: string;
-  pendingTeamId: number;
-  onPayClick: (pendingTeamId: number) => void;
-};
-
-export const UserSettingsPendingTeamsTableActions = ({
-  className,
-  pendingTeamId,
-  onPayClick,
-}: UserSettingsPendingTeamsTableActionsProps) => {
-  const { _ } = useLingui();
-  const { toast } = useToast();
-
-  const { mutateAsync: deleteTeamPending, isPending: deletingTeam } =
-    trpc.team.deleteTeamPending.useMutation({
-      onSuccess: () => {
-        toast({
-          title: _(msg`Success`),
-          description: _(msg`Pending team deleted.`),
-        });
-      },
-      onError: () => {
-        toast({
-          title: _(msg`Something went wrong`),
-          description: _(
-            msg`We encountered an unknown error while attempting to delete the pending team. Please try again later.`,
-          ),
-          duration: 10000,
-          variant: 'destructive',
-        });
-      },
-    });
-
-  return (
-    <fieldset disabled={deletingTeam} className={cn('flex justify-end space-x-2', className)}>
-      <Button variant="outline" onClick={() => onPayClick(pendingTeamId)}>
-        <Trans>Pay</Trans>
-      </Button>
-
-      <Button
-        variant="destructive"
-        loading={deletingTeam}
-        onClick={async () => deleteTeamPending({ pendingTeamId: pendingTeamId })}
-      >
-        <Trans>Remove</Trans>
-      </Button>
-    </fieldset>
-  );
-};
diff --git a/apps/remix/app/components/tables/user-settings-pending-teams-table.tsx b/apps/remix/app/components/tables/user-settings-pending-teams-table.tsx
deleted file mode 100644
index bdd86b4eb..000000000
--- a/apps/remix/app/components/tables/user-settings-pending-teams-table.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import { useEffect, useMemo, useState } from 'react';
-
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { useSearchParams } from 'react-router';
-
-import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
-import { trpc } from '@documenso/trpc/react';
-import { AvatarWithText } from '@documenso/ui/primitives/avatar';
-import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
-import { DataTable } from '@documenso/ui/primitives/data-table';
-import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
-import { Skeleton } from '@documenso/ui/primitives/skeleton';
-import { TableCell } from '@documenso/ui/primitives/table';
-
-import { TeamCheckoutCreateDialog } from '~/components/dialogs/team-checkout-create-dialog';
-
-import { UserSettingsPendingTeamsTableActions } from './user-settings-pending-teams-table-actions';
-
-export const UserSettingsPendingTeamsDataTable = () => {
-  const { _, i18n } = useLingui();
-
-  const [searchParams] = useSearchParams();
-  const updateSearchParams = useUpdateSearchParams();
-
-  const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
-
-  const [checkoutPendingTeamId, setCheckoutPendingTeamId] = useState<number | null>(null);
-
-  const { data, isLoading, isLoadingError } = trpc.team.findTeamsPending.useQuery(
-    {
-      query: parsedSearchParams.query,
-      page: parsedSearchParams.page,
-      perPage: parsedSearchParams.perPage,
-    },
-    {
-      placeholderData: (previousData) => previousData,
-    },
-  );
-
-  const onPaginationChange = (page: number, perPage: number) => {
-    updateSearchParams({
-      page,
-      perPage,
-    });
-  };
-
-  const results = data ?? {
-    data: [],
-    perPage: 10,
-    currentPage: 1,
-    totalPages: 1,
-  };
-
-  const columns = useMemo(() => {
-    return [
-      {
-        header: _(msg`Team`),
-        accessorKey: 'name',
-        cell: ({ row }) => (
-          <AvatarWithText
-            avatarClass="h-12 w-12"
-            avatarFallback={row.original.name.slice(0, 1).toUpperCase()}
-            primaryText={
-              <span className="text-foreground/80 font-semibold">{row.original.name}</span>
-            }
-            secondaryText={`${NEXT_PUBLIC_WEBAPP_URL()}/t/${row.original.url}`}
-          />
-        ),
-      },
-      {
-        header: _(msg`Created on`),
-        accessorKey: 'createdAt',
-        cell: ({ row }) => i18n.date(row.original.createdAt),
-      },
-      {
-        id: 'actions',
-        cell: ({ row }) => (
-          <UserSettingsPendingTeamsTableActions
-            className="justify-end"
-            pendingTeamId={row.original.id}
-            onPayClick={setCheckoutPendingTeamId}
-          />
-        ),
-      },
-    ] satisfies DataTableColumnDef<(typeof results)['data'][number]>[];
-  }, []);
-
-  useEffect(() => {
-    const searchParamCheckout = searchParams?.get('checkout');
-
-    if (searchParamCheckout && !isNaN(parseInt(searchParamCheckout))) {
-      setCheckoutPendingTeamId(parseInt(searchParamCheckout));
-      updateSearchParams({ checkout: null });
-    }
-  }, [searchParams, updateSearchParams]);
-
-  return (
-    <>
-      <DataTable
-        columns={columns}
-        data={results.data}
-        perPage={results.perPage}
-        currentPage={results.currentPage}
-        totalPages={results.totalPages}
-        onPaginationChange={onPaginationChange}
-        error={{
-          enable: isLoadingError,
-        }}
-        skeleton={{
-          enable: isLoading,
-          rows: 3,
-          component: (
-            <>
-              <TableCell className="w-1/3 py-4 pr-4">
-                <div className="flex w-full flex-row items-center">
-                  <Skeleton className="h-12 w-12 flex-shrink-0 rounded-full" />
-
-                  <div className="ml-2 flex flex-grow flex-col">
-                    <Skeleton className="h-4 w-1/2 max-w-[8rem]" />
-                    <Skeleton className="mt-1 h-4 w-2/3 max-w-[12rem]" />
-                  </div>
-                </div>
-              </TableCell>
-              <TableCell>
-                <Skeleton className="h-4 w-12 rounded-full" />
-              </TableCell>
-              <TableCell>
-                <div className="flex flex-row justify-end space-x-2">
-                  <Skeleton className="h-10 w-16 rounded" />
-                  <Skeleton className="h-10 w-20 rounded" />
-                </div>
-              </TableCell>
-            </>
-          ),
-        }}
-      >
-        {(table) => <DataTablePagination additionalInformation="VisibleCount" table={table} />}
-      </DataTable>
-
-      <TeamCheckoutCreateDialog
-        pendingTeamId={checkoutPendingTeamId}
-        onClose={() => setCheckoutPendingTeamId(null)}
-      />
-    </>
-  );
-};
diff --git a/apps/remix/app/components/tables/user-settings-teams-page-table.tsx b/apps/remix/app/components/tables/user-settings-teams-page-table.tsx
deleted file mode 100644
index 8773c9b73..000000000
--- a/apps/remix/app/components/tables/user-settings-teams-page-table.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { useEffect, useState } from 'react';
-
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import { Link, useSearchParams } from 'react-router';
-import { useLocation } from 'react-router';
-
-import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
-import { trpc } from '@documenso/trpc/react';
-import { Input } from '@documenso/ui/primitives/input';
-import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
-
-import { UserSettingsCurrentTeamsDataTable } from './user-settings-current-teams-table';
-import { UserSettingsPendingTeamsDataTable } from './user-settings-pending-teams-table';
-
-export const UserSettingsTeamsPageDataTable = () => {
-  const { _ } = useLingui();
-
-  const [searchParams, setSearchParams] = useSearchParams();
-  const { pathname } = useLocation();
-
-  const [searchQuery, setSearchQuery] = useState(() => searchParams?.get('query') ?? '');
-
-  const debouncedSearchQuery = useDebouncedValue(searchQuery, 500);
-
-  const currentTab = searchParams?.get('tab') === 'pending' ? 'pending' : 'active';
-
-  const { data } = trpc.team.findTeamsPending.useQuery(
-    {},
-    {
-      placeholderData: (previousData) => previousData,
-    },
-  );
-
-  /**
-   * Handle debouncing the search query.
-   */
-  useEffect(() => {
-    const params = new URLSearchParams(searchParams?.toString());
-
-    params.set('query', debouncedSearchQuery);
-
-    if (debouncedSearchQuery === '') {
-      params.delete('query');
-    }
-
-    setSearchParams(params);
-  }, [debouncedSearchQuery, pathname, searchParams]);
-
-  return (
-    <div>
-      <div className="my-4 flex flex-row items-center justify-between space-x-4">
-        <Input
-          defaultValue={searchQuery}
-          onChange={(e) => setSearchQuery(e.target.value)}
-          placeholder={_(msg`Search`)}
-        />
-
-        <Tabs value={currentTab} className="flex-shrink-0 overflow-x-auto">
-          <TabsList>
-            <TabsTrigger className="min-w-[60px]" value="active" asChild>
-              <Link to={pathname ?? '/'}>
-                <Trans>Active</Trans>
-              </Link>
-            </TabsTrigger>
-
-            <TabsTrigger className="min-w-[60px]" value="pending" asChild>
-              <Link to={`${pathname}?tab=pending`}>
-                <Trans>Pending</Trans>
-                {data && data.count > 0 && (
-                  <span className="ml-1 hidden opacity-50 md:inline-block">{data.count}</span>
-                )}
-              </Link>
-            </TabsTrigger>
-          </TabsList>
-        </Tabs>
-      </div>
-
-      {currentTab === 'pending' ? (
-        <UserSettingsPendingTeamsDataTable />
-      ) : (
-        <UserSettingsCurrentTeamsDataTable />
-      )}
-    </div>
-  );
-};
diff --git a/apps/remix/app/providers/team.tsx b/apps/remix/app/providers/team.tsx
index f0777d6d0..d77c77428 100644
--- a/apps/remix/app/providers/team.tsx
+++ b/apps/remix/app/providers/team.tsx
@@ -1,13 +1,13 @@
 import { createContext, useContext } from 'react';
 import React from 'react';
 
-import type { TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
+import type { TeamSession } from '@documenso/trpc/server/organisation-router/get-organisation-session.types';
 
-type TeamProviderValue = TGetTeamsResponse[0];
+type TeamProviderValue = TeamSession;
 
 interface TeamProviderProps {
   children: React.ReactNode;
-  team: TeamProviderValue;
+  team: TeamProviderValue | null;
 }
 
 const TeamContext = createContext<TeamProviderValue | null>(null);
diff --git a/apps/remix/app/root.tsx b/apps/remix/app/root.tsx
index c9a453622..4732783d1 100644
--- a/apps/remix/app/root.tsx
+++ b/apps/remix/app/root.tsx
@@ -17,10 +17,10 @@ import { PreventFlashOnWrongTheme, ThemeProvider, useTheme } from 'remix-themes'
 import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
 import { SessionProvider } from '@documenso/lib/client-only/providers/session';
 import { APP_I18N_OPTIONS, type SupportedLanguageCodes } from '@documenso/lib/constants/i18n';
-import { type TGetTeamsResponse, getTeams } from '@documenso/lib/server-only/team/get-teams';
 import { createPublicEnv, env } from '@documenso/lib/utils/env';
 import { extractLocaleData } from '@documenso/lib/utils/i18n';
 import { TrpcProvider } from '@documenso/trpc/react';
+import { getOrganisationSession } from '@documenso/trpc/server/organisation-router/get-organisation-session';
 import { Toaster } from '@documenso/ui/primitives/toaster';
 import { TooltipProvider } from '@documenso/ui/primitives/tooltip';
 
@@ -68,12 +68,6 @@ export const shouldRevalidate = () => false;
 export async function loader({ request }: Route.LoaderArgs) {
   const session = await getOptionalSession(request);
 
-  let teams: TGetTeamsResponse = [];
-
-  if (session.isAuthenticated) {
-    teams = await getTeams({ userId: session.user.id });
-  }
-
   const { getTheme } = await themeSessionResolver(request);
 
   let lang: SupportedLanguageCodes = await langCookie.parse(request.headers.get('cookie') ?? '');
@@ -82,6 +76,12 @@ export async function loader({ request }: Route.LoaderArgs) {
     lang = extractLocaleData({ headers: request.headers }).lang;
   }
 
+  let organisations = null;
+
+  if (session.isAuthenticated) {
+    organisations = await getOrganisationSession({ userId: session.user.id });
+  }
+
   return data(
     {
       lang,
@@ -90,7 +90,7 @@ export async function loader({ request }: Route.LoaderArgs) {
         ? {
             user: session.user,
             session: session.session,
-            teams,
+            organisations: organisations || [],
           }
         : null,
       publicEnv: createPublicEnv(),
diff --git a/apps/remix/app/routes/_authenticated+/_layout.tsx b/apps/remix/app/routes/_authenticated+/_layout.tsx
index 51044c340..faa605a71 100644
--- a/apps/remix/app/routes/_authenticated+/_layout.tsx
+++ b/apps/remix/app/routes/_authenticated+/_layout.tsx
@@ -1,15 +1,20 @@
-import { Outlet, redirect } from 'react-router';
+import { msg } from '@lingui/core/macro';
+import { Trans } from '@lingui/react/macro';
+import { Link, Outlet, redirect } from 'react-router';
 
 import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
-import { getLimits } from '@documenso/ee/server-only/limits/client';
-import { LimitsProvider } from '@documenso/ee/server-only/limits/provider/client';
+import { OrganisationProvider } from '@documenso/lib/client-only/providers/organisation';
 import { useSession } from '@documenso/lib/client-only/providers/session';
 import { getSiteSettings } from '@documenso/lib/server-only/site-settings/get-site-settings';
 import { SITE_SETTINGS_BANNER_ID } from '@documenso/lib/server-only/site-settings/schemas/banner';
+import { Button } from '@documenso/ui/primitives/button';
 
 import { AppBanner } from '~/components/general/app-banner';
 import { Header } from '~/components/general/app-header';
+import { GenericErrorLayout } from '~/components/general/generic-error-layout';
+import { OrganisationBillingBanner } from '~/components/general/organisations/organisation-billing-banner';
 import { VerifyEmailBanner } from '~/components/general/verify-email-banner';
+import { TeamProvider } from '~/providers/team';
 
 import type { Route } from './+types/_layout';
 
@@ -21,45 +26,96 @@ import type { Route } from './+types/_layout';
 export const shouldRevalidate = () => false;
 
 export async function loader({ request }: Route.LoaderArgs) {
-  const requestHeaders = Object.fromEntries(request.headers.entries());
-
-  const session = await getOptionalSession(request);
-
-  if (!session.isAuthenticated) {
-    throw redirect('/signin');
-  }
-
-  const [limits, banner] = await Promise.all([
-    getLimits({ headers: requestHeaders }),
+  const [session, banner] = await Promise.all([
+    getOptionalSession(request),
     getSiteSettings().then((settings) =>
       settings.find((setting) => setting.id === SITE_SETTINGS_BANNER_ID),
     ),
   ]);
 
+  if (!session.isAuthenticated) {
+    throw redirect('/signin');
+  }
+
   return {
     banner,
-    limits,
   };
 }
 
-export default function Layout({ loaderData }: Route.ComponentProps) {
-  const { user, teams } = useSession();
+export default function Layout({ loaderData, params }: Route.ComponentProps) {
+  const { banner } = loaderData;
 
-  const { banner, limits } = loaderData;
+  const { user, organisations } = useSession();
+
+  const teamUrl = params.teamUrl;
+  const orgUrl = params.orgUrl;
+
+  const teams = organisations.flatMap((org) => org.teams);
+
+  const extractCurrentOrganisation = () => {
+    if (orgUrl) {
+      return organisations.find((org) => org.url === orgUrl);
+    }
+
+    // Search organisations to find the team since we don't have access to the orgUrl in the URL.
+    if (teamUrl) {
+      return organisations.find((org) => org.teams.some((team) => team.url === teamUrl));
+    }
+
+    return null;
+  };
+
+  const currentTeam = teams.find((team) => team.url === teamUrl);
+  const currentOrganisation = extractCurrentOrganisation() || null;
+
+  const orgNotFound = params.orgUrl && !currentOrganisation;
+  const teamNotFound = params.teamUrl && !currentTeam;
+
+  if (orgNotFound || teamNotFound) {
+    return (
+      <GenericErrorLayout
+        errorCode={404}
+        errorCodeMap={{
+          404: orgNotFound
+            ? {
+                heading: msg`Organisation not found`,
+                subHeading: msg`404 Organisation not found`,
+                message: msg`The organisation you are looking for may have been removed, renamed or may have never
+                  existed.`,
+              }
+            : {
+                heading: msg`Team not found`,
+                subHeading: msg`404 Team not found`,
+                message: msg`The team you are looking for may have been removed, renamed or may have never
+                  existed.`,
+              },
+        }}
+        primaryButton={
+          <Button asChild>
+            <Link to="/">
+              <Trans>Go home</Trans>
+            </Link>
+          </Button>
+        }
+      />
+    );
+  }
 
   return (
-    <LimitsProvider initialValue={limits}>
-      <div id="portal-header"></div>
+    <OrganisationProvider organisation={currentOrganisation}>
+      <TeamProvider team={currentTeam || null}>
+        <OrganisationBillingBanner />
 
-      {!user.emailVerified && <VerifyEmailBanner email={user.email} />}
+        {!user.emailVerified && <VerifyEmailBanner email={user.email} />}
 
-      {banner && <AppBanner banner={banner} />}
+        {banner && <AppBanner banner={banner} />}
 
-      <Header user={user} teams={teams} />
+        <Header />
 
-      <main className="mt-8 pb-8 md:mt-12 md:pb-12">
-        <Outlet />
-      </main>
-    </LimitsProvider>
+        <main className="mt-8 pb-8 md:mt-12 md:pb-12">
+          <Outlet />
+        </main>
+      </TeamProvider>
+    </OrganisationProvider>
   );
 }
diff --git a/apps/remix/app/routes/_authenticated+/admin+/_layout.tsx b/apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
index 6e7cb050b..18de42b01 100644
--- a/apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+++ b/apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
@@ -1,5 +1,13 @@
 import { Trans } from '@lingui/react/macro';
-import { BarChart3, FileStack, Settings, Trophy, Users, Wallet2 } from 'lucide-react';
+import {
+  BarChart3,
+  Building2Icon,
+  FileStack,
+  Settings,
+  Trophy,
+  Users,
+  Wallet2,
+} from 'lucide-react';
 import { Link, Outlet, redirect, useLocation } from 'react-router';
 
 import { getSession } from '@documenso/auth/server/lib/utils/get-session';
@@ -13,7 +21,7 @@ export async function loader({ request }: Route.LoaderArgs) {
   const { user } = await getSession(request);
 
   if (!user || !isAdmin(user)) {
-    throw redirect('/documents');
+    throw redirect('/');
   }
 }
 
@@ -21,8 +29,12 @@ export default function AdminLayout() {
   const { pathname } = useLocation();
 
   return (
-    <div className="mx-auto mt-16 w-full max-w-screen-xl px-4 md:px-8">
-      <div className="grid grid-cols-12 md:mt-8 md:gap-8">
+    <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">
+      <h1 className="text-4xl font-semibold">
+        <Trans>Admin Panel</Trans>
+      </h1>
+
+      <div className="mt-4 grid grid-cols-12 gap-x-8 md:mt-8">
         <div
           className={cn(
             'col-span-12 flex gap-x-2.5 gap-y-2 overflow-hidden overflow-x-auto md:col-span-3 md:flex md:flex-col',
@@ -42,6 +54,34 @@ export default function AdminLayout() {
             </Link>
           </Button>
 
+          <Button
+            variant="ghost"
+            className={cn(
+              'justify-start md:w-full',
+              pathname?.startsWith('/admin/organisations') && 'bg-secondary',
+            )}
+            asChild
+          >
+            <Link to="/admin/organisations">
+              <Building2Icon className="mr-2 h-5 w-5" />
+              <Trans>Organisations</Trans>
+            </Link>
+          </Button>
+
+          <Button
+            variant="ghost"
+            className={cn(
+              'justify-start md:w-full',
+              pathname?.startsWith('/admin/claims') && 'bg-secondary',
+            )}
+            asChild
+          >
+            <Link to="/admin/claims">
+              <Wallet2 className="mr-2 h-5 w-5" />
+              <Trans>Claims</Trans>
+            </Link>
+          </Button>
+
           <Button
             variant="ghost"
             className={cn(
@@ -70,20 +110,6 @@ export default function AdminLayout() {
             </Link>
           </Button>
 
-          <Button
-            variant="ghost"
-            className={cn(
-              'justify-start md:w-full',
-              pathname?.startsWith('/admin/subscriptions') && 'bg-secondary',
-            )}
-            asChild
-          >
-            <Link to="/admin/subscriptions">
-              <Wallet2 className="mr-2 h-5 w-5" />
-              <Trans>Subscriptions</Trans>
-            </Link>
-          </Button>
-
           <Button
             variant="ghost"
             className={cn(
diff --git a/apps/remix/app/routes/_authenticated+/admin+/claims.tsx b/apps/remix/app/routes/_authenticated+/admin+/claims.tsx
new file mode 100644
index 000000000..c9ed9d2e0
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/admin+/claims.tsx
@@ -0,0 +1,65 @@
+import { useEffect, useState } from 'react';
+
+import { useLingui } from '@lingui/react/macro';
+import { useLocation, useSearchParams } from 'react-router';
+
+import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
+import { Input } from '@documenso/ui/primitives/input';
+
+import { ClaimCreateDialog } from '~/components/dialogs/claim-create-dialog';
+import { SettingsHeader } from '~/components/general/settings-header';
+import { AdminClaimsTable } from '~/components/tables/admin-claims-table';
+
+export default function Claims() {
+  const { t } = useLingui();
+
+  const [searchParams, setSearchParams] = useSearchParams();
+  const { pathname } = useLocation();
+
+  const [searchQuery, setSearchQuery] = useState(() => searchParams?.get('query') ?? '');
+
+  const debouncedSearchQuery = useDebouncedValue(searchQuery, 500);
+
+  /**
+   * Handle debouncing the search query.
+   */
+  useEffect(() => {
+    const params = new URLSearchParams(searchParams?.toString());
+
+    params.set('query', debouncedSearchQuery);
+
+    if (debouncedSearchQuery === '') {
+      params.delete('query');
+    }
+
+    // If nothing  to change then do nothing.
+    if (params.toString() === searchParams?.toString()) {
+      return;
+    }
+
+    setSearchParams(params);
+  }, [debouncedSearchQuery, pathname, searchParams]);
+
+  return (
+    <div>
+      <SettingsHeader
+        title={t`Subscription Claims`}
+        subtitle={t`Manage all subscription claims`}
+        hideDivider
+      >
+        <ClaimCreateDialog />
+      </SettingsHeader>
+
+      <div className="mt-4">
+        <Input
+          defaultValue={searchQuery}
+          onChange={(e) => setSearchQuery(e.target.value)}
+          placeholder={t`Search by claim ID or name`}
+          className="mb-4"
+        />
+
+        <AdminClaimsTable />
+      </div>
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx b/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
new file mode 100644
index 000000000..0a93d2d66
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
@@ -0,0 +1,571 @@
+import { useMemo } from 'react';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
+import { ExternalLinkIcon, InfoIcon, Loader } from 'lucide-react';
+import { useForm } from 'react-hook-form';
+import { Link, useNavigate } from 'react-router';
+import type { z } from 'zod';
+
+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { SUBSCRIPTION_STATUS_MAP } from '@documenso/lib/constants/billing';
+import { AppError } from '@documenso/lib/errors/app-error';
+import { SUBSCRIPTION_CLAIM_FEATURE_FLAGS } from '@documenso/lib/types/subscription';
+import { trpc } from '@documenso/trpc/react';
+import type { TGetAdminOrganisationResponse } from '@documenso/trpc/server/admin-router/get-admin-organisation.types';
+import { ZUpdateAdminOrganisationRequestSchema } from '@documenso/trpc/server/admin-router/update-admin-organisation.types';
+import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
+import { Badge } from '@documenso/ui/primitives/badge';
+import { Button } from '@documenso/ui/primitives/button';
+import { Checkbox } from '@documenso/ui/primitives/checkbox';
+import { DataTable, type DataTableColumnDef } from '@documenso/ui/primitives/data-table';
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { GenericErrorLayout } from '~/components/general/generic-error-layout';
+import { SettingsHeader } from '~/components/general/settings-header';
+
+import type { Route } from './+types/organisations.$id';
+
+export default function OrganisationGroupSettingsPage({ params }: Route.ComponentProps) {
+  const { t } = useLingui();
+  const { toast } = useToast();
+
+  const navigate = useNavigate();
+
+  const organisationId = params.id;
+
+  const { data: organisation, isLoading: isLoadingOrganisation } =
+    trpc.admin.organisation.get.useQuery({
+      organisationId,
+    });
+
+  const { mutateAsync: createStripeCustomer, isPending: isCreatingStripeCustomer } =
+    trpc.admin.stripe.createCustomer.useMutation({
+      onSuccess: async () => {
+        await navigate(0);
+
+        toast({
+          title: t`Success`,
+          description: t`Stripe customer created successfully`,
+        });
+      },
+      onError: () => {
+        toast({
+          title: t`Error`,
+          description: t`We couldn't create a Stripe customer. Please try again.`,
+          variant: 'destructive',
+        });
+      },
+    });
+
+  const teamsColumns = useMemo(() => {
+    return [
+      {
+        header: t`Team`,
+        accessorKey: 'name',
+      },
+      {
+        header: t`Team url`,
+        accessorKey: 'url',
+      },
+    ] satisfies DataTableColumnDef<TGetAdminOrganisationResponse['teams'][number]>[];
+  }, []);
+
+  const organisationMembersColumns = useMemo(() => {
+    return [
+      {
+        header: t`Member`,
+        cell: ({ row }) => (
+          <div className="flex items-center gap-2">
+            <Link to={`/admin/users/${row.original.user.id}`}>{row.original.user.name}</Link>
+            {row.original.user.id === organisation?.ownerUserId && <Badge>Owner</Badge>}
+          </div>
+        ),
+      },
+      {
+        header: t`Email`,
+        cell: ({ row }) => (
+          <Link to={`/admin/users/${row.original.user.id}`}>{row.original.user.email}</Link>
+        ),
+      },
+    ] satisfies DataTableColumnDef<TGetAdminOrganisationResponse['members'][number]>[];
+  }, [organisation]);
+
+  if (isLoadingOrganisation) {
+    return (
+      <div className="flex items-center justify-center rounded-lg py-32">
+        <Loader className="text-muted-foreground h-6 w-6 animate-spin" />
+      </div>
+    );
+  }
+
+  if (!organisation) {
+    return (
+      <GenericErrorLayout
+        errorCode={404}
+        errorCodeMap={{
+          404: {
+            heading: msg`Organisation not found`,
+            subHeading: msg`404 Organisation not found`,
+            message: msg`The organisation you are looking for may have been removed, renamed or may have never
+                    existed.`,
+          },
+        }}
+        primaryButton={
+          <Button asChild>
+            <Link to={`/admin/organisations`}>
+              <Trans>Go back</Trans>
+            </Link>
+          </Button>
+        }
+        secondaryButton={null}
+      />
+    );
+  }
+
+  return (
+    <div>
+      <SettingsHeader
+        title={t`Manage organisation`}
+        subtitle={t`Manage the ${organisation.name} organisation`}
+      />
+
+      <GenericOrganisationAdminForm organisation={organisation} />
+
+      <SettingsHeader
+        title={t`Manage subscription`}
+        subtitle={t`Manage the ${organisation.name} organisation subscription`}
+        className="mt-16"
+      />
+
+      <Alert
+        className="my-6 flex flex-col justify-between p-6 sm:flex-row sm:items-center"
+        variant="neutral"
+      >
+        <div className="mb-4 sm:mb-0">
+          <AlertTitle>
+            <Trans>Subscription</Trans>
+          </AlertTitle>
+
+          <AlertDescription className="mr-2">
+            {organisation.subscription ? (
+              <span>
+                {SUBSCRIPTION_STATUS_MAP[organisation.subscription.status]} subscription found
+              </span>
+            ) : (
+              <span>No subscription found</span>
+            )}
+          </AlertDescription>
+        </div>
+
+        {!organisation.customerId && (
+          <div>
+            <Button
+              variant="outline"
+              loading={isCreatingStripeCustomer}
+              onClick={async () => createStripeCustomer({ organisationId })}
+            >
+              <Trans>Create Stripe customer</Trans>
+            </Button>
+          </div>
+        )}
+
+        {organisation.customerId && !organisation.subscription && (
+          <div>
+            <Button variant="outline" asChild>
+              <Link
+                target="_blank"
+                to={`https://dashboard.stripe.com/customers/${organisation.customerId}?create=subscription&subscription_default_customer=${organisation.customerId}`}
+              >
+                <Trans>Create subscription</Trans>
+                <ExternalLinkIcon className="ml-2 h-4 w-4" />
+              </Link>
+            </Button>
+          </div>
+        )}
+
+        {organisation.subscription && (
+          <div>
+            <Button variant="outline" asChild>
+              <Link
+                target="_blank"
+                to={`https://dashboard.stripe.com/subscriptions/${organisation.subscription.planId}`}
+              >
+                <Trans>Manage subscription</Trans>
+                <ExternalLinkIcon className="ml-2 h-4 w-4" />
+              </Link>
+            </Button>
+          </div>
+        )}
+      </Alert>
+
+      <OrganisationAdminForm organisation={organisation} />
+
+      <div className="mt-16 space-y-10">
+        <div>
+          <label className="text-sm font-medium leading-none">
+            <Trans>Organisation Members</Trans>
+          </label>
+
+          <div className="my-2">
+            <DataTable columns={organisationMembersColumns} data={organisation.members} />
+          </div>
+        </div>
+
+        <div>
+          <label className="text-sm font-medium leading-none">
+            <Trans>Organisation Teams</Trans>
+          </label>
+
+          <div className="my-2">
+            <DataTable columns={teamsColumns} data={organisation.teams} />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+const ZUpdateGenericOrganisationDataFormSchema =
+  ZUpdateAdminOrganisationRequestSchema.shape.data.pick({
+    name: true,
+    url: true,
+  });
+
+type TUpdateGenericOrganisationDataFormSchema = z.infer<
+  typeof ZUpdateGenericOrganisationDataFormSchema
+>;
+
+type OrganisationAdminFormOptions = {
+  organisation: TGetAdminOrganisationResponse;
+};
+
+const GenericOrganisationAdminForm = ({ organisation }: OrganisationAdminFormOptions) => {
+  const { toast } = useToast();
+  const { t } = useLingui();
+
+  const { mutateAsync: updateOrganisation } = trpc.admin.organisation.update.useMutation();
+
+  const form = useForm<TUpdateGenericOrganisationDataFormSchema>({
+    resolver: zodResolver(ZUpdateGenericOrganisationDataFormSchema),
+    defaultValues: {
+      name: organisation.name,
+      url: organisation.url,
+    },
+  });
+
+  const onSubmit = async (data: TUpdateGenericOrganisationDataFormSchema) => {
+    try {
+      await updateOrganisation({
+        organisationId: organisation.id,
+        data,
+      });
+
+      toast({
+        title: t`Success`,
+        description: t`Organisation has been updated successfully`,
+        duration: 5000,
+      });
+    } catch (err) {
+      const error = AppError.parseError(err);
+      console.error(error);
+
+      toast({
+        title: t`An error occurred`,
+        description: t`We couldn't update the organisation. Please try again.`,
+        variant: 'destructive',
+      });
+    }
+  };
+
+  return (
+    <Form {...form}>
+      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
+        <FormField
+          control={form.control}
+          name="name"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel required>
+                <Trans>Organisation Name</Trans>
+              </FormLabel>
+              <FormControl>
+                <Input {...field} />
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        <FormField
+          control={form.control}
+          name="url"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel required>
+                <Trans>Organisation URL</Trans>
+              </FormLabel>
+              <FormControl>
+                <Input {...field} />
+              </FormControl>
+              {!form.formState.errors.url && (
+                <span className="text-foreground/50 text-xs font-normal">
+                  {field.value ? (
+                    `${NEXT_PUBLIC_WEBAPP_URL()}/o/${field.value}`
+                  ) : (
+                    <Trans>A unique URL to identify the organisation</Trans>
+                  )}
+                </span>
+              )}
+
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        <div className="flex justify-end">
+          <Button type="submit" loading={form.formState.isSubmitting}>
+            <Trans>Update</Trans>
+          </Button>
+        </div>
+      </form>
+    </Form>
+  );
+};
+
+const ZUpdateOrganisationBillingFormSchema = ZUpdateAdminOrganisationRequestSchema.shape.data.pick({
+  claims: true,
+  customerId: true,
+  originalSubscriptionClaimId: true,
+});
+
+type TUpdateOrganisationBillingFormSchema = z.infer<typeof ZUpdateOrganisationBillingFormSchema>;
+
+const OrganisationAdminForm = ({ organisation }: OrganisationAdminFormOptions) => {
+  const { toast } = useToast();
+  const { t } = useLingui();
+
+  const { mutateAsync: updateOrganisation } = trpc.admin.organisation.update.useMutation();
+
+  const form = useForm<TUpdateOrganisationBillingFormSchema>({
+    resolver: zodResolver(ZUpdateOrganisationBillingFormSchema),
+    defaultValues: {
+      customerId: organisation.customerId || '',
+      claims: {
+        teamCount: organisation.organisationClaim.teamCount,
+        memberCount: organisation.organisationClaim.memberCount,
+        flags: organisation.organisationClaim.flags,
+      },
+      originalSubscriptionClaimId: organisation.organisationClaim.originalSubscriptionClaimId || '',
+    },
+  });
+
+  const onSubmit = async (values: TUpdateOrganisationBillingFormSchema) => {
+    try {
+      await updateOrganisation({
+        organisationId: organisation.id,
+        data: values,
+      });
+
+      toast({
+        title: t`Success`,
+        description: t`Organisation has been updated successfully`,
+        duration: 5000,
+      });
+    } catch (err) {
+      const error = AppError.parseError(err);
+      console.error(error);
+
+      toast({
+        title: t`An error occurred`,
+        description: t`We couldn't update the organisation. Please try again.`,
+        variant: 'destructive',
+      });
+    }
+  };
+
+  return (
+    <Form {...form}>
+      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
+        <FormField
+          control={form.control}
+          name="originalSubscriptionClaimId"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel className="flex items-center">
+                <Trans>Inherited subscription claim</Trans>
+                <Tooltip>
+                  <TooltipTrigger>
+                    <InfoIcon className="mx-2 h-4 w-4" />
+                  </TooltipTrigger>
+
+                  <TooltipContent className="text-foreground max-w-md space-y-2 p-4">
+                    <h2>
+                      <strong>
+                        <Trans>Inherited subscription claim</Trans>
+                      </strong>
+                    </h2>
+
+                    <p>
+                      <Trans>
+                        This is the claim that this organisation was initially created with. Any
+                        feature flag changes to this claim will be backported into this
+                        organisation.
+                      </Trans>
+                    </p>
+
+                    <p>
+                      <Trans>
+                        For example, if the claim has a new flag "FLAG_1" set to true, then this
+                        organisation will get that flag added.
+                      </Trans>
+                    </p>
+                    <p>
+                      <Trans>
+                        This will ONLY backport feature flags which are set to true, anything
+                        disabled in the initial claim will not be backported
+                      </Trans>
+                    </p>
+                  </TooltipContent>
+                </Tooltip>
+              </FormLabel>
+              <FormControl>
+                <Input disabled {...field} />
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        <FormField
+          control={form.control}
+          name="customerId"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel required>
+                <Trans>Stripe Customer ID</Trans>
+              </FormLabel>
+              <FormControl>
+                <Input {...field} placeholder={t`No Stripe customer attached`} />
+              </FormControl>
+              {!form.formState.errors.customerId && field.value && (
+                <Link
+                  target="_blank"
+                  to={`https://dashboard.stripe.com/customers/${field.value}`}
+                  className="text-foreground/50 text-xs font-normal"
+                >
+                  {`https://dashboard.stripe.com/customers/${field.value}`}
+                </Link>
+              )}
+
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        <FormField
+          control={form.control}
+          name="claims.teamCount"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>
+                <Trans>Team Count</Trans>
+              </FormLabel>
+              <FormControl>
+                <Input
+                  type="number"
+                  min={0}
+                  {...field}
+                  onChange={(e) => field.onChange(parseInt(e.target.value, 10) || 0)}
+                />
+              </FormControl>
+              <FormDescription>
+                <Trans>Number of teams allowed. 0 = Unlimited</Trans>
+              </FormDescription>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        <FormField
+          control={form.control}
+          name="claims.memberCount"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>
+                <Trans>Member Count</Trans>
+              </FormLabel>
+              <FormControl>
+                <Input
+                  type="number"
+                  min={0}
+                  {...field}
+                  onChange={(e) => field.onChange(parseInt(e.target.value, 10) || 0)}
+                />
+              </FormControl>
+              <FormDescription>
+                <Trans>Number of members allowed. 0 = Unlimited</Trans>
+              </FormDescription>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        <div>
+          <FormLabel>
+            <Trans>Feature Flags</Trans>
+          </FormLabel>
+
+          <div className="mt-2 space-y-2 rounded-md border p-4">
+            {Object.values(SUBSCRIPTION_CLAIM_FEATURE_FLAGS).map(({ key, label }) => (
+              <FormField
+                key={key}
+                control={form.control}
+                name={`claims.flags.${key}`}
+                render={({ field }) => (
+                  <FormItem className="flex items-center space-x-2">
+                    <FormControl>
+                      <div className="flex items-center">
+                        <Checkbox
+                          id={`flag-${key}`}
+                          checked={field.value}
+                          onCheckedChange={field.onChange}
+                        />
+
+                        <label
+                          className="text-muted-foreground ml-2 flex flex-row items-center text-sm"
+                          htmlFor={`flag-${key}`}
+                        >
+                          {label}
+                        </label>
+                      </div>
+                    </FormControl>
+                  </FormItem>
+                )}
+              />
+            ))}
+          </div>
+        </div>
+
+        <div className="flex justify-end">
+          <Button type="submit" loading={form.formState.isSubmitting}>
+            <Trans>Update</Trans>
+          </Button>
+        </div>
+      </form>
+    </Form>
+  );
+};
diff --git a/apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx b/apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
new file mode 100644
index 000000000..b09d3caae
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
@@ -0,0 +1,62 @@
+import { useEffect, useState } from 'react';
+
+import { useLingui } from '@lingui/react/macro';
+import { useLocation, useSearchParams } from 'react-router';
+
+import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
+import { Input } from '@documenso/ui/primitives/input';
+
+import { SettingsHeader } from '~/components/general/settings-header';
+import { AdminOrganisationsTable } from '~/components/tables/admin-organisations-table';
+
+export default function Organisations() {
+  const { t } = useLingui();
+
+  const [searchParams, setSearchParams] = useSearchParams();
+  const { pathname } = useLocation();
+
+  const [searchQuery, setSearchQuery] = useState(() => searchParams?.get('query') ?? '');
+
+  const debouncedSearchQuery = useDebouncedValue(searchQuery, 500);
+
+  /**
+   * Handle debouncing the search query.
+   */
+  useEffect(() => {
+    const params = new URLSearchParams(searchParams?.toString());
+
+    params.set('query', debouncedSearchQuery);
+
+    if (debouncedSearchQuery === '') {
+      params.delete('query');
+    }
+
+    // If nothing  to change then do nothing.
+    if (params.toString() === searchParams?.toString()) {
+      return;
+    }
+
+    setSearchParams(params);
+  }, [debouncedSearchQuery, pathname, searchParams]);
+
+  return (
+    <div>
+      <SettingsHeader
+        hideDivider
+        title={t`Manage organisations`}
+        subtitle={t`Search and manage all organisations`}
+      />
+
+      <div className="mt-4">
+        <Input
+          defaultValue={searchQuery}
+          onChange={(e) => setSearchQuery(e.target.value)}
+          placeholder={t`Search by organisation ID, name, customer ID or owner email`}
+          className="mb-4"
+        />
+
+        <AdminOrganisationsTable />
+      </div>
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/admin+/stats.tsx b/apps/remix/app/routes/_authenticated+/admin+/stats.tsx
index b3141e49d..6e54dbaec 100644
--- a/apps/remix/app/routes/_authenticated+/admin+/stats.tsx
+++ b/apps/remix/app/routes/_authenticated+/admin+/stats.tsx
@@ -18,9 +18,8 @@ import {
 import { getDocumentStats } from '@documenso/lib/server-only/admin/get-documents-stats';
 import { getRecipientsStats } from '@documenso/lib/server-only/admin/get-recipients-stats';
 import {
-  getUserWithSignedDocumentMonthlyGrowth,
+  getOrganisationsWithSubscriptionsCount,
   getUsersCount,
-  getUsersWithSubscriptionsCount,
 } from '@documenso/lib/server-only/admin/get-users-stats';
 import { getSignerConversionMonthly } from '@documenso/lib/server-only/user/get-signer-conversion';
 
@@ -34,31 +33,31 @@ import type { Route } from './+types/stats';
 export async function loader() {
   const [
     usersCount,
-    usersWithSubscriptionsCount,
+    organisationsWithSubscriptionsCount,
     docStats,
     recipientStats,
     signerConversionMonthly,
     // userWithAtLeastOneDocumentPerMonth,
     // userWithAtLeastOneDocumentSignedPerMonth,
-    MONTHLY_USERS_SIGNED,
+    // MONTHLY_USERS_SIGNED,
   ] = await Promise.all([
     getUsersCount(),
-    getUsersWithSubscriptionsCount(),
+    getOrganisationsWithSubscriptionsCount(),
     getDocumentStats(),
     getRecipientsStats(),
     getSignerConversionMonthly(),
     // getUserWithAtLeastOneDocumentPerMonth(),
     // getUserWithAtLeastOneDocumentSignedPerMonth(),
-    getUserWithSignedDocumentMonthlyGrowth(),
+    // getUserWithSignedDocumentMonthlyGrowth(),
   ]);
 
   return {
     usersCount,
-    usersWithSubscriptionsCount,
+    organisationsWithSubscriptionsCount,
     docStats,
     recipientStats,
     signerConversionMonthly,
-    MONTHLY_USERS_SIGNED,
+    // MONTHLY_USERS_SIGNED,
   };
 }
 
@@ -67,11 +66,11 @@ export default function AdminStatsPage({ loaderData }: Route.ComponentProps) {
 
   const {
     usersCount,
-    usersWithSubscriptionsCount,
+    organisationsWithSubscriptionsCount,
     docStats,
     recipientStats,
     signerConversionMonthly,
-    MONTHLY_USERS_SIGNED,
+    // MONTHLY_USERS_SIGNED,
   } = loaderData;
 
   return (
@@ -86,7 +85,7 @@ export default function AdminStatsPage({ loaderData }: Route.ComponentProps) {
         <CardMetric
           icon={UserPlus}
           title={_(msg`Active Subscriptions`)}
-          value={usersWithSubscriptionsCount}
+          value={organisationsWithSubscriptionsCount}
         />
 
         <CardMetric icon={FileCog} title={_(msg`App Version`)} value={`v${version}`} />
@@ -149,12 +148,14 @@ export default function AdminStatsPage({ loaderData }: Route.ComponentProps) {
         </h3>
         <div className="mt-5 grid grid-cols-2 gap-8">
           <AdminStatsUsersWithDocumentsChart
-            data={MONTHLY_USERS_SIGNED}
+            data={[]}
+            // data={MONTHLY_USERS_SIGNED}
             title={_(msg`MAU (created document)`)}
             tooltip={_(msg`Monthly Active Users: Users that created at least one Document`)}
           />
           <AdminStatsUsersWithDocumentsChart
-            data={MONTHLY_USERS_SIGNED}
+            data={[]}
+            // data={MONTHLY_USERS_SIGNED}
             completed
             title={_(msg`MAU (had document completed)`)}
             tooltip={_(
diff --git a/apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx b/apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
deleted file mode 100644
index 7d85c00f0..000000000
--- a/apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import { Trans } from '@lingui/react/macro';
-import { Link } from 'react-router';
-
-import { findSubscriptions } from '@documenso/lib/server-only/admin/get-all-subscriptions';
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@documenso/ui/primitives/table';
-
-import type { Route } from './+types/subscriptions';
-
-export async function loader() {
-  const subscriptions = await findSubscriptions();
-
-  return { subscriptions };
-}
-
-export default function Subscriptions({ loaderData }: Route.ComponentProps) {
-  const { subscriptions } = loaderData;
-
-  return (
-    <div>
-      <h2 className="text-4xl font-semibold">
-        <Trans>Manage subscriptions</Trans>
-      </h2>
-      <div className="mt-8">
-        <Table>
-          <TableHeader>
-            <TableRow>
-              <TableHead>ID</TableHead>
-              <TableHead>
-                <Trans>Status</Trans>
-              </TableHead>
-              <TableHead>
-                <Trans>Created At</Trans>
-              </TableHead>
-              <TableHead>
-                <Trans>Ends On</Trans>
-              </TableHead>
-              <TableHead>
-                <Trans>User ID</Trans>
-              </TableHead>
-            </TableRow>
-          </TableHeader>
-          <TableBody>
-            {subscriptions.map((subscription, index) => (
-              <TableRow key={index}>
-                <TableCell>{subscription.id}</TableCell>
-                <TableCell>{subscription.status}</TableCell>
-                <TableCell>
-                  {subscription.createdAt
-                    ? new Date(subscription.createdAt).toLocaleDateString(undefined, {
-                        weekday: 'long',
-                        year: 'numeric',
-                        month: 'long',
-                        day: 'numeric',
-                      })
-                    : 'N/A'}
-                </TableCell>
-                <TableCell>
-                  {subscription.periodEnd
-                    ? new Date(subscription.periodEnd).toLocaleDateString(undefined, {
-                        weekday: 'long',
-                        year: 'numeric',
-                        month: 'long',
-                        day: 'numeric',
-                      })
-                    : 'N/A'}
-                </TableCell>
-                <TableCell>
-                  <Link to={`/admin/users/${subscription.userId}`}>{subscription.userId}</Link>
-                </TableCell>
-              </TableRow>
-            ))}
-          </TableBody>
-        </Table>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx b/apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
index 81d8dfbcc..fb05128a6 100644
--- a/apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+++ b/apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
@@ -2,8 +2,10 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
+import type { User } from '@prisma/client';
 import { useForm } from 'react-hook-form';
 import { useRevalidator } from 'react-router';
+import { Link } from 'react-router';
 import type { z } from 'zod';
 
 import { trpc } from '@documenso/trpc/react';
@@ -18,11 +20,15 @@ import {
   FormMessage,
 } from '@documenso/ui/primitives/form/form';
 import { Input } from '@documenso/ui/primitives/input';
+import { SpinnerBox } from '@documenso/ui/primitives/spinner';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
+import { AdminOrganisationCreateDialog } from '~/components/dialogs/admin-organisation-create-dialog';
 import { AdminUserDeleteDialog } from '~/components/dialogs/admin-user-delete-dialog';
 import { AdminUserDisableDialog } from '~/components/dialogs/admin-user-disable-dialog';
 import { AdminUserEnableDialog } from '~/components/dialogs/admin-user-enable-dialog';
+import { GenericErrorLayout } from '~/components/general/generic-error-layout';
+import { AdminOrganisationsTable } from '~/components/tables/admin-organisations-table';
 
 import { MultiSelectRoleCombobox } from '../../../components/general/multiselect-role-combobox';
 
@@ -31,11 +37,7 @@ const ZUserFormSchema = ZAdminUpdateProfileMutationSchema.omit({ id: true });
 type TUserFormSchema = z.infer<typeof ZUserFormSchema>;
 
 export default function UserPage({ params }: { params: { id: number } }) {
-  const { _ } = useLingui();
-  const { toast } = useToast();
-  const { revalidate } = useRevalidator();
-
-  const { data: user } = trpc.profile.getUser.useQuery(
+  const { data: user, isLoading: isLoadingUser } = trpc.profile.getUser.useQuery(
     {
       id: Number(params.id),
     },
@@ -44,7 +46,43 @@ export default function UserPage({ params }: { params: { id: number } }) {
     },
   );
 
-  const roles = user?.roles ?? [];
+  if (isLoadingUser) {
+    return <SpinnerBox className="py-32" />;
+  }
+
+  if (!user) {
+    return (
+      <GenericErrorLayout
+        errorCode={404}
+        errorCodeMap={{
+          404: {
+            heading: msg`User not found`,
+            subHeading: msg`404 User not found`,
+            message: msg`The user you are looking for may have been removed, renamed or may have never
+                    existed.`,
+          },
+        }}
+        primaryButton={
+          <Button asChild>
+            <Link to={`/admin/users`}>
+              <Trans>Go back</Trans>
+            </Link>
+          </Button>
+        }
+        secondaryButton={null}
+      />
+    );
+  }
+
+  return <AdminUserPage user={user} />;
+}
+
+const AdminUserPage = ({ user }: { user: User }) => {
+  const { _ } = useLingui();
+  const { toast } = useToast();
+  const { revalidate } = useRevalidator();
+
+  const roles = user.roles ?? [];
 
   const { mutateAsync: updateUserMutation } = trpc.admin.updateUser.useMutation();
 
@@ -151,13 +189,41 @@ export default function UserPage({ params }: { params: { id: number } }) {
         </form>
       </Form>
 
-      <hr className="my-4" />
+      <hr className="my-8" />
 
-      <div className="flex flex-col items-center gap-4">
+      <div>
+        <div className="mb-4 flex items-center justify-between">
+          <div>
+            <h3 className="text-lg font-semibold leading-none tracking-tight">
+              <Trans>User Organisations</Trans>
+            </h3>
+            <p className="text-muted-foreground mt-1.5 text-sm">
+              <Trans>Organisations that the user is a member of.</Trans>
+            </p>
+          </div>
+
+          <AdminOrganisationCreateDialog
+            ownerUserId={user.id}
+            trigger={
+              <Button variant="outline" size="sm">
+                <Trans>Create Organisation</Trans>
+              </Button>
+            }
+          />
+        </div>
+
+        <AdminOrganisationsTable
+          memberUserId={user.id}
+          showOwnerColumn={false}
+          hidePaginationUntilOverflow
+        />
+      </div>
+
+      <div className="mt-16 flex flex-col items-center gap-4">
         {user && <AdminUserDeleteDialog user={user} />}
         {user && user.disabled && <AdminUserEnableDialog userToEnable={user} />}
         {user && !user.disabled && <AdminUserDisableDialog userToDisable={user} />}
       </div>
     </div>
   );
-}
+};
diff --git a/apps/remix/app/routes/_authenticated+/admin+/users._index.tsx b/apps/remix/app/routes/_authenticated+/admin+/users._index.tsx
index f34bde4af..c661d5a91 100644
--- a/apps/remix/app/routes/_authenticated+/admin+/users._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/admin+/users._index.tsx
@@ -1,7 +1,5 @@
 import { Trans } from '@lingui/react/macro';
 
-import { getPricesByPlan } from '@documenso/ee/server-only/stripe/get-prices-by-plan';
-import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing';
 import { findUsers } from '@documenso/lib/server-only/user/get-all-users';
 
 import { AdminDashboardUsersTable } from '~/components/tables/admin-dashboard-users-table';
@@ -15,24 +13,20 @@ export async function loader({ request }: Route.LoaderArgs) {
   const perPage = Number(url.searchParams.get('perPage')) || 10;
   const search = url.searchParams.get('search') || '';
 
-  const [{ users, totalPages }, individualPrices] = await Promise.all([
+  const [{ users, totalPages }] = await Promise.all([
     findUsers({ username: search, email: search, page, perPage }),
-    getPricesByPlan([STRIPE_PLAN_TYPE.REGULAR, STRIPE_PLAN_TYPE.COMMUNITY]).catch(() => []),
   ]);
 
-  const individualPriceIds = individualPrices.map((price) => price.id);
-
   return {
     users,
     totalPages,
-    individualPriceIds,
     page,
     perPage,
   };
 }
 
 export default function AdminManageUsersPage({ loaderData }: Route.ComponentProps) {
-  const { users, totalPages, individualPriceIds, page, perPage } = loaderData;
+  const { users, totalPages, page, perPage } = loaderData;
 
   return (
     <div>
@@ -42,7 +36,6 @@ export default function AdminManageUsersPage({ loaderData }: Route.ComponentProp
 
       <AdminDashboardUsersTable
         users={users}
-        individualPriceIds={individualPriceIds}
         totalPages={totalPages}
         page={page}
         perPage={perPage}
diff --git a/apps/remix/app/routes/_authenticated+/dashboard.tsx b/apps/remix/app/routes/_authenticated+/dashboard.tsx
new file mode 100644
index 000000000..d4ead7fb1
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/dashboard.tsx
@@ -0,0 +1,263 @@
+import { useMemo } from 'react';
+
+import { Plural, Trans, useLingui } from '@lingui/react/macro';
+import { Building2Icon, InboxIcon, SettingsIcon, UsersIcon } from 'lucide-react';
+import { DateTime } from 'luxon';
+import { Link, redirect } from 'react-router';
+
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { ORGANISATION_MEMBER_ROLE_MAP } from '@documenso/lib/constants/organisations-translations';
+import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams-translations';
+import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
+import { canExecuteOrganisationAction } from '@documenso/lib/utils/organisations';
+import { canExecuteTeamAction } from '@documenso/lib/utils/teams';
+import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
+import { Button } from '@documenso/ui/primitives/button';
+import { Card, CardContent } from '@documenso/ui/primitives/card';
+import { ScrollArea, ScrollBar } from '@documenso/ui/primitives/scroll-area';
+
+import { OrganisationInvitations } from '~/components/general/organisations/organisation-invitations';
+import { InboxTable } from '~/components/tables/inbox-table';
+import { appMetaTags } from '~/utils/meta';
+
+export function loader() {
+  throw redirect('/');
+}
+
+export function meta() {
+  return appMetaTags('Dashboard');
+}
+
+export default function DashboardPage() {
+  const { t } = useLingui();
+
+  const { user, organisations } = useSession();
+
+  // Todo: Sort by recent access (TBD by cookies)
+  // Teams, flattened with the organisation data still attached.
+  const teams = useMemo(() => {
+    return organisations.flatMap((org) =>
+      org.teams.map((team) => ({
+        ...team,
+        organisation: {
+          ...org,
+          teams: undefined,
+        },
+      })),
+    );
+  }, [organisations]);
+
+  return (
+    <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">
+      <div className="container">
+        <div className="mb-8">
+          <h1 className="text-3xl font-bold">
+            <Trans>Dashboard</Trans>
+          </h1>
+          <p className="text-muted-foreground mt-1">
+            <Trans>Welcome back! Here's an overview of your account.</Trans>
+          </p>
+
+          <OrganisationInvitations className="mt-4" />
+        </div>
+
+        {organisations.length === 0 && (
+          <div className="mb-12 mt-6 flex flex-col items-center justify-center rounded-lg border py-32">
+            <Building2Icon className="h-10 w-10" />
+
+            <div className="mt-2 flex flex-col items-center gap-0.5">
+              <p className="font-semibold">
+                <Trans>No organisations found</Trans>
+              </p>
+              <p className="text-muted-foreground text-sm">
+                <Trans>Create an organisation to get started.</Trans>
+              </p>
+            </div>
+
+            <Button asChild className="mt-4" variant="outline">
+              <Link to="/settings/organisations?action=add-organisation">
+                <Trans>Create organisation</Trans>
+              </Link>
+            </Button>
+          </div>
+        )}
+
+        {/* Organisations Section */}
+        {organisations.length > 1 && (
+          <div className="mb-8">
+            <div className="mb-4 flex items-center justify-between">
+              <div className="flex items-center gap-2">
+                <Building2Icon className="text-muted-foreground h-5 w-5" />
+                <h2 className="text-xl font-semibold">
+                  <Trans>Organisations</Trans>
+                </h2>
+              </div>
+
+              {/* Right hand side action if required. */}
+              {/* <Button variant="outline" size="sm" className="gap-1">
+                <PlusIcon className="h-4 w-4" />
+                <Trans>New</Trans>
+              </Button> */}
+            </div>
+
+            <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
+              {organisations.map((org) => (
+                <div key={org.id} className="group relative">
+                  <Link to={`/o/${org.url}`}>
+                    <Card className="hover:bg-muted/50 h-full border pr-6 transition-all">
+                      <CardContent className="p-4">
+                        <div className="flex items-center gap-3">
+                          <Avatar className="h-10 w-10 border border-solid">
+                            {org.avatarImageId && (
+                              <AvatarImage src={formatAvatarUrl(org.avatarImageId)} />
+                            )}
+                            <AvatarFallback className="text-sm text-gray-400">
+                              {org.name.slice(0, 1).toUpperCase()}
+                            </AvatarFallback>
+                          </Avatar>
+
+                          <div className="flex-1">
+                            <h3 className="font-medium">{org.name}</h3>
+                            <div className="text-muted-foreground mt-1 flex items-center gap-3 text-xs">
+                              <div className="flex items-center gap-1">
+                                <UsersIcon className="h-3 w-3" />
+                                <span>
+                                  {org.ownerUserId === user.id
+                                    ? t`Owner`
+                                    : t(ORGANISATION_MEMBER_ROLE_MAP[org.currentOrganisationRole])}
+                                </span>
+                              </div>
+                              <div className="flex items-center gap-1">
+                                <Building2Icon className="h-3 w-3" />
+                                <span>
+                                  <Plural
+                                    value={org.teams.length}
+                                    one={<Trans># team</Trans>}
+                                    other={<Trans># teams</Trans>}
+                                  />
+                                </span>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </CardContent>
+                    </Card>
+                  </Link>
+
+                  {canExecuteOrganisationAction(
+                    'MANAGE_ORGANISATION',
+                    org.currentOrganisationRole,
+                  ) && (
+                    <div className="text-muted-foreground absolute right-4 top-4 opacity-0 transition-opacity duration-200 group-hover:opacity-100">
+                      <Link to={`/o/${org.url}/settings`}>
+                        <SettingsIcon className="h-4 w-4" />
+                      </Link>
+                    </div>
+                  )}
+                </div>
+              ))}
+            </div>
+          </div>
+        )}
+
+        {/* Teams Section */}
+        {teams.length >= 1 && (
+          <div className="mb-8">
+            <div className="mb-4 flex items-center justify-between">
+              <div className="flex items-center gap-2">
+                <UsersIcon className="text-muted-foreground h-5 w-5" />
+                <h2 className="text-xl font-semibold">
+                  <Trans>Teams</Trans>
+                </h2>
+              </div>
+              {/* <Button variant="ghost" size="sm" asChild>
+              <Link to="/" className="gap-1">
+                <Trans>View all</Trans>
+                <ChevronRightIcon className="h-4 w-4" />
+              </Link>
+            </Button> */}
+            </div>
+
+            <ScrollArea className="w-full whitespace-nowrap pb-4">
+              <div className="flex gap-4">
+                {teams.map((team) => (
+                  <div key={team.id} className="group relative">
+                    <Link to={`/t/${team.url}`}>
+                      <Card className="hover:bg-muted/50 w-[350px] shrink-0 border transition-all">
+                        <CardContent className="p-4">
+                          <div className="flex items-center gap-3">
+                            <Avatar className="h-10 w-10 border border-solid">
+                              {team.avatarImageId && (
+                                <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />
+                              )}
+                              <AvatarFallback className="text-sm text-gray-400">
+                                {team.name.slice(0, 1).toUpperCase()}
+                              </AvatarFallback>
+                            </Avatar>
+
+                            <div className="flex-1">
+                              <h3 className="font-medium">{team.name}</h3>
+                              <div className="text-muted-foreground mt-1 flex items-center gap-3 text-xs">
+                                <div className="flex items-center gap-1">
+                                  <UsersIcon className="h-3 w-3" />
+                                  {team.organisation.ownerUserId === user.id
+                                    ? t`Owner`
+                                    : t(TEAM_MEMBER_ROLE_MAP[team.currentTeamRole])}
+                                </div>
+                                <div className="flex items-center gap-1">
+                                  <Building2Icon className="h-3 w-3" />
+                                  <span className="truncate">{team.organisation.name}</span>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                          <div className="text-muted-foreground mt-3 text-xs">
+                            <Trans>
+                              Joined{' '}
+                              {DateTime.fromJSDate(team.createdAt).toRelative({ style: 'short' })}
+                            </Trans>
+                          </div>
+                        </CardContent>
+                      </Card>
+                    </Link>
+
+                    {canExecuteTeamAction('MANAGE_TEAM', team.currentTeamRole) && (
+                      <div className="text-muted-foreground absolute right-4 top-4 opacity-0 transition-opacity duration-200 group-hover:opacity-100">
+                        <Link to={`/t/${team.url}/settings`}>
+                          <SettingsIcon className="h-4 w-4" />
+                        </Link>
+                      </div>
+                    )}
+                  </div>
+                ))}
+              </div>
+              <ScrollBar orientation="horizontal" />
+            </ScrollArea>
+          </div>
+        )}
+
+        {/* Inbox Section */}
+        <div>
+          <div className="mb-4 flex items-center justify-between">
+            <div className="flex items-center gap-2">
+              <InboxIcon className="text-muted-foreground h-5 w-5" />
+              <h2 className="text-xl font-semibold">
+                <Trans>Personal Inbox</Trans>
+              </h2>
+            </div>
+            {/* <Button variant="ghost" size="sm" asChild>
+              <Link to="/inbox" className="gap-1">
+                <span>
+                  <Trans>View all</Trans>
+                </span>
+                <ChevronRightIcon className="h-4 w-4" />
+              </Link>
+            </Button> */}
+          </div>
+
+          <InboxTable />
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/documents.$id._index.tsx b/apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
deleted file mode 100644
index ac513d5df..000000000
--- a/apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+++ /dev/null
@@ -1,273 +0,0 @@
-import { useLingui } from '@lingui/react';
-import { Plural, Trans } from '@lingui/react/macro';
-import { DocumentStatus, TeamMemberRole } from '@prisma/client';
-import { ChevronLeft, Clock9, Users2 } from 'lucide-react';
-import { Link, redirect } from 'react-router';
-import { match } from 'ts-pattern';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { useSession } from '@documenso/lib/client-only/providers/session';
-import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
-import { getFieldsForDocument } from '@documenso/lib/server-only/field/get-fields-for-document';
-import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
-import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
-import { DocumentVisibility } from '@documenso/lib/types/document-visibility';
-import { formatDocumentsPath } from '@documenso/lib/utils/teams';
-import { DocumentReadOnlyFields } from '@documenso/ui/components/document/document-read-only-fields';
-import { Badge } from '@documenso/ui/primitives/badge';
-import { Button } from '@documenso/ui/primitives/button';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
-import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
-
-import { DocumentHistorySheet } from '~/components/general/document/document-history-sheet';
-import { DocumentPageViewButton } from '~/components/general/document/document-page-view-button';
-import { DocumentPageViewDropdown } from '~/components/general/document/document-page-view-dropdown';
-import { DocumentPageViewInformation } from '~/components/general/document/document-page-view-information';
-import { DocumentPageViewRecentActivity } from '~/components/general/document/document-page-view-recent-activity';
-import { DocumentPageViewRecipients } from '~/components/general/document/document-page-view-recipients';
-import { DocumentRecipientLinkCopyDialog } from '~/components/general/document/document-recipient-link-copy-dialog';
-import {
-  DocumentStatus as DocumentStatusComponent,
-  FRIENDLY_STATUS_MAP,
-} from '~/components/general/document/document-status';
-import { StackAvatarsWithTooltip } from '~/components/general/stack-avatars-with-tooltip';
-import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
-
-import type { Route } from './+types/documents.$id._index';
-
-export async function loader({ params, request }: Route.LoaderArgs) {
-  const { user } = await getSession(request);
-
-  let team: TGetTeamByUrlResponse | null = null;
-
-  if (params.teamUrl) {
-    team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });
-  }
-
-  const { id } = params;
-
-  const documentId = Number(id);
-
-  const documentRootPath = formatDocumentsPath(team?.url);
-
-  if (!documentId || Number.isNaN(documentId)) {
-    throw redirect(documentRootPath);
-  }
-
-  const document = await getDocumentById({
-    documentId,
-    userId: user.id,
-    teamId: team?.id,
-  }).catch(() => null);
-
-  if (document?.teamId && !team?.url) {
-    throw redirect(documentRootPath);
-  }
-
-  if (document?.folderId) {
-    throw redirect(documentRootPath);
-  }
-
-  const documentVisibility = document?.visibility;
-  const currentTeamMemberRole = team?.currentTeamMember?.role;
-  const isRecipient = document?.recipients.find((recipient) => recipient.email === user.email);
-  let canAccessDocument = true;
-
-  if (team && !isRecipient && document?.userId !== user.id) {
-    canAccessDocument = match([documentVisibility, currentTeamMemberRole])
-      .with([DocumentVisibility.EVERYONE, TeamMemberRole.ADMIN], () => true)
-      .with([DocumentVisibility.EVERYONE, TeamMemberRole.MANAGER], () => true)
-      .with([DocumentVisibility.EVERYONE, TeamMemberRole.MEMBER], () => true)
-      .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.ADMIN], () => true)
-      .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.MANAGER], () => true)
-      .with([DocumentVisibility.ADMIN, TeamMemberRole.ADMIN], () => true)
-      .otherwise(() => false);
-  }
-
-  if (!document || !document.documentData || (team && !canAccessDocument)) {
-    throw redirect(documentRootPath);
-  }
-
-  if (team && !canAccessDocument) {
-    throw redirect(documentRootPath);
-  }
-
-  // Todo: Get full document instead?
-  const [recipients, fields] = await Promise.all([
-    getRecipientsForDocument({
-      documentId,
-      teamId: team?.id,
-      userId: user.id,
-    }),
-    getFieldsForDocument({
-      documentId,
-      userId: user.id,
-      teamId: team?.id,
-    }),
-  ]);
-
-  const documentWithRecipients = {
-    ...document,
-    recipients,
-  };
-
-  return superLoaderJson({
-    document: documentWithRecipients,
-    documentRootPath,
-    fields,
-  });
-}
-
-export default function DocumentPage() {
-  const loaderData = useSuperLoaderData<typeof loader>();
-
-  const { _ } = useLingui();
-  const { user } = useSession();
-
-  const { document, documentRootPath, fields } = loaderData;
-
-  const { recipients, documentData, documentMeta } = document;
-
-  // This was a feature flag. Leave to false since it's not ready.
-  const isDocumentHistoryEnabled = false;
-
-  return (
-    <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
-      {document.status === DocumentStatus.PENDING && (
-        <DocumentRecipientLinkCopyDialog recipients={recipients} />
-      )}
-
-      <Link to={documentRootPath} className="flex items-center text-[#7AC455] hover:opacity-80">
-        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
-        <Trans>Documents</Trans>
-      </Link>
-
-      <div className="flex flex-row justify-between truncate">
-        <div>
-          <h1
-            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-            title={document.title}
-          >
-            {document.title}
-          </h1>
-
-          <div className="mt-2.5 flex items-center gap-x-6">
-            <DocumentStatusComponent
-              inheritColor
-              status={document.status}
-              className="text-muted-foreground"
-            />
-
-            {recipients.length > 0 && (
-              <div className="text-muted-foreground flex items-center">
-                <Users2 className="mr-2 h-5 w-5" />
-
-                <StackAvatarsWithTooltip
-                  recipients={recipients}
-                  documentStatus={document.status}
-                  position="bottom"
-                >
-                  <span>
-                    <Trans>{recipients.length} Recipient(s)</Trans>
-                  </span>
-                </StackAvatarsWithTooltip>
-              </div>
-            )}
-
-            {document.deletedAt && (
-              <Badge variant="destructive">
-                <Trans>Document deleted</Trans>
-              </Badge>
-            )}
-          </div>
-        </div>
-
-        {isDocumentHistoryEnabled && (
-          <div className="self-end">
-            <DocumentHistorySheet documentId={document.id} userId={user.id}>
-              <Button variant="outline">
-                <Clock9 className="mr-1.5 h-4 w-4" />
-                <Trans>Document history</Trans>
-              </Button>
-            </DocumentHistorySheet>
-          </div>
-        )}
-      </div>
-
-      <div className="mt-6 grid w-full grid-cols-12 gap-8">
-        <Card
-          className="relative col-span-12 rounded-xl before:rounded-xl lg:col-span-6 xl:col-span-7"
-          gradient
-        >
-          <CardContent className="p-2">
-            <PDFViewer document={document} key={documentData.id} documentData={documentData} />
-          </CardContent>
-        </Card>
-
-        {document.status !== DocumentStatus.COMPLETED && (
-          <DocumentReadOnlyFields
-            fields={fields}
-            documentMeta={documentMeta || undefined}
-            showRecipientTooltip={true}
-            showRecipientColors={true}
-            recipientIds={recipients.map((recipient) => recipient.id)}
-          />
-        )}
-
-        <div className="col-span-12 lg:col-span-6 xl:col-span-5">
-          <div className="space-y-6">
-            <section className="border-border bg-widget flex flex-col rounded-xl border pb-4 pt-6">
-              <div className="flex flex-row items-center justify-between px-4">
-                <h3 className="text-foreground text-2xl font-semibold">
-                  {_(FRIENDLY_STATUS_MAP[document.status].labelExtended)}
-                </h3>
-
-                <DocumentPageViewDropdown document={document} />
-              </div>
-
-              <p className="text-muted-foreground mt-2 px-4 text-sm">
-                {match(document.status)
-                  .with(DocumentStatus.COMPLETED, () => (
-                    <Trans>This document has been signed by all recipients</Trans>
-                  ))
-                  .with(DocumentStatus.REJECTED, () => (
-                    <Trans>This document has been rejected by a recipient</Trans>
-                  ))
-                  .with(DocumentStatus.DRAFT, () => (
-                    <Trans>This document is currently a draft and has not been sent</Trans>
-                  ))
-                  .with(DocumentStatus.PENDING, () => {
-                    const pendingRecipients = recipients.filter(
-                      (recipient) => recipient.signingStatus === 'NOT_SIGNED',
-                    );
-
-                    return (
-                      <Plural
-                        value={pendingRecipients.length}
-                        one="Waiting on 1 recipient"
-                        other="Waiting on # recipients"
-                      />
-                    );
-                  })
-                  .exhaustive()}
-              </p>
-
-              <div className="mt-4 border-t px-4 pt-4">
-                <DocumentPageViewButton document={document} />
-              </div>
-            </section>
-
-            {/* Document information section. */}
-            <DocumentPageViewInformation document={document} userId={user.id} />
-
-            {/* Recipients section. */}
-            <DocumentPageViewRecipients document={document} documentRootPath={documentRootPath} />
-
-            {/* Recent activity section. */}
-            <DocumentPageViewRecentActivity documentId={document.id} userId={user.id} />
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx b/apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx
deleted file mode 100644
index 6606f5593..000000000
--- a/apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx
+++ /dev/null
@@ -1,160 +0,0 @@
-import { Plural, Trans } from '@lingui/react/macro';
-import { TeamMemberRole } from '@prisma/client';
-import { ChevronLeft, Users2 } from 'lucide-react';
-import { Link, redirect } from 'react-router';
-import { match } from 'ts-pattern';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
-import { getDocumentWithDetailsById } from '@documenso/lib/server-only/document/get-document-with-details-by-id';
-import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
-import { DocumentVisibility } from '@documenso/lib/types/document-visibility';
-import { isDocumentCompleted } from '@documenso/lib/utils/document';
-import { formatDocumentsPath } from '@documenso/lib/utils/teams';
-
-import { DocumentEditForm } from '~/components/general/document/document-edit-form';
-import { DocumentStatus } from '~/components/general/document/document-status';
-import { LegacyFieldWarningPopover } from '~/components/general/legacy-field-warning-popover';
-import { StackAvatarsWithTooltip } from '~/components/general/stack-avatars-with-tooltip';
-import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
-
-import type { Route } from './+types/documents.$id.edit';
-
-export async function loader({ params, request }: Route.LoaderArgs) {
-  const { user } = await getSession(request);
-
-  let team: TGetTeamByUrlResponse | null = null;
-
-  if (params.teamUrl) {
-    team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });
-  }
-
-  const { id } = params;
-
-  const documentId = Number(id);
-
-  const documentRootPath = formatDocumentsPath(team?.url);
-
-  if (!documentId || Number.isNaN(documentId)) {
-    throw redirect(documentRootPath);
-  }
-
-  const document = await getDocumentWithDetailsById({
-    documentId,
-    userId: user.id,
-    teamId: team?.id,
-  }).catch(() => null);
-
-  if (document?.teamId && !team?.url) {
-    throw redirect(documentRootPath);
-  }
-
-  if (document?.folderId) {
-    throw redirect(documentRootPath);
-  }
-
-  const documentVisibility = document?.visibility;
-  const currentTeamMemberRole = team?.currentTeamMember?.role;
-  const isRecipient = document?.recipients.find((recipient) => recipient.email === user.email);
-  let canAccessDocument = true;
-
-  if (!isRecipient && document?.userId !== user.id) {
-    canAccessDocument = match([documentVisibility, currentTeamMemberRole])
-      .with([DocumentVisibility.EVERYONE, TeamMemberRole.ADMIN], () => true)
-      .with([DocumentVisibility.EVERYONE, TeamMemberRole.MANAGER], () => true)
-      .with([DocumentVisibility.EVERYONE, TeamMemberRole.MEMBER], () => true)
-      .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.ADMIN], () => true)
-      .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.MANAGER], () => true)
-      .with([DocumentVisibility.ADMIN, TeamMemberRole.ADMIN], () => true)
-      .otherwise(() => false);
-  }
-
-  if (!document) {
-    throw redirect(documentRootPath);
-  }
-
-  if (team && !canAccessDocument) {
-    throw redirect(documentRootPath);
-  }
-
-  if (isDocumentCompleted(document.status)) {
-    throw redirect(`${documentRootPath}/${documentId}`);
-  }
-
-  const isDocumentEnterprise = await isUserEnterprise({
-    userId: user.id,
-    teamId: team?.id,
-  });
-
-  return superLoaderJson({
-    document: {
-      ...document,
-      folder: null,
-    },
-    documentRootPath,
-    isDocumentEnterprise,
-  });
-}
-
-export default function DocumentEditPage() {
-  const { document, documentRootPath, isDocumentEnterprise } = useSuperLoaderData<typeof loader>();
-
-  const { recipients } = document;
-
-  return (
-    <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
-      <Link to={documentRootPath} className="flex items-center text-[#7AC455] hover:opacity-80">
-        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
-        <Trans>Documents</Trans>
-      </Link>
-
-      <div className="mt-4 flex w-full items-end justify-between">
-        <div className="flex-1">
-          <h1
-            className="block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-            title={document.title}
-          >
-            {document.title}
-          </h1>
-
-          <div className="mt-2.5 flex items-center gap-x-6">
-            <DocumentStatus
-              inheritColor
-              status={document.status}
-              className="text-muted-foreground"
-            />
-
-            {recipients.length > 0 && (
-              <div className="text-muted-foreground flex items-center">
-                <Users2 className="mr-2 h-5 w-5" />
-
-                <StackAvatarsWithTooltip
-                  recipients={recipients}
-                  documentStatus={document.status}
-                  position="bottom"
-                >
-                  <span>
-                    <Plural one="1 Recipient" other="# Recipients" value={recipients.length} />
-                  </span>
-                </StackAvatarsWithTooltip>
-              </div>
-            )}
-          </div>
-        </div>
-
-        {document.useLegacyFieldInsertion && (
-          <div>
-            <LegacyFieldWarningPopover type="document" documentId={document.id} />
-          </div>
-        )}
-      </div>
-
-      <DocumentEditForm
-        className="mt-6"
-        initialDocument={document}
-        documentRootPath={documentRootPath}
-        isDocumentEnterprise={isDocumentEnterprise}
-      />
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx b/apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
deleted file mode 100644
index f3aa0e92e..000000000
--- a/apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+++ /dev/null
@@ -1,190 +0,0 @@
-import type { MessageDescriptor } from '@lingui/core';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import type { Recipient } from '@prisma/client';
-import { ChevronLeft } from 'lucide-react';
-import { DateTime } from 'luxon';
-import { Link, redirect } from 'react-router';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
-import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
-import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
-import { formatDocumentsPath } from '@documenso/lib/utils/teams';
-import { Card } from '@documenso/ui/primitives/card';
-
-import { DocumentAuditLogDownloadButton } from '~/components/general/document/document-audit-log-download-button';
-import { DocumentCertificateDownloadButton } from '~/components/general/document/document-certificate-download-button';
-import {
-  DocumentStatus as DocumentStatusComponent,
-  FRIENDLY_STATUS_MAP,
-} from '~/components/general/document/document-status';
-import { DocumentLogsTable } from '~/components/tables/document-logs-table';
-
-import type { Route } from './+types/documents.$id.logs';
-
-export async function loader({ params, request }: Route.LoaderArgs) {
-  const { user } = await getSession(request);
-
-  let team: TGetTeamByUrlResponse | null = null;
-
-  if (params.teamUrl) {
-    team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });
-  }
-
-  const { id } = params;
-
-  const documentId = Number(id);
-
-  const documentRootPath = formatDocumentsPath(team?.url);
-
-  if (!documentId || Number.isNaN(documentId)) {
-    throw redirect(documentRootPath);
-  }
-
-  const document = await getDocumentById({
-    documentId,
-    userId: user.id,
-    teamId: team?.id,
-  }).catch(() => null);
-
-  if (!document || !document.documentData) {
-    throw redirect(documentRootPath);
-  }
-
-  if (document.folderId) {
-    throw redirect(documentRootPath);
-  }
-
-  const recipients = await getRecipientsForDocument({
-    documentId,
-    userId: user.id,
-    teamId: team?.id,
-  });
-
-  return {
-    document,
-    documentRootPath,
-    recipients,
-  };
-}
-
-export default function DocumentsLogsPage({ loaderData }: Route.ComponentProps) {
-  const { document, documentRootPath, recipients } = loaderData;
-
-  const { _, i18n } = useLingui();
-
-  const documentInformation: { description: MessageDescriptor; value: string }[] = [
-    {
-      description: msg`Document title`,
-      value: document.title,
-    },
-    {
-      description: msg`Document ID`,
-      value: document.id.toString(),
-    },
-    {
-      description: msg`Document status`,
-      value: _(FRIENDLY_STATUS_MAP[document.status].label),
-    },
-    {
-      description: msg`Created by`,
-      value: document.user.name
-        ? `${document.user.name} (${document.user.email})`
-        : document.user.email,
-    },
-    {
-      description: msg`Date created`,
-      value: DateTime.fromJSDate(document.createdAt)
-        .setLocale(i18n.locales?.[0] || i18n.locale)
-        .toLocaleString(DateTime.DATETIME_MED_WITH_SECONDS),
-    },
-    {
-      description: msg`Last updated`,
-      value: DateTime.fromJSDate(document.updatedAt)
-        .setLocale(i18n.locales?.[0] || i18n.locale)
-        .toLocaleString(DateTime.DATETIME_MED_WITH_SECONDS),
-    },
-    {
-      description: msg`Time zone`,
-      value: document.documentMeta?.timezone ?? 'N/A',
-    },
-  ];
-
-  const formatRecipientText = (recipient: Recipient) => {
-    let text = recipient.email;
-
-    if (recipient.name) {
-      text = `${recipient.name} (${recipient.email})`;
-    }
-
-    return `[${recipient.role}] ${text}`;
-  };
-  return (
-    <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
-      <Link
-        to={`${documentRootPath}/${document.id}`}
-        className="flex items-center text-[#7AC455] hover:opacity-80"
-      >
-        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
-        <Trans>Document</Trans>
-      </Link>
-
-      <div className="flex flex-col">
-        <div>
-          <h1
-            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-            title={document.title}
-          >
-            {document.title}
-          </h1>
-        </div>
-        <div className="mt-1 flex flex-col justify-between sm:flex-row">
-          <div className="mt-2.5 flex items-center gap-x-6">
-            <DocumentStatusComponent
-              inheritColor
-              status={document.status}
-              className="text-muted-foreground"
-            />
-          </div>
-          <div className="mt-4 flex w-full flex-row sm:mt-0 sm:w-auto sm:self-end">
-            <DocumentCertificateDownloadButton
-              className="mr-2"
-              documentId={document.id}
-              documentStatus={document.status}
-            />
-
-            <DocumentAuditLogDownloadButton documentId={document.id} />
-          </div>
-        </div>
-      </div>
-
-      <section className="mt-6">
-        <Card className="grid grid-cols-1 gap-4 p-4 sm:grid-cols-2" degrees={45} gradient>
-          {documentInformation.map((info, i) => (
-            <div className="text-foreground text-sm" key={i}>
-              <h3 className="font-semibold">{_(info.description)}</h3>
-              <p className="text-muted-foreground truncate">{info.value}</p>
-            </div>
-          ))}
-
-          <div className="text-foreground text-sm">
-            <h3 className="font-semibold">Recipients</h3>
-            <ul className="text-muted-foreground list-inside list-disc">
-              {recipients.map((recipient) => (
-                <li key={`recipient-${recipient.id}`}>
-                  <span className="-ml-2">{formatRecipientText(recipient)}</span>
-                </li>
-              ))}
-            </ul>
-          </div>
-        </Card>
-      </section>
-
-      <section className="mt-6">
-        <DocumentLogsTable documentId={document.id} />
-      </section>
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/documents._index.tsx b/apps/remix/app/routes/_authenticated+/documents._index.tsx
deleted file mode 100644
index 392bd67cb..000000000
--- a/apps/remix/app/routes/_authenticated+/documents._index.tsx
+++ /dev/null
@@ -1,390 +0,0 @@
-import { useEffect, useMemo, useState } from 'react';
-
-import { Trans } from '@lingui/react/macro';
-import { FolderIcon, HomeIcon, Loader2 } from 'lucide-react';
-import { useNavigate, useSearchParams } from 'react-router';
-import { Link } from 'react-router';
-import { z } from 'zod';
-
-import { FolderType } from '@documenso/lib/types/folder-type';
-import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
-import { parseToIntegerArray } from '@documenso/lib/utils/params';
-import { formatDocumentsPath } from '@documenso/lib/utils/teams';
-import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
-import { trpc } from '@documenso/trpc/react';
-import {
-  type TFindDocumentsInternalResponse,
-  ZFindDocumentsInternalRequestSchema,
-} from '@documenso/trpc/server/document-router/schema';
-import { type TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';
-import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
-import { Button } from '@documenso/ui/primitives/button';
-import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
-
-import { DocumentMoveToFolderDialog } from '~/components/dialogs/document-move-to-folder-dialog';
-import { CreateFolderDialog } from '~/components/dialogs/folder-create-dialog';
-import { FolderDeleteDialog } from '~/components/dialogs/folder-delete-dialog';
-import { FolderMoveDialog } from '~/components/dialogs/folder-move-dialog';
-import { FolderSettingsDialog } from '~/components/dialogs/folder-settings-dialog';
-import { DocumentDropZoneWrapper } from '~/components/general/document/document-drop-zone-wrapper';
-import { DocumentSearch } from '~/components/general/document/document-search';
-import { DocumentStatus } from '~/components/general/document/document-status';
-import { DocumentUploadDropzone } from '~/components/general/document/document-upload';
-import { FolderCard } from '~/components/general/folder/folder-card';
-import { PeriodSelector } from '~/components/general/period-selector';
-import { DocumentsTable } from '~/components/tables/documents-table';
-import { DocumentsTableEmptyState } from '~/components/tables/documents-table-empty-state';
-import { DocumentsTableSenderFilter } from '~/components/tables/documents-table-sender-filter';
-import { useOptionalCurrentTeam } from '~/providers/team';
-import { appMetaTags } from '~/utils/meta';
-
-export function meta() {
-  return appMetaTags('Documents');
-}
-
-const ZSearchParamsSchema = ZFindDocumentsInternalRequestSchema.pick({
-  status: true,
-  period: true,
-  page: true,
-  perPage: true,
-  query: true,
-}).extend({
-  senderIds: z.string().transform(parseToIntegerArray).optional().catch([]),
-});
-
-export default function DocumentsPage() {
-  const [searchParams] = useSearchParams();
-  const navigate = useNavigate();
-
-  const [isMovingDocument, setIsMovingDocument] = useState(false);
-  const [documentToMove, setDocumentToMove] = useState<number | null>(null);
-  const [isMovingFolder, setIsMovingFolder] = useState(false);
-  const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);
-  const [isDeletingFolder, setIsDeletingFolder] = useState(false);
-  const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);
-  const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);
-  const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);
-
-  const team = useOptionalCurrentTeam();
-
-  const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();
-  const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();
-
-  const [stats, setStats] = useState<TFindDocumentsInternalResponse['stats']>({
-    [ExtendedDocumentStatus.DRAFT]: 0,
-    [ExtendedDocumentStatus.PENDING]: 0,
-    [ExtendedDocumentStatus.COMPLETED]: 0,
-    [ExtendedDocumentStatus.REJECTED]: 0,
-    [ExtendedDocumentStatus.INBOX]: 0,
-    [ExtendedDocumentStatus.ALL]: 0,
-  });
-
-  const findDocumentSearchParams = useMemo(
-    () => ZSearchParamsSchema.safeParse(Object.fromEntries(searchParams.entries())).data || {},
-    [searchParams],
-  );
-
-  const { data, isLoading, isLoadingError, refetch } = trpc.document.findDocumentsInternal.useQuery(
-    {
-      ...findDocumentSearchParams,
-    },
-  );
-
-  const {
-    data: foldersData,
-    isLoading: isFoldersLoading,
-    refetch: refetchFolders,
-  } = trpc.folder.getFolders.useQuery({
-    type: FolderType.DOCUMENT,
-    parentId: null,
-  });
-
-  useEffect(() => {
-    void refetch();
-    void refetchFolders();
-  }, [team?.url]);
-
-  const getTabHref = (value: keyof typeof ExtendedDocumentStatus) => {
-    const params = new URLSearchParams(searchParams);
-
-    params.set('status', value);
-
-    if (value === ExtendedDocumentStatus.ALL) {
-      params.delete('status');
-    }
-
-    if (params.has('page')) {
-      params.delete('page');
-    }
-
-    return `${formatDocumentsPath(team?.url)}?${params.toString()}`;
-  };
-
-  useEffect(() => {
-    if (data?.stats) {
-      setStats(data.stats);
-    }
-  }, [data?.stats]);
-
-  const navigateToFolder = (folderId?: string | null) => {
-    const documentsPath = formatDocumentsPath(team?.url);
-
-    if (folderId) {
-      void navigate(`${documentsPath}/f/${folderId}`);
-    } else {
-      void navigate(documentsPath);
-    }
-  };
-
-  const handleViewAllFolders = () => {
-    void navigate(`${formatDocumentsPath(team?.url)}/folders`);
-  };
-
-  return (
-    <DocumentDropZoneWrapper>
-      <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">
-        <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
-          <div className="flex flex-1 items-center">
-            <Button
-              variant="ghost"
-              size="sm"
-              className="flex items-center space-x-2 pl-0 hover:bg-transparent"
-              onClick={() => navigateToFolder(null)}
-            >
-              <HomeIcon className="h-4 w-4" />
-              <span>Home</span>
-            </Button>
-
-            {foldersData?.breadcrumbs.map((folder) => (
-              <div key={folder.id} className="flex items-center space-x-2">
-                <span>/</span>
-                <Button
-                  variant="ghost"
-                  size="sm"
-                  className="flex items-center space-x-2 pl-1 hover:bg-transparent"
-                  onClick={() => navigateToFolder(folder.id)}
-                >
-                  <FolderIcon className="h-4 w-4" />
-                  <span>{folder.name}</span>
-                </Button>
-              </div>
-            ))}
-          </div>
-
-          <div className="flex gap-4 sm:flex-row sm:justify-end">
-            <DocumentUploadDropzone />
-            <CreateFolderDialog />
-          </div>
-        </div>
-
-        {isFoldersLoading ? (
-          <div className="mt-6 flex justify-center">
-            <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />
-          </div>
-        ) : (
-          <>
-            {foldersData?.folders?.some((folder) => folder.pinned) && (
-              <div className="mt-6">
-                <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
-                  {foldersData.folders
-                    .filter((folder) => folder.pinned)
-                    .map((folder) => (
-                      <FolderCard
-                        key={folder.id}
-                        folder={folder}
-                        onNavigate={navigateToFolder}
-                        onMove={(folder) => {
-                          setFolderToMove(folder);
-                          setIsMovingFolder(true);
-                        }}
-                        onPin={(folderId) => void pinFolder({ folderId })}
-                        onUnpin={(folderId) => void unpinFolder({ folderId })}
-                        onSettings={(folder) => {
-                          setFolderToSettings(folder);
-                          setIsSettingsFolderOpen(true);
-                        }}
-                        onDelete={(folder) => {
-                          setFolderToDelete(folder);
-                          setIsDeletingFolder(true);
-                        }}
-                      />
-                    ))}
-                </div>
-              </div>
-            )}
-
-            <div className="mt-6">
-              <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
-                {foldersData?.folders
-                  ?.filter((folder) => !folder.pinned)
-                  .slice(0, 12)
-                  .map((folder) => (
-                    <FolderCard
-                      key={folder.id}
-                      folder={folder}
-                      onNavigate={navigateToFolder}
-                      onMove={(folder) => {
-                        setFolderToMove(folder);
-                        setIsMovingFolder(true);
-                      }}
-                      onPin={(folderId) => void pinFolder({ folderId })}
-                      onUnpin={(folderId) => void unpinFolder({ folderId })}
-                      onSettings={(folder) => {
-                        setFolderToSettings(folder);
-                        setIsSettingsFolderOpen(true);
-                      }}
-                      onDelete={(folder) => {
-                        setFolderToDelete(folder);
-                        setIsDeletingFolder(true);
-                      }}
-                    />
-                  ))}
-              </div>
-
-              <div className="mt-6 flex items-center justify-center">
-                {foldersData && foldersData.folders?.length > 12 && (
-                  <Button
-                    variant="link"
-                    size="sm"
-                    className="text-muted-foreground hover:text-foreground"
-                    onClick={() => void handleViewAllFolders()}
-                  >
-                    View all folders
-                  </Button>
-                )}
-              </div>
-            </div>
-          </>
-        )}
-
-        <div className="mt-12 flex flex-wrap items-center justify-between gap-x-4 gap-y-8">
-          <div className="flex flex-row items-center">
-            {team && (
-              <Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">
-                {team.avatarImageId && <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />}
-                <AvatarFallback className="text-muted-foreground text-xs">
-                  {team.name.slice(0, 1)}
-                </AvatarFallback>
-              </Avatar>
-            )}
-
-            <h2 className="text-4xl font-semibold">
-              <Trans>Documents</Trans>
-            </h2>
-          </div>
-
-          <div className="-m-1 flex flex-wrap gap-x-4 gap-y-6 overflow-hidden p-1">
-            <Tabs value={findDocumentSearchParams.status || 'ALL'} className="overflow-x-auto">
-              <TabsList>
-                {[
-                  ExtendedDocumentStatus.INBOX,
-                  ExtendedDocumentStatus.PENDING,
-                  ExtendedDocumentStatus.COMPLETED,
-                  ExtendedDocumentStatus.DRAFT,
-                  ExtendedDocumentStatus.ALL,
-                ].map((value) => (
-                  <TabsTrigger
-                    key={value}
-                    className="hover:text-foreground min-w-[60px]"
-                    value={value}
-                    asChild
-                  >
-                    <Link to={getTabHref(value)} preventScrollReset>
-                      <DocumentStatus status={value} />
-
-                      {value !== ExtendedDocumentStatus.ALL && (
-                        <span className="ml-1 inline-block opacity-50">{stats[value]}</span>
-                      )}
-                    </Link>
-                  </TabsTrigger>
-                ))}
-              </TabsList>
-            </Tabs>
-
-            {team && <DocumentsTableSenderFilter teamId={team.id} />}
-
-            <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">
-              <PeriodSelector />
-            </div>
-            <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">
-              <DocumentSearch initialValue={findDocumentSearchParams.query} />
-            </div>
-          </div>
-        </div>
-
-        <div className="mt-8">
-          <div>
-            {data &&
-            data.count === 0 &&
-            (!foldersData?.folders.length || foldersData.folders.length === 0) ? (
-              <DocumentsTableEmptyState
-                status={findDocumentSearchParams.status || ExtendedDocumentStatus.ALL}
-              />
-            ) : (
-              <DocumentsTable
-                data={data}
-                isLoading={isLoading}
-                isLoadingError={isLoadingError}
-                onMoveDocument={(documentId) => {
-                  setDocumentToMove(documentId);
-                  setIsMovingDocument(true);
-                }}
-              />
-            )}
-          </div>
-        </div>
-
-        {documentToMove && (
-          <DocumentMoveToFolderDialog
-            documentId={documentToMove}
-            open={isMovingDocument}
-            onOpenChange={(open) => {
-              setIsMovingDocument(open);
-
-              if (!open) {
-                setDocumentToMove(null);
-              }
-            }}
-          />
-        )}
-
-        <FolderMoveDialog
-          foldersData={foldersData?.folders}
-          folder={folderToMove}
-          isOpen={isMovingFolder}
-          onOpenChange={(open) => {
-            setIsMovingFolder(open);
-
-            if (!open) {
-              setFolderToMove(null);
-            }
-          }}
-        />
-
-        <FolderSettingsDialog
-          folder={folderToSettings}
-          isOpen={isSettingsFolderOpen}
-          onOpenChange={(open) => {
-            setIsSettingsFolderOpen(open);
-
-            if (!open) {
-              setFolderToSettings(null);
-            }
-          }}
-        />
-
-        <FolderDeleteDialog
-          folder={folderToDelete}
-          isOpen={isDeletingFolder}
-          onOpenChange={(open) => {
-            setIsDeletingFolder(open);
-
-            if (!open) {
-              setFolderToDelete(null);
-            }
-          }}
-        />
-      </div>
-    </DocumentDropZoneWrapper>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx b/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
deleted file mode 100644
index f17826f5d..000000000
--- a/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
+++ /dev/null
@@ -1,272 +0,0 @@
-import { useLingui } from '@lingui/react';
-import { Plural, Trans } from '@lingui/react/macro';
-import { DocumentStatus, TeamMemberRole } from '@prisma/client';
-import { ChevronLeft, Clock9, Users2 } from 'lucide-react';
-import { Link, redirect } from 'react-router';
-import { match } from 'ts-pattern';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { useSession } from '@documenso/lib/client-only/providers/session';
-import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
-import { getFieldsForDocument } from '@documenso/lib/server-only/field/get-fields-for-document';
-import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
-import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
-import { DocumentVisibility } from '@documenso/lib/types/document-visibility';
-import { formatDocumentsPath } from '@documenso/lib/utils/teams';
-import { DocumentReadOnlyFields } from '@documenso/ui/components/document/document-read-only-fields';
-import { Badge } from '@documenso/ui/primitives/badge';
-import { Button } from '@documenso/ui/primitives/button';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
-import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
-
-import { DocumentHistorySheet } from '~/components/general/document/document-history-sheet';
-import { DocumentPageViewButton } from '~/components/general/document/document-page-view-button';
-import { DocumentPageViewDropdown } from '~/components/general/document/document-page-view-dropdown';
-import { DocumentPageViewInformation } from '~/components/general/document/document-page-view-information';
-import { DocumentPageViewRecentActivity } from '~/components/general/document/document-page-view-recent-activity';
-import { DocumentPageViewRecipients } from '~/components/general/document/document-page-view-recipients';
-import { DocumentRecipientLinkCopyDialog } from '~/components/general/document/document-recipient-link-copy-dialog';
-import {
-  DocumentStatus as DocumentStatusComponent,
-  FRIENDLY_STATUS_MAP,
-} from '~/components/general/document/document-status';
-import { StackAvatarsWithTooltip } from '~/components/general/stack-avatars-with-tooltip';
-import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
-
-import type { Route } from './+types/documents.f.$folderId.$id._index';
-
-export async function loader({ params, request }: Route.LoaderArgs) {
-  const { user } = await getSession(request);
-
-  let team: TGetTeamByUrlResponse | null = null;
-
-  if (params.teamUrl) {
-    team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });
-  }
-
-  const { id, folderId } = params;
-
-  const documentId = Number(id);
-
-  const documentRootPath = formatDocumentsPath(team?.url);
-
-  if (!documentId || !folderId) {
-    throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);
-  }
-
-  const document = await getDocumentById({
-    documentId,
-    userId: user.id,
-    teamId: team?.id,
-    folderId,
-  }).catch(() => null);
-
-  if (document?.teamId && !team?.url) {
-    throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);
-  }
-
-  const documentVisibility = document?.visibility;
-  const currentTeamMemberRole = team?.currentTeamMember?.role;
-  const isRecipient = document?.recipients.find((recipient) => recipient.email === user.email);
-  let canAccessDocument = true;
-
-  if (team && !isRecipient && document?.userId !== user.id) {
-    canAccessDocument = match([documentVisibility, currentTeamMemberRole])
-      .with([DocumentVisibility.EVERYONE, TeamMemberRole.ADMIN], () => true)
-      .with([DocumentVisibility.EVERYONE, TeamMemberRole.MANAGER], () => true)
-      .with([DocumentVisibility.EVERYONE, TeamMemberRole.MEMBER], () => true)
-      .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.ADMIN], () => true)
-      .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.MANAGER], () => true)
-      .with([DocumentVisibility.ADMIN, TeamMemberRole.ADMIN], () => true)
-      .otherwise(() => false);
-  }
-
-  if (!document || !document.documentData || (team && !canAccessDocument)) {
-    throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);
-  }
-
-  if (team && !canAccessDocument) {
-    throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);
-  }
-
-  if (document.folderId !== folderId) {
-    throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);
-  }
-
-  // Todo: Get full document instead?
-  const [recipients, fields] = await Promise.all([
-    getRecipientsForDocument({
-      documentId,
-      teamId: team?.id,
-      userId: user.id,
-    }),
-    getFieldsForDocument({
-      documentId,
-      userId: user.id,
-      teamId: team?.id,
-    }),
-  ]);
-
-  const documentWithRecipients = {
-    ...document,
-    recipients,
-  };
-
-  return superLoaderJson({
-    document: documentWithRecipients,
-    documentRootPath,
-    fields,
-    folderId,
-  });
-}
-
-export default function DocumentPage() {
-  const loaderData = useSuperLoaderData<typeof loader>();
-
-  const { _ } = useLingui();
-  const { user } = useSession();
-
-  const { document, documentRootPath, fields, folderId } = loaderData;
-
-  const { recipients, documentData, documentMeta } = document;
-
-  // This was a feature flag. Leave to false since it's not ready.
-  const isDocumentHistoryEnabled = false;
-
-  return (
-    <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
-      {document.status === DocumentStatus.PENDING && (
-        <DocumentRecipientLinkCopyDialog recipients={recipients} />
-      )}
-
-      <Link
-        to={folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath}
-        className="flex items-center text-[#7AC455] hover:opacity-80"
-      >
-        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
-        <Trans>Documents</Trans>
-      </Link>
-
-      <div className="flex flex-row justify-between truncate">
-        <div>
-          <h1
-            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-            title={document.title}
-          >
-            {document.title}
-          </h1>
-
-          <div className="mt-2.5 flex items-center gap-x-6">
-            <DocumentStatusComponent
-              inheritColor
-              status={document.status}
-              className="text-muted-foreground"
-            />
-
-            {recipients.length > 0 && (
-              <div className="text-muted-foreground flex items-center">
-                <Users2 className="mr-2 h-5 w-5" />
-
-                <StackAvatarsWithTooltip
-                  recipients={recipients}
-                  documentStatus={document.status}
-                  position="bottom"
-                >
-                  <span>
-                    <Trans>{recipients.length} Recipient(s)</Trans>
-                  </span>
-                </StackAvatarsWithTooltip>
-              </div>
-            )}
-
-            {document.deletedAt && (
-              <Badge variant="destructive">
-                <Trans>Document deleted</Trans>
-              </Badge>
-            )}
-          </div>
-        </div>
-
-        {isDocumentHistoryEnabled && (
-          <div className="self-end">
-            <DocumentHistorySheet documentId={document.id} userId={user.id}>
-              <Button variant="outline">
-                <Clock9 className="mr-1.5 h-4 w-4" />
-                <Trans>Document history</Trans>
-              </Button>
-            </DocumentHistorySheet>
-          </div>
-        )}
-      </div>
-
-      <div className="mt-6 grid w-full grid-cols-12 gap-8">
-        <Card
-          className="relative col-span-12 rounded-xl before:rounded-xl lg:col-span-6 xl:col-span-7"
-          gradient
-        >
-          <CardContent className="p-2">
-            <PDFViewer document={document} key={documentData.id} documentData={documentData} />
-          </CardContent>
-        </Card>
-
-        {document.status === DocumentStatus.PENDING && (
-          <DocumentReadOnlyFields fields={fields} documentMeta={documentMeta || undefined} />
-        )}
-
-        <div className="col-span-12 lg:col-span-6 xl:col-span-5">
-          <div className="space-y-6">
-            <section className="border-border bg-widget flex flex-col rounded-xl border pb-4 pt-6">
-              <div className="flex flex-row items-center justify-between px-4">
-                <h3 className="text-foreground text-2xl font-semibold">
-                  {_(FRIENDLY_STATUS_MAP[document.status].labelExtended)}
-                </h3>
-
-                <DocumentPageViewDropdown document={document} />
-              </div>
-
-              <p className="text-muted-foreground mt-2 px-4 text-sm">
-                {match(document.status)
-                  .with(DocumentStatus.COMPLETED, () => (
-                    <Trans>This document has been signed by all recipients</Trans>
-                  ))
-                  .with(DocumentStatus.REJECTED, () => (
-                    <Trans>This document has been rejected by a recipient</Trans>
-                  ))
-                  .with(DocumentStatus.DRAFT, () => (
-                    <Trans>This document is currently a draft and has not been sent</Trans>
-                  ))
-                  .with(DocumentStatus.PENDING, () => {
-                    const pendingRecipients = recipients.filter(
-                      (recipient) => recipient.signingStatus === 'NOT_SIGNED',
-                    );
-
-                    return (
-                      <Plural
-                        value={pendingRecipients.length}
-                        one="Waiting on 1 recipient"
-                        other="Waiting on # recipients"
-                      />
-                    );
-                  })
-                  .exhaustive()}
-              </p>
-
-              <div className="mt-4 border-t px-4 pt-4">
-                <DocumentPageViewButton document={document} />
-              </div>
-            </section>
-
-            {/* Document information section. */}
-            <DocumentPageViewInformation document={document} userId={user.id} />
-
-            {/* Recipients section. */}
-            <DocumentPageViewRecipients document={document} documentRootPath={documentRootPath} />
-
-            {/* Recent activity section. */}
-            <DocumentPageViewRecentActivity documentId={document.id} userId={user.id} />
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx b/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx
deleted file mode 100644
index b3b5067b3..000000000
--- a/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx
+++ /dev/null
@@ -1,155 +0,0 @@
-import { Plural, Trans } from '@lingui/react/macro';
-import { TeamMemberRole } from '@prisma/client';
-import { ChevronLeft, Users2 } from 'lucide-react';
-import { Link, redirect } from 'react-router';
-import { match } from 'ts-pattern';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
-import { getDocumentWithDetailsById } from '@documenso/lib/server-only/document/get-document-with-details-by-id';
-import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
-import { DocumentVisibility } from '@documenso/lib/types/document-visibility';
-import { isDocumentCompleted } from '@documenso/lib/utils/document';
-import { formatDocumentsPath } from '@documenso/lib/utils/teams';
-
-import { DocumentEditForm } from '~/components/general/document/document-edit-form';
-import { DocumentStatus } from '~/components/general/document/document-status';
-import { StackAvatarsWithTooltip } from '~/components/general/stack-avatars-with-tooltip';
-import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
-
-import type { Route } from './+types/documents.$id.edit';
-
-export async function loader({ params, request }: Route.LoaderArgs) {
-  const { user } = await getSession(request);
-
-  let team: TGetTeamByUrlResponse | null = null;
-
-  if (params.teamUrl) {
-    team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });
-  }
-
-  const { id, folderId } = params;
-
-  const documentId = Number(id);
-
-  const documentRootPath = formatDocumentsPath(team?.url);
-
-  if (!documentId || Number.isNaN(documentId)) {
-    throw redirect(documentRootPath);
-  }
-
-  if (!folderId) {
-    throw redirect(documentRootPath);
-  }
-
-  const document = await getDocumentWithDetailsById({
-    documentId,
-    userId: user.id,
-    teamId: team?.id,
-    folderId,
-  }).catch(() => null);
-
-  if (document?.teamId && !team?.url) {
-    throw redirect(documentRootPath);
-  }
-
-  const documentVisibility = document?.visibility;
-  const currentTeamMemberRole = team?.currentTeamMember?.role;
-  const isRecipient = document?.recipients.find((recipient) => recipient.email === user.email);
-  let canAccessDocument = true;
-
-  if (!isRecipient && document?.userId !== user.id) {
-    canAccessDocument = match([documentVisibility, currentTeamMemberRole])
-      .with([DocumentVisibility.EVERYONE, TeamMemberRole.ADMIN], () => true)
-      .with([DocumentVisibility.EVERYONE, TeamMemberRole.MANAGER], () => true)
-      .with([DocumentVisibility.EVERYONE, TeamMemberRole.MEMBER], () => true)
-      .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.ADMIN], () => true)
-      .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.MANAGER], () => true)
-      .with([DocumentVisibility.ADMIN, TeamMemberRole.ADMIN], () => true)
-      .otherwise(() => false);
-  }
-
-  if (!document) {
-    throw redirect(documentRootPath);
-  }
-
-  if (team && !canAccessDocument) {
-    throw redirect(documentRootPath);
-  }
-
-  if (document.folderId !== folderId) {
-    throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);
-  }
-
-  if (isDocumentCompleted(document.status)) {
-    throw redirect(`${documentRootPath}/${documentId}`);
-  }
-
-  const isDocumentEnterprise = await isUserEnterprise({
-    userId: user.id,
-    teamId: team?.id,
-  });
-
-  return superLoaderJson({
-    document: {
-      ...document,
-      folder: null,
-    },
-    documentRootPath,
-    isDocumentEnterprise,
-    folderId,
-  });
-}
-
-export default function DocumentEditPage() {
-  const { document, documentRootPath, isDocumentEnterprise, folderId } =
-    useSuperLoaderData<typeof loader>();
-
-  const { recipients } = document;
-
-  return (
-    <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
-      <Link
-        to={`${documentRootPath}/f/${folderId}`}
-        className="flex items-center text-[#7AC455] hover:opacity-80"
-      >
-        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
-        <Trans>Documents</Trans>
-      </Link>
-
-      <h1
-        className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-        title={document.title}
-      >
-        {document.title}
-      </h1>
-
-      <div className="mt-2.5 flex items-center gap-x-6">
-        <DocumentStatus inheritColor status={document.status} className="text-muted-foreground" />
-
-        {recipients.length > 0 && (
-          <div className="text-muted-foreground flex items-center">
-            <Users2 className="mr-2 h-5 w-5" />
-
-            <StackAvatarsWithTooltip
-              recipients={recipients}
-              documentStatus={document.status}
-              position="bottom"
-            >
-              <span>
-                <Plural one="1 Recipient" other="# Recipients" value={recipients.length} />
-              </span>
-            </StackAvatarsWithTooltip>
-          </div>
-        )}
-      </div>
-
-      <DocumentEditForm
-        className="mt-6"
-        initialDocument={document}
-        documentRootPath={documentRootPath}
-        isDocumentEnterprise={isDocumentEnterprise}
-      />
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx b/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
deleted file mode 100644
index cee9a0c45..000000000
--- a/apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
+++ /dev/null
@@ -1,199 +0,0 @@
-import type { MessageDescriptor } from '@lingui/core';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import type { Recipient } from '@prisma/client';
-import { ChevronLeft } from 'lucide-react';
-import { DateTime } from 'luxon';
-import { Link, redirect } from 'react-router';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
-import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
-import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
-import { formatDocumentsPath } from '@documenso/lib/utils/teams';
-import { Card } from '@documenso/ui/primitives/card';
-
-import { DocumentAuditLogDownloadButton } from '~/components/general/document/document-audit-log-download-button';
-import { DocumentCertificateDownloadButton } from '~/components/general/document/document-certificate-download-button';
-import {
-  DocumentStatus as DocumentStatusComponent,
-  FRIENDLY_STATUS_MAP,
-} from '~/components/general/document/document-status';
-import { DocumentLogsTable } from '~/components/tables/document-logs-table';
-
-import type { Route } from './+types/documents.f.$folderId.$id.logs';
-
-export async function loader({ params, request }: Route.LoaderArgs) {
-  const { user } = await getSession(request);
-
-  let team: TGetTeamByUrlResponse | null = null;
-
-  if (params.teamUrl) {
-    team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });
-  }
-
-  const { id, folderId } = params;
-
-  const documentId = Number(id);
-
-  const documentRootPath = formatDocumentsPath(team?.url);
-
-  if (!documentId || Number.isNaN(documentId)) {
-    throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);
-  }
-
-  if (!folderId) {
-    throw redirect(documentRootPath);
-  }
-
-  // Todo: Get full document instead?
-  const [document, recipients] = await Promise.all([
-    getDocumentById({
-      documentId,
-      userId: user.id,
-      teamId: team?.id,
-      folderId,
-    }).catch(() => null),
-    getRecipientsForDocument({
-      documentId,
-      userId: user.id,
-      teamId: team?.id,
-    }),
-  ]);
-
-  if (!document || !document.documentData) {
-    throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);
-  }
-
-  if (document.folderId !== folderId) {
-    throw redirect(documentRootPath);
-  }
-
-  return {
-    document,
-    documentRootPath,
-    recipients,
-    folderId,
-  };
-}
-
-export default function DocumentsLogsPage({ loaderData }: Route.ComponentProps) {
-  const { document, documentRootPath, recipients, folderId } = loaderData;
-
-  const { _, i18n } = useLingui();
-
-  const documentInformation: { description: MessageDescriptor; value: string }[] = [
-    {
-      description: msg`Document title`,
-      value: document.title,
-    },
-    {
-      description: msg`Document ID`,
-      value: document.id.toString(),
-    },
-    {
-      description: msg`Document status`,
-      value: _(FRIENDLY_STATUS_MAP[document.status].label),
-    },
-    {
-      description: msg`Created by`,
-      value: document.user.name
-        ? `${document.user.name} (${document.user.email})`
-        : document.user.email,
-    },
-    {
-      description: msg`Date created`,
-      value: DateTime.fromJSDate(document.createdAt)
-        .setLocale(i18n.locales?.[0] || i18n.locale)
-        .toLocaleString(DateTime.DATETIME_MED_WITH_SECONDS),
-    },
-    {
-      description: msg`Last updated`,
-      value: DateTime.fromJSDate(document.updatedAt)
-        .setLocale(i18n.locales?.[0] || i18n.locale)
-        .toLocaleString(DateTime.DATETIME_MED_WITH_SECONDS),
-    },
-    {
-      description: msg`Time zone`,
-      value: document.documentMeta?.timezone ?? 'N/A',
-    },
-  ];
-
-  const formatRecipientText = (recipient: Recipient) => {
-    let text = recipient.email;
-
-    if (recipient.name) {
-      text = `${recipient.name} (${recipient.email})`;
-    }
-
-    return `[${recipient.role}] ${text}`;
-  };
-
-  return (
-    <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
-      <Link
-        to={`${documentRootPath}/f/${folderId}/${document.id}`}
-        className="flex items-center text-[#7AC455] hover:opacity-80"
-      >
-        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
-        <Trans>Document</Trans>
-      </Link>
-
-      <div className="flex flex-col">
-        <div>
-          <h1
-            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-            title={document.title}
-          >
-            {document.title}
-          </h1>
-        </div>
-        <div className="mt-1 flex flex-col justify-between sm:flex-row">
-          <div className="mt-2.5 flex items-center gap-x-6">
-            <DocumentStatusComponent
-              inheritColor
-              status={document.status}
-              className="text-muted-foreground"
-            />
-          </div>
-          <div className="mt-4 flex w-full flex-row sm:mt-0 sm:w-auto sm:self-end">
-            <DocumentCertificateDownloadButton
-              className="mr-2"
-              documentId={document.id}
-              documentStatus={document.status}
-            />
-
-            <DocumentAuditLogDownloadButton documentId={document.id} />
-          </div>
-        </div>
-      </div>
-
-      <section className="mt-6">
-        <Card className="grid grid-cols-1 gap-4 p-4 sm:grid-cols-2" degrees={45} gradient>
-          {documentInformation.map((info, i) => (
-            <div className="text-foreground text-sm" key={i}>
-              <h3 className="font-semibold">{_(info.description)}</h3>
-              <p className="text-muted-foreground truncate">{info.value}</p>
-            </div>
-          ))}
-
-          <div className="text-foreground text-sm">
-            <h3 className="font-semibold">Recipients</h3>
-            <ul className="text-muted-foreground list-inside list-disc">
-              {recipients.map((recipient) => (
-                <li key={`recipient-${recipient.id}`}>
-                  <span className="-ml-2">{formatRecipientText(recipient)}</span>
-                </li>
-              ))}
-            </ul>
-          </div>
-        </Card>
-      </section>
-
-      <section className="mt-6">
-        <DocumentLogsTable documentId={document.id} />
-      </section>
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/documents.f.$folderId._index.tsx b/apps/remix/app/routes/_authenticated+/documents.f.$folderId._index.tsx
deleted file mode 100644
index ad5f40700..000000000
--- a/apps/remix/app/routes/_authenticated+/documents.f.$folderId._index.tsx
+++ /dev/null
@@ -1,374 +0,0 @@
-import { useEffect, useMemo, useState } from 'react';
-
-import { Trans } from '@lingui/react/macro';
-import { FolderIcon, HomeIcon, Loader2 } from 'lucide-react';
-import { useNavigate, useParams, useSearchParams } from 'react-router';
-import { Link } from 'react-router';
-import { z } from 'zod';
-
-import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
-import { parseToIntegerArray } from '@documenso/lib/utils/params';
-import { formatDocumentsPath } from '@documenso/lib/utils/teams';
-import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
-import { trpc } from '@documenso/trpc/react';
-import {
-  type TFindDocumentsInternalResponse,
-  ZFindDocumentsInternalRequestSchema,
-} from '@documenso/trpc/server/document-router/schema';
-import { type TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';
-import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
-import { Button } from '@documenso/ui/primitives/button';
-import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
-
-import { DocumentMoveToFolderDialog } from '~/components/dialogs/document-move-to-folder-dialog';
-import { CreateFolderDialog } from '~/components/dialogs/folder-create-dialog';
-import { FolderDeleteDialog } from '~/components/dialogs/folder-delete-dialog';
-import { FolderMoveDialog } from '~/components/dialogs/folder-move-dialog';
-import { FolderSettingsDialog } from '~/components/dialogs/folder-settings-dialog';
-import { DocumentDropZoneWrapper } from '~/components/general/document/document-drop-zone-wrapper';
-import { DocumentSearch } from '~/components/general/document/document-search';
-import { DocumentStatus } from '~/components/general/document/document-status';
-import { DocumentUploadDropzone } from '~/components/general/document/document-upload';
-import { FolderCard } from '~/components/general/folder/folder-card';
-import { PeriodSelector } from '~/components/general/period-selector';
-import { DocumentsTable } from '~/components/tables/documents-table';
-import { DocumentsTableEmptyState } from '~/components/tables/documents-table-empty-state';
-import { DocumentsTableSenderFilter } from '~/components/tables/documents-table-sender-filter';
-import { useOptionalCurrentTeam } from '~/providers/team';
-import { appMetaTags } from '~/utils/meta';
-
-export function meta() {
-  return appMetaTags('Documents');
-}
-
-const ZSearchParamsSchema = ZFindDocumentsInternalRequestSchema.pick({
-  status: true,
-  period: true,
-  page: true,
-  perPage: true,
-  query: true,
-}).extend({
-  senderIds: z.string().transform(parseToIntegerArray).optional().catch([]),
-});
-
-export default function DocumentsPage() {
-  const [searchParams] = useSearchParams();
-  const navigate = useNavigate();
-
-  const [isMovingDocument, setIsMovingDocument] = useState(false);
-  const [documentToMove, setDocumentToMove] = useState<number | null>(null);
-  const [isMovingFolder, setIsMovingFolder] = useState(false);
-  const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);
-  const [isDeletingFolder, setIsDeletingFolder] = useState(false);
-  const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);
-  const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);
-  const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);
-
-  const { folderId } = useParams();
-
-  const team = useOptionalCurrentTeam();
-
-  const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();
-  const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();
-
-  const [stats, setStats] = useState<TFindDocumentsInternalResponse['stats']>({
-    [ExtendedDocumentStatus.DRAFT]: 0,
-    [ExtendedDocumentStatus.PENDING]: 0,
-    [ExtendedDocumentStatus.COMPLETED]: 0,
-    [ExtendedDocumentStatus.REJECTED]: 0,
-    [ExtendedDocumentStatus.INBOX]: 0,
-    [ExtendedDocumentStatus.ALL]: 0,
-  });
-
-  const findDocumentSearchParams = useMemo(
-    () => ZSearchParamsSchema.safeParse(Object.fromEntries(searchParams.entries())).data || {},
-    [searchParams],
-  );
-
-  const { data, isLoading, isLoadingError, refetch } = trpc.document.findDocumentsInternal.useQuery(
-    {
-      ...findDocumentSearchParams,
-      folderId,
-    },
-  );
-
-  const {
-    data: foldersData,
-    isLoading: isFoldersLoading,
-    refetch: refetchFolders,
-  } = trpc.folder.getFolders.useQuery({
-    parentId: folderId,
-  });
-
-  useEffect(() => {
-    void refetch();
-    void refetchFolders();
-  }, [team?.url]);
-
-  const getTabHref = (value: keyof typeof ExtendedDocumentStatus) => {
-    const params = new URLSearchParams(searchParams);
-
-    params.set('status', value);
-
-    if (value === ExtendedDocumentStatus.ALL) {
-      params.delete('status');
-    }
-
-    if (params.has('page')) {
-      params.delete('page');
-    }
-
-    return `${formatDocumentsPath(team?.url)}/f/${folderId}?${params.toString()}`;
-  };
-
-  useEffect(() => {
-    if (data?.stats) {
-      setStats(data.stats);
-    }
-  }, [data?.stats]);
-
-  const navigateToFolder = (folderId?: string | null) => {
-    const documentsPath = formatDocumentsPath(team?.url);
-
-    if (folderId) {
-      void navigate(`${documentsPath}/f/${folderId}`);
-    } else {
-      void navigate(documentsPath);
-    }
-  };
-
-  return (
-    <DocumentDropZoneWrapper>
-      <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">
-        <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
-          <div className="flex flex-1 items-center">
-            <Button
-              variant="ghost"
-              size="sm"
-              className="flex items-center space-x-2 pl-0 hover:bg-transparent"
-              onClick={() => navigateToFolder(null)}
-            >
-              <HomeIcon className="h-4 w-4" />
-              <span>Home</span>
-            </Button>
-
-            {foldersData?.breadcrumbs.map((folder) => (
-              <div key={folder.id} className="flex items-center space-x-2">
-                <span>/</span>
-                <Button
-                  variant="ghost"
-                  size="sm"
-                  className="flex items-center space-x-2 pl-1 hover:bg-transparent"
-                  onClick={() => navigateToFolder(folder.id)}
-                >
-                  <FolderIcon className="h-4 w-4" />
-                  <span>{folder.name}</span>
-                </Button>
-              </div>
-            ))}
-          </div>
-
-          <div className="flex gap-4 sm:flex-row sm:justify-end">
-            <DocumentUploadDropzone />
-            <CreateFolderDialog />
-          </div>
-        </div>
-
-        {isFoldersLoading ? (
-          <div className="mt-6 flex justify-center">
-            <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />
-          </div>
-        ) : (
-          <>
-            {foldersData?.folders && foldersData.folders.some((folder) => folder.pinned) && (
-              <div className="mt-6">
-                <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
-                  {foldersData.folders
-                    .filter((folder) => folder.pinned)
-                    .map((folder) => (
-                      <FolderCard
-                        key={folder.id}
-                        folder={folder}
-                        onNavigate={navigateToFolder}
-                        onMove={(folder) => {
-                          setFolderToMove(folder);
-                          setIsMovingFolder(true);
-                        }}
-                        onPin={(folderId) => void pinFolder({ folderId })}
-                        onUnpin={(folderId) => void unpinFolder({ folderId })}
-                        onSettings={(folder) => {
-                          setFolderToSettings(folder);
-                          setIsSettingsFolderOpen(true);
-                        }}
-                        onDelete={(folder) => {
-                          setFolderToDelete(folder);
-                          setIsDeletingFolder(true);
-                        }}
-                      />
-                    ))}
-                </div>
-              </div>
-            )}
-
-            <div className="mt-6">
-              <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
-                {foldersData?.folders
-                  .filter((folder) => !folder.pinned)
-                  .map((folder) => (
-                    <FolderCard
-                      key={folder.id}
-                      folder={folder}
-                      onNavigate={navigateToFolder}
-                      onMove={(folder) => {
-                        setFolderToMove(folder);
-                        setIsMovingFolder(true);
-                      }}
-                      onPin={(folderId) => void pinFolder({ folderId })}
-                      onUnpin={(folderId) => void unpinFolder({ folderId })}
-                      onSettings={(folder) => {
-                        setFolderToSettings(folder);
-                        setIsSettingsFolderOpen(true);
-                      }}
-                      onDelete={(folder) => {
-                        setFolderToDelete(folder);
-                        setIsDeletingFolder(true);
-                      }}
-                    />
-                  ))}
-              </div>
-            </div>
-          </>
-        )}
-
-        <div className="mt-12 flex flex-wrap items-center justify-between gap-x-4 gap-y-8">
-          <div className="flex flex-row items-center">
-            {team && (
-              <Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">
-                {team.avatarImageId && <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />}
-                <AvatarFallback className="text-muted-foreground text-xs">
-                  {team.name.slice(0, 1)}
-                </AvatarFallback>
-              </Avatar>
-            )}
-
-            <h2 className="text-4xl font-semibold">
-              <Trans>Documents</Trans>
-            </h2>
-          </div>
-
-          <div className="-m-1 flex flex-wrap gap-x-4 gap-y-6 overflow-hidden p-1">
-            <Tabs value={findDocumentSearchParams.status || 'ALL'} className="overflow-x-auto">
-              <TabsList>
-                {[
-                  ExtendedDocumentStatus.INBOX,
-                  ExtendedDocumentStatus.PENDING,
-                  ExtendedDocumentStatus.COMPLETED,
-                  ExtendedDocumentStatus.DRAFT,
-                  ExtendedDocumentStatus.ALL,
-                ].map((value) => (
-                  <TabsTrigger
-                    key={value}
-                    className="hover:text-foreground min-w-[60px]"
-                    value={value}
-                    asChild
-                  >
-                    <Link to={getTabHref(value)} preventScrollReset>
-                      <DocumentStatus status={value} />
-
-                      {value !== ExtendedDocumentStatus.ALL && (
-                        <span className="ml-1 inline-block opacity-50">{stats[value]}</span>
-                      )}
-                    </Link>
-                  </TabsTrigger>
-                ))}
-              </TabsList>
-            </Tabs>
-
-            {team && <DocumentsTableSenderFilter teamId={team.id} />}
-
-            <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">
-              <PeriodSelector />
-            </div>
-            <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">
-              <DocumentSearch initialValue={findDocumentSearchParams.query} />
-            </div>
-          </div>
-        </div>
-
-        <div className="mt-8">
-          <div>
-            {data &&
-            data.count === 0 &&
-            (!foldersData?.folders.length || foldersData.folders.length === 0) ? (
-              <DocumentsTableEmptyState
-                status={findDocumentSearchParams.status || ExtendedDocumentStatus.ALL}
-              />
-            ) : (
-              <DocumentsTable
-                data={data}
-                isLoading={isLoading}
-                isLoadingError={isLoadingError}
-                onMoveDocument={(documentId) => {
-                  setDocumentToMove(documentId);
-                  setIsMovingDocument(true);
-                }}
-              />
-            )}
-          </div>
-        </div>
-
-        {documentToMove && (
-          <DocumentMoveToFolderDialog
-            documentId={documentToMove}
-            open={isMovingDocument}
-            onOpenChange={(open) => {
-              setIsMovingDocument(open);
-
-              if (!open) {
-                setDocumentToMove(null);
-              }
-            }}
-            currentFolderId={folderId}
-          />
-        )}
-
-        <FolderMoveDialog
-          foldersData={foldersData?.folders}
-          folder={folderToMove}
-          isOpen={isMovingFolder}
-          onOpenChange={(open) => {
-            setIsMovingFolder(open);
-
-            if (!open) {
-              setFolderToMove(null);
-            }
-          }}
-        />
-
-        <FolderSettingsDialog
-          folder={folderToSettings}
-          isOpen={isSettingsFolderOpen}
-          onOpenChange={(open) => {
-            setIsSettingsFolderOpen(open);
-
-            if (!open) {
-              setFolderToSettings(null);
-            }
-          }}
-        />
-
-        <FolderDeleteDialog
-          folder={folderToDelete}
-          isOpen={isDeletingFolder}
-          onOpenChange={(open) => {
-            setIsDeletingFolder(open);
-
-            if (!open) {
-              setFolderToDelete(null);
-            }
-          }}
-        />
-      </div>
-    </DocumentDropZoneWrapper>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/documents.folders._index.tsx b/apps/remix/app/routes/_authenticated+/documents.folders._index.tsx
deleted file mode 100644
index 335502781..000000000
--- a/apps/remix/app/routes/_authenticated+/documents.folders._index.tsx
+++ /dev/null
@@ -1,181 +0,0 @@
-import { useState } from 'react';
-
-import { Trans } from '@lingui/react/macro';
-import { HomeIcon, Loader2 } from 'lucide-react';
-import { useNavigate } from 'react-router';
-
-import { FolderType } from '@documenso/lib/types/folder-type';
-import { formatDocumentsPath } from '@documenso/lib/utils/teams';
-import { trpc } from '@documenso/trpc/react';
-import { type TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';
-import { Button } from '@documenso/ui/primitives/button';
-
-import { CreateFolderDialog } from '~/components/dialogs/folder-create-dialog';
-import { FolderDeleteDialog } from '~/components/dialogs/folder-delete-dialog';
-import { FolderMoveDialog } from '~/components/dialogs/folder-move-dialog';
-import { FolderSettingsDialog } from '~/components/dialogs/folder-settings-dialog';
-import { FolderCard } from '~/components/general/folder/folder-card';
-import { appMetaTags } from '~/utils/meta';
-
-export function meta() {
-  return appMetaTags('Documents');
-}
-
-export default function DocumentsFoldersPage() {
-  const navigate = useNavigate();
-  const [isMovingFolder, setIsMovingFolder] = useState(false);
-  const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);
-  const [isDeletingFolder, setIsDeletingFolder] = useState(false);
-  const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);
-  const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);
-  const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);
-
-  const { data: foldersData, isLoading: isFoldersLoading } = trpc.folder.getFolders.useQuery({
-    type: FolderType.DOCUMENT,
-    parentId: null,
-  });
-
-  const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();
-  const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();
-
-  const navigateToFolder = (folderId?: string | null) => {
-    const documentsPath = formatDocumentsPath();
-
-    if (folderId) {
-      void navigate(`${documentsPath}/f/${folderId}`);
-    } else {
-      void navigate(documentsPath);
-    }
-  };
-
-  return (
-    <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">
-      <div className="flex w-full items-center justify-between">
-        <div className="flex flex-1 items-center">
-          <Button
-            variant="ghost"
-            size="sm"
-            className="flex items-center space-x-2 pl-0 hover:bg-transparent"
-            onClick={() => navigateToFolder(null)}
-          >
-            <HomeIcon className="h-4 w-4" />
-            <span>Home</span>
-          </Button>
-        </div>
-
-        <div className="flex flex-col gap-y-4 sm:flex-row sm:justify-end sm:gap-x-4">
-          <CreateFolderDialog />
-        </div>
-      </div>
-
-      <div className="mt-6">
-        {isFoldersLoading ? (
-          <div className="mt-6 flex justify-center">
-            <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />
-          </div>
-        ) : (
-          <>
-            {foldersData?.folders?.some((folder) => folder.pinned) && (
-              <div className="mt-6">
-                <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
-                  {foldersData.folders
-                    .filter((folder) => folder.pinned)
-                    .map((folder) => (
-                      <FolderCard
-                        key={folder.id}
-                        folder={folder}
-                        onNavigate={navigateToFolder}
-                        onMove={(folder) => {
-                          setFolderToMove(folder);
-                          setIsMovingFolder(true);
-                        }}
-                        onPin={(folderId) => void pinFolder({ folderId })}
-                        onUnpin={(folderId) => void unpinFolder({ folderId })}
-                        onSettings={(folder) => {
-                          setFolderToSettings(folder);
-                          setIsSettingsFolderOpen(true);
-                        }}
-                        onDelete={(folder) => {
-                          setFolderToDelete(folder);
-                          setIsDeletingFolder(true);
-                        }}
-                      />
-                    ))}
-                </div>
-              </div>
-            )}
-
-            <div className="mt-12">
-              <h1 className="truncate text-2xl font-semibold md:text-3xl">
-                <Trans>All Folders</Trans>
-              </h1>
-
-              <div className="mt-6 grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
-                {foldersData?.folders
-                  .filter((folder) => !folder.pinned)
-                  .map((folder) => (
-                    <FolderCard
-                      key={folder.id}
-                      folder={folder}
-                      onNavigate={navigateToFolder}
-                      onMove={(folder) => {
-                        setFolderToMove(folder);
-                        setIsMovingFolder(true);
-                      }}
-                      onPin={(folderId) => void pinFolder({ folderId })}
-                      onUnpin={(folderId) => void unpinFolder({ folderId })}
-                      onSettings={(folder) => {
-                        setFolderToSettings(folder);
-                        setIsSettingsFolderOpen(true);
-                      }}
-                      onDelete={(folder) => {
-                        setFolderToDelete(folder);
-                        setIsDeletingFolder(true);
-                      }}
-                    />
-                  ))}
-              </div>
-            </div>
-          </>
-        )}
-      </div>
-
-      <FolderMoveDialog
-        foldersData={foldersData?.folders}
-        folder={folderToMove}
-        isOpen={isMovingFolder}
-        onOpenChange={(open) => {
-          setIsMovingFolder(open);
-
-          if (!open) {
-            setFolderToMove(null);
-          }
-        }}
-      />
-
-      <FolderSettingsDialog
-        folder={folderToSettings}
-        isOpen={isSettingsFolderOpen}
-        onOpenChange={(open) => {
-          setIsSettingsFolderOpen(open);
-
-          if (!open) {
-            setFolderToSettings(null);
-          }
-        }}
-      />
-
-      <FolderDeleteDialog
-        folder={folderToDelete}
-        isOpen={isDeletingFolder}
-        onOpenChange={(open) => {
-          setIsDeletingFolder(open);
-
-          if (!open) {
-            setFolderToDelete(null);
-          }
-        }}
-      />
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/inbox.tsx b/apps/remix/app/routes/_authenticated+/inbox.tsx
new file mode 100644
index 000000000..fdf4732d7
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/inbox.tsx
@@ -0,0 +1,31 @@
+import { Trans } from '@lingui/react/macro';
+import { InboxIcon } from 'lucide-react';
+
+import { OrganisationInvitations } from '~/components/general/organisations/organisation-invitations';
+import { InboxTable } from '~/components/tables/inbox-table';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+  return appMetaTags('Personal Inbox');
+}
+
+export default function InboxPage() {
+  return (
+    <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">
+      <div className="mb-8">
+        <h1 className="flex flex-row items-center gap-2 text-3xl font-bold">
+          <InboxIcon className="text-muted-foreground h-8 w-8" />
+
+          <Trans>Personal Inbox</Trans>
+        </h1>
+        <p className="text-muted-foreground mt-1">
+          <Trans>Any documents that you have been invited to will appear here</Trans>
+        </p>
+
+        <OrganisationInvitations className="mt-4" />
+      </div>
+
+      <InboxTable />
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx b/apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
new file mode 100644
index 000000000..9cc401c67
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
@@ -0,0 +1,223 @@
+import { Trans, useLingui } from '@lingui/react/macro';
+import {
+  ArrowRight,
+  CalendarIcon,
+  MoreVerticalIcon,
+  PlusIcon,
+  SettingsIcon,
+  TrashIcon,
+  UserIcon,
+  UsersIcon,
+} from 'lucide-react';
+import { Link } from 'react-router';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams-translations';
+import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
+import { canExecuteOrganisationAction } from '@documenso/lib/utils/organisations';
+import { canExecuteTeamAction, formatTeamUrl } from '@documenso/lib/utils/teams';
+import type { TGetOrganisationSessionResponse } from '@documenso/trpc/server/organisation-router/get-organisation-session.types';
+import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
+import { Button } from '@documenso/ui/primitives/button';
+import { Card, CardContent } from '@documenso/ui/primitives/card';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@documenso/ui/primitives/dropdown-menu';
+
+import { TeamCreateDialog } from '~/components/dialogs/team-create-dialog';
+import { TeamDeleteDialog } from '~/components/dialogs/team-delete-dialog';
+
+export default function OrganisationSettingsTeamsPage() {
+  const { t, i18n } = useLingui();
+
+  const organisation = useCurrentOrganisation();
+
+  // No teams view.
+  if (organisation.teams.length === 0) {
+    return (
+      <div className="flex flex-col items-center justify-center px-4 py-16">
+        <div className="bg-muted mb-6 flex h-20 w-20 items-center justify-center rounded-full">
+          <UsersIcon className="text-muted-foreground h-10 w-10" />
+        </div>
+
+        <h2 className="mb-2 text-xl font-semibold">
+          <Trans>No teams yet</Trans>
+        </h2>
+
+        {canExecuteOrganisationAction(
+          'MANAGE_ORGANISATION',
+          organisation.currentOrganisationRole,
+        ) ? (
+          <>
+            <p className="text-muted-foreground mb-8 max-w-md text-center text-sm">
+              <Trans>
+                Teams help you organise your work and collaborate with others. Create your first
+                team to get started.
+              </Trans>
+            </p>
+
+            <TeamCreateDialog
+              trigger={
+                <Button className="flex items-center gap-2">
+                  <PlusIcon className="h-4 w-4" />
+                  <Trans>Create team</Trans>
+                </Button>
+              }
+            />
+
+            <div className="mt-12 max-w-md rounded-lg border px-8 py-6">
+              <h3 className="mb-2 font-medium">
+                <Trans>What you can do with teams:</Trans>
+              </h3>
+              <ul className="text-muted-foreground space-y-2 text-sm">
+                <li className="flex flex-row items-center gap-2">
+                  <div className="bg-muted mt-0.5 flex h-5 w-5 items-center justify-center rounded-full font-bold">
+                    <span className="text-xs">1</span>
+                  </div>
+                  <Trans>Organize your documents and templates</Trans>
+                </li>
+                <li className="flex flex-row items-center gap-2">
+                  <div className="bg-muted mt-0.5 flex h-5 w-5 items-center justify-center rounded-full font-bold">
+                    <span className="text-xs">2</span>
+                  </div>
+                  <Trans>Invite team members to collaborate</Trans>
+                </li>
+                <li className="flex flex-row items-center gap-2">
+                  <div className="bg-muted mt-0.5 flex h-5 w-5 items-center justify-center rounded-full font-bold">
+                    <span className="text-xs">3</span>
+                  </div>
+                  <Trans>Manage permissions and access controls</Trans>
+                </li>
+              </ul>
+            </div>
+          </>
+        ) : (
+          <p className="text-muted-foreground mb-8 max-w-md text-center text-sm">
+            <Trans>
+              You currently have no access to any teams within this organisation. Please contact
+              your organisation to request access.
+            </Trans>
+          </p>
+        )}
+      </div>
+    );
+  }
+
+  return (
+    <div>
+      <div className="mb-6 flex flex-row justify-between">
+        <div>
+          <h1 className="text-2xl font-semibold tracking-tight">
+            <Trans>{organisation.name} Teams</Trans>
+          </h1>
+          <p className="text-muted-foreground mt-1 text-sm">
+            <Trans>Select a team to view its dashboard</Trans>
+          </p>
+        </div>
+
+        <Button asChild>
+          <Link to={`/o/${organisation.url}/settings`}>Manage Organisation</Link>
+        </Button>
+      </div>
+
+      <div className="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
+        {organisation.teams.map((team) => (
+          <Link to={`/t/${team.url}`} key={team.id}>
+            <Card className="hover:bg-muted/50 border-border h-full border transition-all">
+              <CardContent className="p-4">
+                <div className="flex items-center gap-3">
+                  <Avatar className="h-10 w-10 border-2 border-solid">
+                    {team.avatarImageId && (
+                      <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />
+                    )}
+                    <AvatarFallback className="text-sm text-gray-400">
+                      {team.name.slice(0, 1).toUpperCase()}
+                    </AvatarFallback>
+                  </Avatar>
+
+                  <div className="flex-1">
+                    <div className="flex items-center justify-between">
+                      <div>
+                        <h3 className="font-medium">{team.name}</h3>
+                        <div className="text-muted-foreground truncate text-xs">
+                          {formatTeamUrl(team.url)}
+                        </div>
+                      </div>
+
+                      <TeamDropdownMenu team={team} />
+                    </div>
+
+                    <div className="mt-2 flex items-center gap-4">
+                      <div className="text-muted-foreground flex items-center gap-1 text-xs">
+                        <CalendarIcon className="h-3 w-3" />
+                        {i18n.date(team.createdAt, { dateStyle: 'short' })}
+                      </div>
+                      <div className="text-muted-foreground flex items-center gap-1 text-xs">
+                        <UserIcon className="h-3 w-3" />
+                        <span>{t(TEAM_MEMBER_ROLE_MAP[team.currentTeamRole])}</span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </CardContent>
+            </Card>
+          </Link>
+        ))}
+      </div>
+    </div>
+  );
+}
+
+const TeamDropdownMenu = ({ team }: { team: TGetOrganisationSessionResponse[0]['teams'][0] }) => {
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger asChild>
+        <Button variant="ghost" size="sm" className="h-8 w-8 p-0">
+          <MoreVerticalIcon className="h-4 w-4" />
+          <span className="sr-only">Open menu</span>
+        </Button>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="end" onClick={(e) => e.stopPropagation()}>
+        <DropdownMenuItem asChild>
+          <Link to={`/t/${team.url}`}>
+            <ArrowRight className="mr-2 h-4 w-4" />
+            <Trans>Go to team</Trans>
+          </Link>
+        </DropdownMenuItem>
+        <DropdownMenuItem asChild>
+          <Link to={`/t/${team.url}/settings`}>
+            <SettingsIcon className="mr-2 h-4 w-4" />
+            <Trans>Settings</Trans>
+          </Link>
+        </DropdownMenuItem>
+        <DropdownMenuItem asChild>
+          <Link to={`/t/${team.url}/settings/members`}>
+            <UsersIcon className="mr-2 h-4 w-4" />
+            <Trans>Members</Trans>
+          </Link>
+        </DropdownMenuItem>
+
+        {canExecuteTeamAction('DELETE_TEAM', team.currentTeamRole) && (
+          <>
+            <DropdownMenuSeparator />
+
+            <TeamDeleteDialog
+              teamId={team.id}
+              teamName={team.name}
+              trigger={
+                <DropdownMenuItem onSelect={(e) => e.preventDefault()}>
+                  <TrashIcon className="mr-2 h-4 w-4" />
+                  <Trans>Delete</Trans>
+                </DropdownMenuItem>
+              }
+            />
+          </>
+        )}
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+};
diff --git a/apps/remix/app/routes/_authenticated+/o.$orgUrl._layout.tsx b/apps/remix/app/routes/_authenticated+/o.$orgUrl._layout.tsx
new file mode 100644
index 000000000..319571453
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/o.$orgUrl._layout.tsx
@@ -0,0 +1,15 @@
+import { Outlet } from 'react-router';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+
+export default function Layout() {
+  const currentOrganisation = useCurrentOrganisation();
+
+  // Note: We use a key to force a re-render if the team context changes.
+  // This is required otherwise you would see the wrong page content.
+  return (
+    <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8" key={currentOrganisation.url}>
+      <Outlet />
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._index.tsx b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._index.tsx
new file mode 100644
index 000000000..305643512
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._index.tsx
@@ -0,0 +1,11 @@
+import { redirect } from 'react-router';
+
+import type { Route } from './+types/_layout';
+
+export function loader({ params }: Route.LoaderArgs) {
+  if (params.orgUrl) {
+    throw redirect(`/o/${params.orgUrl}/settings/general`);
+  }
+
+  throw redirect('/');
+}
diff --git a/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
new file mode 100644
index 000000000..4ac4f285e
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
@@ -0,0 +1,114 @@
+import { msg } from '@lingui/core/macro';
+import { Trans, useLingui } from '@lingui/react/macro';
+import { Building2Icon, CreditCardIcon, GroupIcon, Settings2Icon, Users2Icon } from 'lucide-react';
+import { FaUsers } from 'react-icons/fa6';
+import { Link, NavLink, Outlet } from 'react-router';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { canExecuteOrganisationAction } from '@documenso/lib/utils/organisations';
+import { cn } from '@documenso/ui/lib/utils';
+import { Button } from '@documenso/ui/primitives/button';
+
+import { GenericErrorLayout } from '~/components/general/generic-error-layout';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+  return appMetaTags('Organisation Settings');
+}
+
+export default function SettingsLayout() {
+  const { t } = useLingui();
+
+  const isBillingEnabled = IS_BILLING_ENABLED();
+  const organisation = useCurrentOrganisation();
+
+  const organisationSettingRoutes = [
+    {
+      path: `/o/${organisation.url}/settings/general`,
+      label: t`General`,
+      icon: Building2Icon,
+    },
+    {
+      path: `/o/${organisation.url}/settings/preferences`,
+      label: t`Preferences`,
+      icon: Settings2Icon,
+    },
+    {
+      path: `/o/${organisation.url}/settings/teams`,
+      label: t`Teams`,
+      icon: FaUsers,
+    },
+    {
+      path: `/o/${organisation.url}/settings/members`,
+      label: t`Members`,
+      icon: Users2Icon,
+    },
+    {
+      path: `/o/${organisation.url}/settings/groups`,
+      label: t`Groups`,
+      icon: GroupIcon,
+    },
+    {
+      path: `/o/${organisation.url}/settings/billing`,
+      label: t`Billing`,
+      icon: CreditCardIcon,
+    },
+  ].filter((route) => (isBillingEnabled ? route : !route.path.includes('/billing')));
+
+  if (!canExecuteOrganisationAction('MANAGE_ORGANISATION', organisation.currentOrganisationRole)) {
+    return (
+      <GenericErrorLayout
+        errorCode={401}
+        errorCodeMap={{
+          401: {
+            heading: msg`Unauthorized`,
+            subHeading: msg`401 Unauthorized`,
+            message: msg`You are not authorized to access this page.`,
+          },
+        }}
+        primaryButton={
+          <Button asChild>
+            <Link to={`/o/${organisation.url}`}>
+              <Trans>Go Back</Trans>
+            </Link>
+          </Button>
+        }
+        secondaryButton={null}
+      />
+    );
+  }
+
+  return (
+    <div>
+      <h1 className="text-4xl font-semibold">
+        <Trans>Organisation Settings</Trans>
+      </h1>
+
+      <div className="mt-4 grid grid-cols-12 gap-x-8 md:mt-8">
+        {/* Navigation */}
+        <div
+          className={cn(
+            'col-span-12 mb-8 flex flex-wrap items-center justify-start gap-x-2 gap-y-4 md:col-span-3 md:w-full md:flex-col md:items-start md:gap-y-2',
+          )}
+        >
+          {organisationSettingRoutes.map((route) => (
+            <NavLink to={route.path} className="group w-full justify-start" key={route.path}>
+              <Button
+                variant="ghost"
+                className="group-aria-[current]:bg-secondary w-full justify-start"
+              >
+                <route.icon className="mr-2 h-5 w-5" />
+                <Trans>{route.label}</Trans>
+              </Button>
+            </NavLink>
+          ))}
+        </div>
+
+        <div className="col-span-12 md:col-span-9">
+          <Outlet />
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
new file mode 100644
index 000000000..7820e20a3
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
@@ -0,0 +1,147 @@
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { Loader } from 'lucide-react';
+import type Stripe from 'stripe';
+import { match } from 'ts-pattern';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { canExecuteOrganisationAction } from '@documenso/lib/utils/organisations';
+import { trpc } from '@documenso/trpc/react';
+
+import { BillingPlans } from '~/components/general/billing-plans';
+import { OrganisationBillingPortalButton } from '~/components/general/organisations/organisation-billing-portal-button';
+import { OrganisationBillingInvoicesTable } from '~/components/tables/organisation-billing-invoices-table';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+  return appMetaTags('Billing');
+}
+
+export default function TeamsSettingBillingPage() {
+  const { _, i18n } = useLingui();
+
+  const organisation = useCurrentOrganisation();
+
+  const { data: subscriptionQuery, isLoading: isLoadingSubscription } =
+    trpc.billing.subscription.get.useQuery({
+      organisationId: organisation.id,
+    });
+
+  if (isLoadingSubscription || !subscriptionQuery) {
+    return (
+      <div className="flex items-center justify-center rounded-lg py-32">
+        <Loader className="text-muted-foreground h-6 w-6 animate-spin" />
+      </div>
+    );
+  }
+
+  const { subscription, plans } = subscriptionQuery;
+
+  const canManageBilling = canExecuteOrganisationAction(
+    'MANAGE_BILLING',
+    organisation.currentOrganisationRole,
+  );
+
+  const { organisationSubscription, stripeSubscription } = subscription || {};
+
+  const currentProductName =
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    (stripeSubscription?.items.data[0].price.product as Stripe.Product | undefined)?.name;
+
+  return (
+    <div>
+      <div className="flex flex-row items-end justify-between">
+        <div>
+          <h3 className="text-2xl font-semibold">
+            <Trans>Billing</Trans>
+          </h3>
+
+          <div className="text-muted-foreground mt-2 text-sm">
+            {!organisationSubscription && (
+              <p>
+                <Trans>
+                  You are currently on the <span className="font-semibold">Free Plan</span>.
+                </Trans>
+              </p>
+            )}
+
+            {organisationSubscription &&
+              match(organisationSubscription.status)
+                .with('ACTIVE', () => (
+                  <p>
+                    {currentProductName ? (
+                      <span>
+                        You are currently subscribed to{' '}
+                        <span className="font-semibold">{currentProductName}</span>
+                      </span>
+                    ) : (
+                      <span>You currently have an active plan</span>
+                    )}
+
+                    {organisationSubscription.periodEnd && (
+                      <span>
+                        {' '}
+                        which is set to{' '}
+                        {organisationSubscription.cancelAtPeriodEnd ? (
+                          <span>
+                            end on{' '}
+                            <span className="font-semibold">
+                              {i18n.date(organisationSubscription.periodEnd)}.
+                            </span>
+                          </span>
+                        ) : (
+                          <span>
+                            automatically renew on{' '}
+                            <span className="font-semibold">
+                              {i18n.date(organisationSubscription.periodEnd)}.
+                            </span>
+                          </span>
+                        )}
+                      </span>
+                    )}
+                  </p>
+                ))
+                .with('INACTIVE', () => (
+                  <p>
+                    {currentProductName ? (
+                      <Trans>
+                        You currently have an inactive{' '}
+                        <span className="font-semibold">{currentProductName}</span> subscription
+                      </Trans>
+                    ) : (
+                      <Trans>Your current plan is inactive.</Trans>
+                    )}
+                  </p>
+                ))
+                .with('PAST_DUE', () => (
+                  <p>
+                    {currentProductName ? (
+                      <Trans>
+                        Your current {currentProductName} plan is past due. Please update your
+                        payment information.
+                      </Trans>
+                    ) : (
+                      <Trans>Your current plan is past due.</Trans>
+                    )}
+                  </p>
+                ))
+                .otherwise(() => null)}
+          </div>
+        </div>
+
+        <OrganisationBillingPortalButton />
+      </div>
+
+      <hr className="my-4" />
+
+      {!subscription && canManageBilling && <BillingPlans plans={plans} />}
+
+      <section className="mt-6">
+        <OrganisationBillingInvoicesTable
+          organisationId={organisation.id}
+          subscriptionExists={Boolean(subscription)}
+        />
+      </section>
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
new file mode 100644
index 000000000..c41ee7ad1
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
@@ -0,0 +1,65 @@
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { canExecuteOrganisationAction } from '@documenso/lib/utils/organisations';
+import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
+
+import { OrganisationDeleteDialog } from '~/components/dialogs/organisation-delete-dialog';
+import { AvatarImageForm } from '~/components/forms/avatar-image';
+import { OrganisationUpdateForm } from '~/components/forms/organisation-update-form';
+import { SettingsHeader } from '~/components/general/settings-header';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+  return appMetaTags('Settings');
+}
+
+export default function OrganisationSettingsGeneral() {
+  const { _ } = useLingui();
+
+  const organisation = useCurrentOrganisation();
+
+  return (
+    <div className="max-w-2xl">
+      <SettingsHeader
+        title={_(msg`General`)}
+        subtitle={_(msg`Here you can edit your organisation details.`)}
+      />
+
+      <div className="space-y-8">
+        <AvatarImageForm organisation={organisation} />
+        <OrganisationUpdateForm />
+      </div>
+
+      {canExecuteOrganisationAction(
+        'DELETE_ORGANISATION',
+        organisation.currentOrganisationRole,
+      ) && (
+        <>
+          <hr className="my-4" />
+
+          <Alert
+            className="flex flex-col justify-between p-6 sm:flex-row sm:items-center"
+            variant="neutral"
+          >
+            <div className="mb-4 sm:mb-0">
+              <AlertTitle>
+                <Trans>Delete organisation</Trans>
+              </AlertTitle>
+
+              <AlertDescription className="mr-2">
+                <Trans>
+                  This organisation, and any associated data will be permanently deleted.
+                </Trans>
+              </AlertDescription>
+            </div>
+
+            <OrganisationDeleteDialog />
+          </Alert>
+        </>
+      )}
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
new file mode 100644
index 000000000..cb433f697
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
@@ -0,0 +1,302 @@
+import { useMemo } from 'react';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
+import { OrganisationGroupType, OrganisationMemberRole } from '@prisma/client';
+import { Loader } from 'lucide-react';
+import { useForm } from 'react-hook-form';
+import { Link } from 'react-router';
+import { z } from 'zod';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { ORGANISATION_MEMBER_ROLE_HIERARCHY } from '@documenso/lib/constants/organisations';
+import { EXTENDED_ORGANISATION_MEMBER_ROLE_MAP } from '@documenso/lib/constants/organisations-translations';
+import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams-translations';
+import { AppError } from '@documenso/lib/errors/app-error';
+import { trpc } from '@documenso/trpc/react';
+import type { TFindOrganisationGroupsResponse } from '@documenso/trpc/server/organisation-router/find-organisation-groups.types';
+import type { TFindOrganisationMembersResponse } from '@documenso/trpc/server/organisation-router/find-organisation-members.types';
+import { Button } from '@documenso/ui/primitives/button';
+import { DataTable, type DataTableColumnDef } from '@documenso/ui/primitives/data-table';
+import {
+  Form,
+  FormControl,
+  FormDescription,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+import { MultiSelectCombobox } from '@documenso/ui/primitives/multi-select-combobox';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@documenso/ui/primitives/select';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { OrganisationGroupDeleteDialog } from '~/components/dialogs/organisation-group-delete-dialog';
+import { GenericErrorLayout } from '~/components/general/generic-error-layout';
+import { SettingsHeader } from '~/components/general/settings-header';
+
+import type { Route } from './+types/o.$orgUrl.settings.groups.$id';
+
+export default function OrganisationGroupSettingsPage({ params }: Route.ComponentProps) {
+  const { t } = useLingui();
+
+  const organisation = useCurrentOrganisation();
+
+  const groupId = params.id;
+
+  const { data: members, isLoading: isLoadingMembers } = trpc.organisation.member.find.useQuery({
+    organisationId: organisation.id,
+  });
+
+  const { data: groupData, isLoading: isLoadingGroup } = trpc.organisation.group.find.useQuery(
+    {
+      organisationId: organisation.id,
+      organisationGroupId: groupId,
+      page: 1,
+      perPage: 1,
+      types: [OrganisationGroupType.CUSTOM],
+    },
+    {
+      enabled: !!organisation.id && !!groupId,
+    },
+  );
+
+  const group = groupData?.data.find((g) => g.id === groupId);
+
+  if (isLoadingGroup || isLoadingMembers) {
+    return (
+      <div className="flex items-center justify-center rounded-lg py-32">
+        <Loader className="text-muted-foreground h-6 w-6 animate-spin" />
+      </div>
+    );
+  }
+
+  // Todo: Update UI, currently out of place.
+  if (!group) {
+    return (
+      <GenericErrorLayout
+        errorCode={404}
+        errorCodeMap={{
+          404: {
+            heading: msg`Organisation group not found`,
+            subHeading: msg`404 Organisation group not found`,
+            message: msg`The organisation group you are looking for may have been removed, renamed or may have never
+                    existed.`,
+          },
+        }}
+        primaryButton={
+          <Button asChild>
+            <Link to={`/o/${organisation.url}/settings/groups`}>
+              <Trans>Go back</Trans>
+            </Link>
+          </Button>
+        }
+        secondaryButton={null}
+      />
+    );
+  }
+
+  return (
+    <div>
+      <SettingsHeader
+        title={t`Organisation Group Settings`}
+        subtitle={t`Manage your organisation group settings.`}
+      >
+        <OrganisationGroupDeleteDialog
+          organisationGroupId={groupId}
+          organisationGroupName={group.name || ''}
+          trigger={
+            <Button variant="destructive" title={t`Remove organisation group`}>
+              <Trans>Delete</Trans>
+            </Button>
+          }
+        />
+      </SettingsHeader>
+
+      <OrganisationGroupForm group={group} organisationMembers={members?.data || []} />
+    </div>
+  );
+}
+
+const ZUpdateOrganisationGroupFormSchema = z.object({
+  name: z.string().min(1, msg`Name is required`.id),
+  organisationRole: z.nativeEnum(OrganisationMemberRole),
+  memberIds: z.array(z.string()),
+});
+
+type TUpdateOrganisationGroupFormSchema = z.infer<typeof ZUpdateOrganisationGroupFormSchema>;
+
+type OrganisationGroupFormOptions = {
+  group: TFindOrganisationGroupsResponse['data'][number];
+  organisationMembers: TFindOrganisationMembersResponse['data'];
+};
+
+const OrganisationGroupForm = ({ group, organisationMembers }: OrganisationGroupFormOptions) => {
+  const { toast } = useToast();
+  const { t } = useLingui();
+
+  const organisation = useCurrentOrganisation();
+
+  const { mutateAsync: updateOrganisationGroup } = trpc.organisation.group.update.useMutation();
+
+  const form = useForm<TUpdateOrganisationGroupFormSchema>({
+    resolver: zodResolver(ZUpdateOrganisationGroupFormSchema),
+    defaultValues: {
+      name: group.name || '',
+      organisationRole: group.organisationRole,
+      memberIds: group.members.map((member) => member.id),
+    },
+  });
+
+  const onSubmit = async (values: TUpdateOrganisationGroupFormSchema) => {
+    try {
+      await updateOrganisationGroup({
+        id: group.id,
+        name: values.name,
+        organisationRole: values.organisationRole,
+        memberIds: values.memberIds,
+      });
+
+      toast({
+        title: t`Success`,
+        description: t`Group has been updated successfully`,
+        duration: 5000,
+      });
+    } catch (err) {
+      const error = AppError.parseError(err);
+      console.error(error);
+
+      toast({
+        title: t`An error occurred`,
+        description: t`We couldn't update the group. Please try again.`,
+        variant: 'destructive',
+      });
+    }
+  };
+
+  const teamGroupsColumns = useMemo(() => {
+    return [
+      {
+        header: t`Team`,
+        accessorKey: 'name',
+      },
+      {
+        header: t`Team Role`,
+        cell: ({ row }) => t(TEAM_MEMBER_ROLE_MAP[row.original.teamRole]),
+      },
+    ] satisfies DataTableColumnDef<OrganisationGroupFormOptions['group']['teams'][number]>[];
+  }, []);
+
+  return (
+    <Form {...form}>
+      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
+        <FormField
+          control={form.control}
+          name="name"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel required>
+                <Trans>Group Name</Trans>
+              </FormLabel>
+              <FormControl>
+                <Input {...field} />
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
+
+        <FormField
+          control={form.control}
+          name="organisationRole"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel required>
+                <Trans>Organisation Role</Trans>
+              </FormLabel>
+              <FormControl>
+                <Select {...field} onValueChange={field.onChange}>
+                  <SelectTrigger className="w-full">
+                    <SelectValue />
+                  </SelectTrigger>
+
+                  <SelectContent position="popper">
+                    {ORGANISATION_MEMBER_ROLE_HIERARCHY[organisation.currentOrganisationRole].map(
+                      (role) => (
+                        <SelectItem key={role} value={role}>
+                          {t(EXTENDED_ORGANISATION_MEMBER_ROLE_MAP[role])}
+                        </SelectItem>
+                      ),
+                    )}
+                  </SelectContent>
+                </Select>
+              </FormControl>
+              <FormMessage />
+              <FormDescription>
+                <Trans>
+                  The organisation role that will be applied to all members in this group.
+                </Trans>
+              </FormDescription>
+            </FormItem>
+          )}
+        />
+
+        <FormField
+          control={form.control}
+          name="memberIds"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>
+                <Trans>Members</Trans>
+              </FormLabel>
+              <FormControl>
+                <MultiSelectCombobox
+                  options={organisationMembers.map((member) => ({
+                    label: member.name || member.email,
+                    value: member.id,
+                  }))}
+                  selectedValues={field.value}
+                  onChange={field.onChange}
+                  className="w-full"
+                  emptySelectionPlaceholder={t`Select members`}
+                />
+              </FormControl>
+              <FormDescription>
+                <Trans>Select the members to include in this group</Trans>
+              </FormDescription>
+            </FormItem>
+          )}
+        />
+
+        <div>
+          <FormLabel>
+            <Trans>Team Assignments</Trans>
+          </FormLabel>
+
+          <div className="my-2">
+            <DataTable columns={teamGroupsColumns} data={group.teams} />
+          </div>
+
+          <FormDescription>
+            <Trans>Teams that this organisation group is currently assigned to</Trans>
+          </FormDescription>
+        </div>
+
+        <div className="flex justify-end">
+          <Button type="submit" loading={form.formState.isSubmitting}>
+            <Trans>Update</Trans>
+          </Button>
+        </div>
+      </form>
+    </Form>
+  );
+};
diff --git a/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups._index.tsx b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups._index.tsx
new file mode 100644
index 000000000..3c3d742fb
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups._index.tsx
@@ -0,0 +1,24 @@
+import { useLingui } from '@lingui/react/macro';
+
+import { OrganisationGroupCreateDialog } from '~/components/dialogs/organisation-group-create-dialog';
+import { SettingsHeader } from '~/components/general/settings-header';
+import { OrganisationGroupsDataTable } from '~/components/tables/organisation-groups-table';
+
+export default function TeamsSettingsMembersPage() {
+  const { t } = useLingui();
+
+  return (
+    <div>
+      <SettingsHeader
+        title={t`Custom Organisation Groups`}
+        subtitle={t`Manage the custom groups of members for your organisation.`}
+      >
+        <OrganisationGroupCreateDialog />
+      </SettingsHeader>
+
+      <div>
+        <OrganisationGroupsDataTable />
+      </div>
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
new file mode 100644
index 000000000..4bac31266
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
@@ -0,0 +1,91 @@
+import { useEffect, useState } from 'react';
+
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { Link, useLocation, useSearchParams } from 'react-router';
+
+import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
+import { Input } from '@documenso/ui/primitives/input';
+import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
+
+import { OrganisationMemberInviteDialog } from '~/components/dialogs/organisation-member-invite-dialog';
+import { SettingsHeader } from '~/components/general/settings-header';
+import { OrganisationMemberInvitesTable } from '~/components/tables/organisation-member-invites-table';
+import { OrganisationMembersDataTable } from '~/components/tables/organisation-members-table';
+
+export default function TeamsSettingsMembersPage() {
+  const { _ } = useLingui();
+
+  const [searchParams, setSearchParams] = useSearchParams();
+  const { pathname } = useLocation();
+
+  const [searchQuery, setSearchQuery] = useState(() => searchParams?.get('query') ?? '');
+
+  const debouncedSearchQuery = useDebouncedValue(searchQuery, 500);
+
+  const currentTab = searchParams?.get('tab') === 'invites' ? 'invites' : 'members';
+
+  /**
+   * Handle debouncing the search query.
+   */
+  useEffect(() => {
+    const params = new URLSearchParams(searchParams?.toString());
+
+    params.set('query', debouncedSearchQuery);
+
+    if (debouncedSearchQuery === '') {
+      params.delete('query');
+    }
+
+    // If nothing  to change then do nothing.
+    if (params.toString() === searchParams?.toString()) {
+      return;
+    }
+
+    setSearchParams(params);
+  }, [debouncedSearchQuery, pathname, searchParams]);
+
+  return (
+    <div>
+      <SettingsHeader
+        title={_(msg`Organisation Members`)}
+        subtitle={_(msg`Manage the members or invite new members.`)}
+      >
+        <OrganisationMemberInviteDialog />
+      </SettingsHeader>
+
+      <div>
+        <div className="my-4 flex flex-row items-center justify-between space-x-4">
+          <Input
+            defaultValue={searchQuery}
+            onChange={(e) => setSearchQuery(e.target.value)}
+            placeholder={_(msg`Search`)}
+          />
+
+          <Tabs value={currentTab} className="flex-shrink-0 overflow-x-auto">
+            <TabsList>
+              <TabsTrigger className="min-w-[60px]" value="members" asChild>
+                <Link to={pathname ?? '/'}>
+                  <Trans>Active</Trans>
+                </Link>
+              </TabsTrigger>
+
+              <TabsTrigger className="min-w-[60px]" value="invites" asChild>
+                <Link to={`${pathname}?tab=invites`}>
+                  <Trans>Pending</Trans>
+                </Link>
+              </TabsTrigger>
+            </TabsList>
+          </Tabs>
+        </div>
+
+        {currentTab === 'invites' ? (
+          <OrganisationMemberInvitesTable key="invites" />
+        ) : (
+          <OrganisationMembersDataTable key="members" />
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
new file mode 100644
index 000000000..2b2920711
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
@@ -0,0 +1,199 @@
+import { Trans, useLingui } from '@lingui/react/macro';
+import { Loader } from 'lucide-react';
+import { Link } from 'react-router';
+
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { DocumentSignatureType } from '@documenso/lib/constants/document';
+import { putFile } from '@documenso/lib/universal/upload/put-file';
+import { canExecuteOrganisationAction, isPersonalLayout } from '@documenso/lib/utils/organisations';
+import { trpc } from '@documenso/trpc/react';
+import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
+import { Button } from '@documenso/ui/primitives/button';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import {
+  BrandingPreferencesForm,
+  type TBrandingPreferencesFormSchema,
+} from '~/components/forms/branding-preferences-form';
+import {
+  DocumentPreferencesForm,
+  type TDocumentPreferencesFormSchema,
+} from '~/components/forms/document-preferences-form';
+import { SettingsHeader } from '~/components/general/settings-header';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+  return appMetaTags('Preferences');
+}
+
+export default function OrganisationSettingsPreferencesPage() {
+  const { organisations } = useSession();
+
+  const organisation = useCurrentOrganisation();
+
+  const { t } = useLingui();
+  const { toast } = useToast();
+
+  const isPersonalLayoutMode = isPersonalLayout(organisations);
+
+  const { data: organisationWithSettings, isLoading: isLoadingOrganisation } =
+    trpc.organisation.get.useQuery({
+      organisationReference: organisation.url,
+    });
+
+  const { mutateAsync: updateOrganisationSettings } =
+    trpc.organisation.settings.update.useMutation();
+
+  const onDocumentPreferencesFormSubmit = async (data: TDocumentPreferencesFormSchema) => {
+    try {
+      const {
+        documentVisibility,
+        documentLanguage,
+        includeSenderDetails,
+        includeSigningCertificate,
+        signatureTypes,
+      } = data;
+
+      if (
+        documentVisibility === null ||
+        documentLanguage === null ||
+        includeSenderDetails === null ||
+        includeSigningCertificate === null
+      ) {
+        throw new Error('Should not be possible.');
+      }
+
+      await updateOrganisationSettings({
+        organisationId: organisation.id,
+        data: {
+          documentVisibility,
+          documentLanguage,
+          includeSenderDetails,
+          includeSigningCertificate,
+          typedSignatureEnabled: signatureTypes.includes(DocumentSignatureType.TYPE),
+          uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
+          drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
+        },
+      });
+
+      toast({
+        title: t`Document preferences updated`,
+        description: t`Your document preferences have been updated`,
+      });
+    } catch (err) {
+      toast({
+        title: t`Something went wrong!`,
+        description: t`We were unable to update your document preferences at this time, please try again later`,
+        variant: 'destructive',
+      });
+    }
+  };
+
+  const onBrandingPreferencesFormSubmit = async (data: TBrandingPreferencesFormSchema) => {
+    try {
+      const { brandingEnabled, brandingLogo, brandingUrl, brandingCompanyDetails } = data;
+
+      let uploadedBrandingLogo: string | undefined = '';
+
+      if (brandingLogo) {
+        uploadedBrandingLogo = JSON.stringify(await putFile(brandingLogo));
+      }
+
+      await updateOrganisationSettings({
+        organisationId: organisation.id,
+        data: {
+          brandingEnabled: brandingEnabled ?? undefined,
+          brandingLogo: uploadedBrandingLogo,
+          brandingUrl,
+          brandingCompanyDetails,
+        },
+      });
+
+      toast({
+        title: t`Branding preferences updated`,
+        description: t`Your branding preferences have been updated`,
+      });
+    } catch (err) {
+      toast({
+        title: t`Something went wrong`,
+        description: t`We were unable to update your branding preferences at this time, please try again later`,
+        variant: 'destructive',
+      });
+    }
+  };
+
+  if (isLoadingOrganisation || !organisationWithSettings) {
+    return (
+      <div className="flex items-center justify-center rounded-lg py-32">
+        <Loader className="text-muted-foreground h-6 w-6 animate-spin" />
+      </div>
+    );
+  }
+
+  const settingsHeaderText = isPersonalLayoutMode ? t`Preferences` : t`Organisation Preferences`;
+  const settingsHeaderSubtitle = isPersonalLayoutMode
+    ? t`Here you can set your general preferences`
+    : t`Here you can set preferences and defaults for your organisation. Teams will inherit these settings by default.`;
+
+  return (
+    <div className="max-w-2xl">
+      <SettingsHeader title={settingsHeaderText} subtitle={settingsHeaderSubtitle} />
+
+      <section>
+        <DocumentPreferencesForm
+          canInherit={false}
+          settings={organisationWithSettings.organisationGlobalSettings}
+          onFormSubmit={onDocumentPreferencesFormSubmit}
+        />
+      </section>
+
+      {organisationWithSettings.organisationClaim.flags.allowCustomBranding ||
+      !IS_BILLING_ENABLED() ? (
+        <section>
+          <SettingsHeader
+            title={t`Branding Preferences`}
+            subtitle={t`Here you can set preferences and defaults for branding.`}
+            className="mt-8"
+          />
+
+          <BrandingPreferencesForm
+            context="Organisation"
+            settings={organisationWithSettings.organisationGlobalSettings}
+            onFormSubmit={onBrandingPreferencesFormSubmit}
+          />
+        </section>
+      ) : (
+        <Alert
+          className="mt-8 flex flex-col justify-between p-6 sm:flex-row sm:items-center"
+          variant="neutral"
+        >
+          <div className="mb-4 sm:mb-0">
+            <AlertTitle>
+              <Trans>Branding Preferences</Trans>
+            </AlertTitle>
+
+            <AlertDescription className="mr-2">
+              <Trans>Currently branding can only be configured for Teams and above plans.</Trans>
+            </AlertDescription>
+          </div>
+
+          {canExecuteOrganisationAction('MANAGE_BILLING', organisation.currentOrganisationRole) && (
+            <Button asChild variant="outline">
+              <Link
+                to={
+                  isPersonalLayoutMode
+                    ? '/settings/billing'
+                    : `/o/${organisation.url}/settings/billing`
+                }
+              >
+                <Trans>Update Billing</Trans>
+              </Link>
+            </Button>
+          )}
+        </Alert>
+      )}
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
new file mode 100644
index 000000000..35199565f
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
@@ -0,0 +1,55 @@
+import { useEffect, useState } from 'react';
+
+import { useLingui } from '@lingui/react/macro';
+import { useSearchParams } from 'react-router';
+import { useLocation } from 'react-router';
+
+import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
+import { Input } from '@documenso/ui/primitives/input';
+
+import { TeamCreateDialog } from '~/components/dialogs/team-create-dialog';
+import { SettingsHeader } from '~/components/general/settings-header';
+import { OrganisationTeamsTable } from '~/components/tables/organisation-teams-table';
+
+export default function OrganisationSettingsTeamsPage() {
+  const { t } = useLingui();
+
+  const [searchParams, setSearchParams] = useSearchParams();
+  const { pathname } = useLocation();
+
+  const [searchQuery, setSearchQuery] = useState(() => searchParams?.get('query') ?? '');
+
+  const debouncedSearchQuery = useDebouncedValue(searchQuery, 500);
+
+  /**
+   * Handle debouncing the search query.
+   */
+  useEffect(() => {
+    const params = new URLSearchParams(searchParams?.toString());
+
+    params.set('query', debouncedSearchQuery);
+
+    if (debouncedSearchQuery === '') {
+      params.delete('query');
+    }
+
+    setSearchParams(params);
+  }, [debouncedSearchQuery, pathname, searchParams]);
+
+  return (
+    <div>
+      <SettingsHeader title={t`Teams`} subtitle={t`Manage the teams in this organisation.`}>
+        <TeamCreateDialog />
+      </SettingsHeader>
+
+      <Input
+        defaultValue={searchQuery}
+        onChange={(e) => setSearchQuery(e.target.value)}
+        placeholder={t`Search`}
+        className="mb-4"
+      />
+
+      <OrganisationTeamsTable />
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/_layout.tsx b/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/_layout.tsx
new file mode 100644
index 000000000..7f2336dde
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/_layout.tsx
@@ -0,0 +1,56 @@
+import { useEffect } from 'react';
+
+import { Outlet, useNavigate } from 'react-router';
+
+import { OrganisationProvider } from '@documenso/lib/client-only/providers/organisation';
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { isPersonalLayout } from '@documenso/lib/utils/organisations';
+import { TrpcProvider } from '@documenso/trpc/react';
+
+import { TeamProvider } from '~/providers/team';
+
+/**
+ * These routes should only render if the user has:
+ *
+ * - 1 Personal organisation
+ * - Nothing else
+ *
+ * This removes the UX complexity for users who only have a single personal organisation, instead of showing them multiple settings pages:
+ *
+ * - Organisation settings
+ * - Teams settings
+ */
+export default function Layout() {
+  const { organisations } = useSession();
+
+  const navigate = useNavigate();
+
+  const isPersonalLayoutMode = isPersonalLayout(organisations);
+
+  const currentOrganisation = organisations[0];
+  const team = currentOrganisation?.teams[0] || null;
+
+  useEffect(() => {
+    if (!isPersonalLayoutMode || !team) {
+      void navigate('/settings/profile');
+    }
+  }, []);
+
+  if (!isPersonalLayoutMode || !team) {
+    return null;
+  }
+
+  const trpcHeaders = {
+    'x-team-Id': team.id.toString(),
+  };
+
+  return (
+    <TrpcProvider headers={trpcHeaders}>
+      <OrganisationProvider organisation={currentOrganisation}>
+        <TeamProvider team={team}>
+          <Outlet />
+        </TeamProvider>
+      </OrganisationProvider>
+    </TrpcProvider>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/billing.tsx b/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/billing.tsx
new file mode 100644
index 000000000..037034421
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/billing.tsx
@@ -0,0 +1,5 @@
+import BillingPage, { meta } from '../../o.$orgUrl.settings.billing';
+
+export { meta };
+
+export default BillingPage;
diff --git a/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/preferences.tsx b/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/preferences.tsx
new file mode 100644
index 000000000..db082d779
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/preferences.tsx
@@ -0,0 +1,5 @@
+import PreferencesPage, { meta } from '../../o.$orgUrl.settings.preferences';
+
+export { meta };
+
+export default PreferencesPage;
diff --git a/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/public-profile.tsx b/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/public-profile.tsx
new file mode 100644
index 000000000..81c3f4e4f
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/public-profile.tsx
@@ -0,0 +1,5 @@
+import PublicProfilePage, { loader, meta } from '../../t.$teamUrl+/settings.public-profile';
+
+export { meta, loader };
+
+export default PublicProfilePage;
diff --git a/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/tokens.tsx b/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/tokens.tsx
new file mode 100644
index 000000000..80fdd409f
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/tokens.tsx
@@ -0,0 +1,5 @@
+import TokensPage, { meta } from '../../t.$teamUrl+/settings.tokens';
+
+export { meta };
+
+export default TokensPage;
diff --git a/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/webhooks.$id.tsx b/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/webhooks.$id.tsx
new file mode 100644
index 000000000..3125a210c
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/webhooks.$id.tsx
@@ -0,0 +1,5 @@
+import WebhookPage, { meta } from '../../t.$teamUrl+/settings.webhooks.$id';
+
+export { meta };
+
+export default WebhookPage;
diff --git a/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/webhooks._index.tsx b/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/webhooks._index.tsx
new file mode 100644
index 000000000..8bee37cbb
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/webhooks._index.tsx
@@ -0,0 +1,5 @@
+import WebhookPage, { meta } from '../../t.$teamUrl+/settings.webhooks._index';
+
+export { meta };
+
+export default WebhookPage;
diff --git a/apps/remix/app/routes/_authenticated+/settings+/billing.tsx b/apps/remix/app/routes/_authenticated+/settings+/billing.tsx
deleted file mode 100644
index be6d2e8e9..000000000
--- a/apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-import { Trans, useLingui } from '@lingui/react/macro';
-import { SubscriptionStatus } from '@prisma/client';
-import { redirect } from 'react-router';
-import { match } from 'ts-pattern';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer';
-import { getPricesByInterval } from '@documenso/ee/server-only/stripe/get-prices-by-interval';
-import { getPrimaryAccountPlanPrices } from '@documenso/ee/server-only/stripe/get-primary-account-plan-prices';
-import { getProductByPriceId } from '@documenso/ee/server-only/stripe/get-product-by-price-id';
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
-import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing';
-import { type Stripe } from '@documenso/lib/server-only/stripe';
-import { getSubscriptionsByUserId } from '@documenso/lib/server-only/subscription/get-subscriptions-by-user-id';
-
-import { BillingPlans } from '~/components/general/billing-plans';
-import { BillingPortalButton } from '~/components/general/billing-portal-button';
-import { appMetaTags } from '~/utils/meta';
-import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
-
-import type { Route } from './+types/billing';
-
-export function meta() {
-  return appMetaTags('Billing');
-}
-
-export async function loader({ request }: Route.LoaderArgs) {
-  const { user } = await getSession(request);
-
-  // Redirect if subscriptions are not enabled.
-  if (!IS_BILLING_ENABLED()) {
-    throw redirect('/settings/profile');
-  }
-
-  if (!user.customerId) {
-    await getStripeCustomerByUser(user).then((result) => result.user);
-  }
-
-  const [subscriptions, prices, primaryAccountPlanPrices] = await Promise.all([
-    getSubscriptionsByUserId({ userId: user.id }),
-    getPricesByInterval({ plans: [STRIPE_PLAN_TYPE.REGULAR, STRIPE_PLAN_TYPE.PLATFORM] }),
-    getPrimaryAccountPlanPrices(),
-  ]);
-
-  const primaryAccountPlanPriceIds = primaryAccountPlanPrices.map(({ id }) => id);
-
-  let subscriptionProduct: Stripe.Product | null = null;
-
-  const primaryAccountPlanSubscriptions = subscriptions.filter(({ priceId }) =>
-    primaryAccountPlanPriceIds.includes(priceId),
-  );
-
-  const subscription =
-    primaryAccountPlanSubscriptions.find(({ status }) => status === SubscriptionStatus.ACTIVE) ??
-    primaryAccountPlanSubscriptions[0];
-
-  if (subscription?.priceId) {
-    subscriptionProduct = await getProductByPriceId({ priceId: subscription.priceId }).catch(
-      () => null,
-    );
-  }
-
-  const isMissingOrInactiveOrFreePlan =
-    !subscription || subscription.status === SubscriptionStatus.INACTIVE;
-
-  return superLoaderJson({
-    prices,
-    subscription,
-    subscriptionProductName: subscriptionProduct?.name,
-    isMissingOrInactiveOrFreePlan,
-  });
-}
-
-export default function TeamsSettingBillingPage() {
-  const { prices, subscription, subscriptionProductName, isMissingOrInactiveOrFreePlan } =
-    useSuperLoaderData<typeof loader>();
-
-  const { i18n } = useLingui();
-
-  return (
-    <div>
-      <div className="flex flex-row items-end justify-between">
-        <div>
-          <h3 className="text-2xl font-semibold">
-            <Trans>Billing</Trans>
-          </h3>
-
-          <div className="text-muted-foreground mt-2 text-sm">
-            {isMissingOrInactiveOrFreePlan && (
-              <p>
-                <Trans>
-                  You are currently on the <span className="font-semibold">Free Plan</span>.
-                </Trans>
-              </p>
-            )}
-
-            {/* Todo: Translation */}
-            {!isMissingOrInactiveOrFreePlan &&
-              match(subscription.status)
-                .with('ACTIVE', () => (
-                  <p>
-                    {subscriptionProductName ? (
-                      <span>
-                        You are currently subscribed to{' '}
-                        <span className="font-semibold">{subscriptionProductName}</span>
-                      </span>
-                    ) : (
-                      <span>You currently have an active plan</span>
-                    )}
-
-                    {subscription.periodEnd && (
-                      <span>
-                        {' '}
-                        which is set to{' '}
-                        {subscription.cancelAtPeriodEnd ? (
-                          <span>
-                            end on{' '}
-                            <span className="font-semibold">
-                              {i18n.date(subscription.periodEnd)}.
-                            </span>
-                          </span>
-                        ) : (
-                          <span>
-                            automatically renew on{' '}
-                            <span className="font-semibold">
-                              {i18n.date(subscription.periodEnd)}.
-                            </span>
-                          </span>
-                        )}
-                      </span>
-                    )}
-                  </p>
-                ))
-                .with('PAST_DUE', () => (
-                  <p>
-                    <Trans>
-                      Your current plan is past due. Please update your payment information.
-                    </Trans>
-                  </p>
-                ))
-                .otherwise(() => null)}
-          </div>
-        </div>
-
-        {isMissingOrInactiveOrFreePlan && (
-          <BillingPortalButton>
-            <Trans>Manage billing</Trans>
-          </BillingPortalButton>
-        )}
-      </div>
-
-      <hr className="my-4" />
-
-      {isMissingOrInactiveOrFreePlan ? <BillingPlans prices={prices} /> : <BillingPortalButton />}
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/settings+/organisations.tsx b/apps/remix/app/routes/_authenticated+/settings+/organisations.tsx
new file mode 100644
index 000000000..4d6765cb9
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/settings+/organisations.tsx
@@ -0,0 +1,28 @@
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+
+import { OrganisationCreateDialog } from '~/components/dialogs/organisation-create-dialog';
+import { OrganisationInvitations } from '~/components/general/organisations/organisation-invitations';
+import { SettingsHeader } from '~/components/general/settings-header';
+import { UserOrganisationsTable } from '~/components/tables/user-organisations-table';
+
+export default function TeamsSettingsPage() {
+  const { _ } = useLingui();
+
+  return (
+    <div>
+      <SettingsHeader
+        title={_(msg`Organisations`)}
+        subtitle={_(msg`Manage all organisations you are currently associated with.`)}
+      >
+        <OrganisationCreateDialog />
+      </SettingsHeader>
+
+      <UserOrganisationsTable />
+
+      <div className="mt-8 space-y-8">
+        <OrganisationInvitations />
+      </div>
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/settings+/profile.tsx b/apps/remix/app/routes/_authenticated+/settings+/profile.tsx
index 77909d147..48bceb31e 100644
--- a/apps/remix/app/routes/_authenticated+/settings+/profile.tsx
+++ b/apps/remix/app/routes/_authenticated+/settings+/profile.tsx
@@ -1,10 +1,17 @@
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
+import { AnimatePresence } from 'framer-motion';
+
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { isPersonalLayout } from '@documenso/lib/utils/organisations';
+import { trpc } from '@documenso/trpc/react';
+import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';
 
 import { AccountDeleteDialog } from '~/components/dialogs/account-delete-dialog';
 import { AvatarImageForm } from '~/components/forms/avatar-image';
 import { ProfileForm } from '~/components/forms/profile';
 import { SettingsHeader } from '~/components/general/settings-header';
+import { TeamEmailUsage } from '~/components/general/teams/team-email-usage';
 import { appMetaTags } from '~/utils/meta';
 
 export function meta() {
@@ -13,6 +20,11 @@ export function meta() {
 
 export default function SettingsProfile() {
   const { _ } = useLingui();
+  const { organisations, user } = useSession();
+
+  const { data: teamEmail } = trpc.team.email.get.useQuery();
+
+  const isPersonalLayoutMode = isPersonalLayout(organisations);
 
   return (
     <div>
@@ -26,7 +38,17 @@ export default function SettingsProfile() {
 
       <hr className="my-4 max-w-xl" />
 
-      <AccountDeleteDialog className="max-w-xl" />
+      <div className="max-w-xl space-y-8">
+        <AnimatePresence>
+          {(!isPersonalLayoutMode || user.email !== teamEmail?.email) && teamEmail && (
+            <AnimateGenericFadeInOut>
+              <TeamEmailUsage teamEmail={teamEmail} />
+            </AnimateGenericFadeInOut>
+          )}
+        </AnimatePresence>
+
+        <AccountDeleteDialog />
+      </div>
     </div>
   );
 }
diff --git a/apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx b/apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
deleted file mode 100644
index 345eb9d2e..000000000
--- a/apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+++ /dev/null
@@ -1,237 +0,0 @@
-import { useEffect, useMemo, useState } from 'react';
-
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import type { TemplateDirectLink } from '@prisma/client';
-import { TemplateType } from '@prisma/client';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { useSession } from '@documenso/lib/client-only/providers/session';
-import { getUserPublicProfile } from '@documenso/lib/server-only/user/get-user-public-profile';
-import { trpc } from '@documenso/trpc/react';
-import type { FindTemplateRow } from '@documenso/trpc/server/template-router/schema';
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-import { Switch } from '@documenso/ui/primitives/switch';
-import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { ManagePublicTemplateDialog } from '~/components/dialogs/public-profile-template-manage-dialog';
-import type { TPublicProfileFormSchema } from '~/components/forms/public-profile-form';
-import { PublicProfileForm } from '~/components/forms/public-profile-form';
-import { SettingsHeader } from '~/components/general/settings-header';
-import { SettingsPublicProfileTemplatesTable } from '~/components/tables/settings-public-profile-templates-table';
-import { useOptionalCurrentTeam } from '~/providers/team';
-
-import type { Route } from './+types/public-profile';
-
-type DirectTemplate = FindTemplateRow & {
-  directLink: Pick<TemplateDirectLink, 'token' | 'enabled'>;
-};
-
-const userProfileText = {
-  settingsTitle: msg`Public Profile`,
-  settingsSubtitle: msg`You can choose to enable or disable your profile for public view.`,
-  templatesTitle: msg`My templates`,
-  templatesSubtitle: msg`Show templates in your public profile for your audience to sign and get started quickly`,
-};
-
-const teamProfileText = {
-  settingsTitle: msg`Team Public Profile`,
-  settingsSubtitle: msg`You can choose to enable or disable your team profile for public view.`,
-  templatesTitle: msg`Team templates`,
-  templatesSubtitle: msg`Show templates in your team public profile for your audience to sign and get started quickly`,
-};
-
-export async function loader({ request }: Route.LoaderArgs) {
-  const { user } = await getSession(request);
-
-  const { profile } = await getUserPublicProfile({
-    userId: user.id,
-  });
-
-  return { profile };
-}
-
-export default function PublicProfilePage({ loaderData }: Route.ComponentProps) {
-  const { profile } = loaderData;
-
-  const { _ } = useLingui();
-  const { toast } = useToast();
-
-  const { user, refreshSession } = useSession();
-  const team = useOptionalCurrentTeam();
-
-  const [isPublicProfileVisible, setIsPublicProfileVisible] = useState(profile.enabled);
-  const [isTooltipOpen, setIsTooltipOpen] = useState(false);
-
-  const { data } = trpc.template.findTemplates.useQuery({
-    perPage: 100,
-  });
-
-  const { mutateAsync: updateUserProfile, isPending: isUpdatingUserProfile } =
-    trpc.profile.updatePublicProfile.useMutation();
-
-  const { mutateAsync: updateTeamProfile, isPending: isUpdatingTeamProfile } =
-    trpc.team.updateTeamPublicProfile.useMutation();
-
-  const isUpdating = isUpdatingUserProfile || isUpdatingTeamProfile;
-  const profileText = team ? teamProfileText : userProfileText;
-
-  const enabledPrivateDirectTemplates = useMemo(
-    () =>
-      (data?.data ?? []).filter(
-        (template): template is DirectTemplate =>
-          template.directLink?.enabled === true && template.type !== TemplateType.PUBLIC,
-      ),
-    [data],
-  );
-
-  const onProfileUpdate = async (data: TPublicProfileFormSchema) => {
-    if (team) {
-      await updateTeamProfile({
-        teamId: team.id,
-        ...data,
-      });
-    } else {
-      await updateUserProfile(data);
-
-      // Need to refresh session because we're editing the user's profile.
-      await refreshSession();
-    }
-
-    if (data.enabled === undefined && !isPublicProfileVisible) {
-      setIsTooltipOpen(true);
-    }
-  };
-
-  const togglePublicProfileVisibility = async (isVisible: boolean) => {
-    setIsTooltipOpen(false);
-
-    if (isUpdating) {
-      return;
-    }
-
-    if (isVisible && !user.url) {
-      toast({
-        title: _(msg`You must set a profile URL before enabling your public profile.`),
-        variant: 'destructive',
-      });
-
-      return;
-    }
-
-    setIsPublicProfileVisible(isVisible);
-
-    try {
-      await onProfileUpdate({
-        enabled: isVisible,
-      });
-    } catch {
-      toast({
-        title: _(msg`Something went wrong`),
-        description: _(msg`We were unable to set your public profile to public. Please try again.`),
-        variant: 'destructive',
-      });
-
-      setIsPublicProfileVisible(!isVisible);
-    }
-  };
-
-  useEffect(() => {
-    setIsPublicProfileVisible(profile.enabled);
-  }, [profile.enabled]);
-
-  return (
-    <div className="max-w-2xl">
-      <SettingsHeader
-        title={_(profileText.settingsTitle)}
-        subtitle={_(profileText.settingsSubtitle)}
-      >
-        <Tooltip open={isTooltipOpen} onOpenChange={setIsTooltipOpen}>
-          <TooltipTrigger asChild>
-            <div
-              className={cn(
-                'text-muted-foreground/50 flex flex-row items-center justify-center space-x-2 text-xs',
-                {
-                  '[&>*:first-child]:text-muted-foreground': !isPublicProfileVisible,
-                  '[&>*:last-child]:text-muted-foreground': isPublicProfileVisible,
-                },
-              )}
-            >
-              <span>
-                <Trans>Hide</Trans>
-              </span>
-              <Switch
-                disabled={isUpdating}
-                checked={isPublicProfileVisible}
-                onCheckedChange={togglePublicProfileVisibility}
-              />
-              <span>
-                <Trans>Show</Trans>
-              </span>
-            </div>
-          </TooltipTrigger>
-
-          <TooltipContent className="text-muted-foreground max-w-[40ch] space-y-2 py-2">
-            {isPublicProfileVisible ? (
-              <>
-                <p>
-                  <Trans>
-                    Profile is currently <strong>visible</strong>.
-                  </Trans>
-                </p>
-
-                <p>
-                  <Trans>Toggle the switch to hide your profile from the public.</Trans>
-                </p>
-              </>
-            ) : (
-              <>
-                <p>
-                  <Trans>
-                    Profile is currently <strong>hidden</strong>.
-                  </Trans>
-                </p>
-
-                <p>
-                  <Trans>Toggle the switch to show your profile to the public.</Trans>
-                </p>
-              </>
-            )}
-          </TooltipContent>
-        </Tooltip>
-      </SettingsHeader>
-
-      <PublicProfileForm
-        profileUrl={team ? team.url : user.url}
-        teamUrl={team?.url}
-        profile={profile}
-        onProfileUpdate={onProfileUpdate}
-      />
-
-      <div className="mt-4">
-        <SettingsHeader
-          title={_(profileText.templatesTitle)}
-          subtitle={_(profileText.templatesSubtitle)}
-          hideDivider={true}
-          className="mt-8 [&>*>h3]:text-base"
-        >
-          <ManagePublicTemplateDialog
-            directTemplates={enabledPrivateDirectTemplates}
-            trigger={
-              <Button variant="outline">
-                <Trans>Link template</Trans>
-              </Button>
-            }
-          />
-        </SettingsHeader>
-
-        <div className="mt-6">
-          <SettingsPublicProfileTemplatesTable />
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/settings+/teams.tsx b/apps/remix/app/routes/_authenticated+/settings+/teams.tsx
deleted file mode 100644
index 618ce31ac..000000000
--- a/apps/remix/app/routes/_authenticated+/settings+/teams.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { AnimatePresence } from 'framer-motion';
-
-import { trpc } from '@documenso/trpc/react';
-import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';
-
-import { TeamCreateDialog } from '~/components/dialogs/team-create-dialog';
-import { SettingsHeader } from '~/components/general/settings-header';
-import { TeamEmailUsage } from '~/components/general/teams/team-email-usage';
-import { TeamInvitations } from '~/components/general/teams/team-invitations';
-import { UserSettingsTeamsPageDataTable } from '~/components/tables/user-settings-teams-page-table';
-
-export default function TeamsSettingsPage() {
-  const { _ } = useLingui();
-
-  const { data: teamEmail } = trpc.team.getTeamEmailByEmail.useQuery();
-
-  return (
-    <div>
-      <SettingsHeader
-        title={_(msg`Teams`)}
-        subtitle={_(msg`Manage all teams you are currently associated with.`)}
-      >
-        <TeamCreateDialog />
-      </SettingsHeader>
-
-      <UserSettingsTeamsPageDataTable />
-
-      <div className="mt-8 space-y-8">
-        <AnimatePresence>
-          {teamEmail && (
-            <AnimateGenericFadeInOut>
-              <TeamEmailUsage teamEmail={teamEmail} />
-            </AnimateGenericFadeInOut>
-          )}
-        </AnimatePresence>
-
-        <TeamInvitations />
-      </div>
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/settings+/tokens.tsx b/apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
deleted file mode 100644
index bb7c114b1..000000000
--- a/apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import { TeamMemberRole } from '@prisma/client';
-import { DateTime } from 'luxon';
-
-import { trpc } from '@documenso/trpc/react';
-import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
-import { AlertTitle } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-
-import TokenDeleteDialog from '~/components/dialogs/token-delete-dialog';
-import { ApiTokenForm } from '~/components/forms/token';
-import { SettingsHeader } from '~/components/general/settings-header';
-import { useOptionalCurrentTeam } from '~/providers/team';
-
-export default function ApiTokensPage() {
-  const { i18n } = useLingui();
-
-  const { data: tokens } = trpc.apiToken.getTokens.useQuery();
-
-  const team = useOptionalCurrentTeam();
-
-  return (
-    <div>
-      <SettingsHeader
-        title={<Trans>API Tokens</Trans>}
-        subtitle={
-          <Trans>
-            On this page, you can create and manage API tokens. See our{' '}
-            <a
-              className="text-primary underline"
-              href={'https://docs.documenso.com/developers/public-api'}
-              target="_blank"
-            >
-              Documentation
-            </a>{' '}
-            for more information.
-          </Trans>
-        }
-      />
-
-      {team && team?.currentTeamMember.role !== TeamMemberRole.ADMIN ? (
-        <Alert
-          className="flex flex-col items-center justify-between gap-4 p-6 md:flex-row"
-          variant="warning"
-        >
-          <div>
-            <AlertTitle>
-              <Trans>Unauthorized</Trans>
-            </AlertTitle>
-            <AlertDescription className="mr-2">
-              <Trans>You need to be an admin to manage API tokens.</Trans>
-            </AlertDescription>
-          </div>
-        </Alert>
-      ) : (
-        <>
-          <ApiTokenForm className="max-w-xl" tokens={tokens} />
-
-          <hr className="mb-4 mt-8" />
-
-          <h4 className="text-xl font-medium">
-            <Trans>Your existing tokens</Trans>
-          </h4>
-
-          {tokens && tokens.length === 0 && (
-            <div className="mb-4">
-              <p className="text-muted-foreground mt-2 text-sm italic">
-                <Trans>Your tokens will be shown here once you create them.</Trans>
-              </p>
-            </div>
-          )}
-
-          {tokens && tokens.length > 0 && (
-            <div className="mt-4 flex max-w-xl flex-col gap-y-4">
-              {tokens.map((token) => (
-                <div key={token.id} className="border-border rounded-lg border p-4">
-                  <div className="flex items-center justify-between gap-x-4">
-                    <div>
-                      <h5 className="text-base">{token.name}</h5>
-
-                      <p className="text-muted-foreground mt-2 text-xs">
-                        <Trans>
-                          Created on {i18n.date(token.createdAt, DateTime.DATETIME_FULL)}
-                        </Trans>
-                      </p>
-                      {token.expires ? (
-                        <p className="text-muted-foreground mt-1 text-xs">
-                          <Trans>
-                            Expires on {i18n.date(token.expires, DateTime.DATETIME_FULL)}
-                          </Trans>
-                        </p>
-                      ) : (
-                        <p className="text-muted-foreground mt-1 text-xs">
-                          <Trans>Token doesn't have an expiration date</Trans>
-                        </p>
-                      )}
-                    </div>
-
-                    <div>
-                      <TokenDeleteDialog token={token}>
-                        <Button variant="destructive">
-                          <Trans>Delete</Trans>
-                        </Button>
-                      </TokenDeleteDialog>
-                    </div>
-                  </div>
-                </div>
-              ))}
-            </div>
-          )}
-        </>
-      )}
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx b/apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
deleted file mode 100644
index 0a77fb274..000000000
--- a/apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
+++ /dev/null
@@ -1,212 +0,0 @@
-import { zodResolver } from '@hookform/resolvers/zod';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import { Loader } from 'lucide-react';
-import { useForm } from 'react-hook-form';
-import { useParams, useRevalidator } from 'react-router';
-import type { z } from 'zod';
-
-import { trpc } from '@documenso/trpc/react';
-import { ZEditWebhookMutationSchema } from '@documenso/trpc/server/webhook-router/schema';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Form,
-  FormControl,
-  FormDescription,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { PasswordInput } from '@documenso/ui/primitives/password-input';
-import { Switch } from '@documenso/ui/primitives/switch';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { SettingsHeader } from '~/components/general/settings-header';
-import { WebhookMultiSelectCombobox } from '~/components/general/webhook-multiselect-combobox';
-
-const ZEditWebhookFormSchema = ZEditWebhookMutationSchema.omit({ id: true });
-
-type TEditWebhookFormSchema = z.infer<typeof ZEditWebhookFormSchema>;
-
-export default function WebhookPage() {
-  const params = useParams();
-
-  const { _ } = useLingui();
-  const { toast } = useToast();
-  const { revalidate } = useRevalidator();
-
-  const webhookId = params.id || '';
-
-  const { data: webhook, isLoading } = trpc.webhook.getWebhookById.useQuery(
-    {
-      id: webhookId,
-    },
-    { enabled: !!webhookId },
-  );
-
-  const { mutateAsync: updateWebhook } = trpc.webhook.editWebhook.useMutation();
-
-  const form = useForm<TEditWebhookFormSchema>({
-    resolver: zodResolver(ZEditWebhookFormSchema),
-    values: {
-      webhookUrl: webhook?.webhookUrl ?? '',
-      eventTriggers: webhook?.eventTriggers ?? [],
-      secret: webhook?.secret ?? '',
-      enabled: webhook?.enabled ?? true,
-    },
-  });
-
-  const onSubmit = async (data: TEditWebhookFormSchema) => {
-    try {
-      await updateWebhook({
-        id: webhookId,
-        ...data,
-      });
-
-      toast({
-        title: _(msg`Webhook updated`),
-        description: _(msg`The webhook has been updated successfully.`),
-        duration: 5000,
-      });
-
-      await revalidate();
-    } catch (err) {
-      toast({
-        title: _(msg`Failed to update webhook`),
-        description: _(
-          msg`We encountered an error while updating the webhook. Please try again later.`,
-        ),
-        variant: 'destructive',
-      });
-    }
-  };
-
-  return (
-    <div>
-      <SettingsHeader
-        title={_(msg`Edit webhook`)}
-        subtitle={_(msg`On this page, you can edit the webhook and its settings.`)}
-      />
-
-      {isLoading && (
-        <div className="absolute inset-0 z-50 flex items-center justify-center bg-white/50">
-          <Loader className="h-8 w-8 animate-spin text-gray-500" />
-        </div>
-      )}
-
-      <Form {...form}>
-        <form onSubmit={form.handleSubmit(onSubmit)}>
-          <fieldset
-            className="flex h-full max-w-xl flex-col gap-y-6"
-            disabled={form.formState.isSubmitting}
-          >
-            <div className="flex flex-col-reverse gap-4 md:flex-row">
-              <FormField
-                control={form.control}
-                name="webhookUrl"
-                render={({ field }) => (
-                  <FormItem className="flex-1">
-                    <FormLabel required>
-                      <Trans>Webhook URL</Trans>
-                    </FormLabel>
-                    <FormControl>
-                      <Input className="bg-background" {...field} />
-                    </FormControl>
-
-                    <FormDescription>
-                      <Trans>The URL for Documenso to send webhook events to.</Trans>
-                    </FormDescription>
-
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-
-              <FormField
-                control={form.control}
-                name="enabled"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>
-                      <Trans>Enabled</Trans>
-                    </FormLabel>
-
-                    <div>
-                      <FormControl>
-                        <Switch
-                          className="bg-background"
-                          checked={field.value}
-                          onCheckedChange={field.onChange}
-                        />
-                      </FormControl>
-                    </div>
-
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-            </div>
-
-            <FormField
-              control={form.control}
-              name="eventTriggers"
-              render={({ field: { onChange, value } }) => (
-                <FormItem className="flex flex-col gap-2">
-                  <FormLabel required>
-                    <Trans>Triggers</Trans>
-                  </FormLabel>
-                  <FormControl>
-                    <WebhookMultiSelectCombobox
-                      listValues={value}
-                      onChange={(values: string[]) => {
-                        onChange(values);
-                      }}
-                    />
-                  </FormControl>
-
-                  <FormDescription>
-                    <Trans> The events that will trigger a webhook to be sent to your URL.</Trans>
-                  </FormDescription>
-
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <FormField
-              control={form.control}
-              name="secret"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>
-                    <Trans>Secret</Trans>
-                  </FormLabel>
-                  <FormControl>
-                    <PasswordInput className="bg-background" {...field} value={field.value ?? ''} />
-                  </FormControl>
-
-                  <FormDescription>
-                    <Trans>
-                      A secret that will be sent to your URL so you can verify that the request has
-                      been sent by Documenso.
-                    </Trans>
-                  </FormDescription>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <div className="mt-4">
-              <Button type="submit" loading={form.formState.isSubmitting}>
-                <Trans>Update webhook</Trans>
-              </Button>
-            </div>
-          </fieldset>
-        </form>
-      </Form>
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx b/apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
deleted file mode 100644
index 357ce5b3b..000000000
--- a/apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import { Loader } from 'lucide-react';
-import { DateTime } from 'luxon';
-import { Link } from 'react-router';
-
-import { toFriendlyWebhookEventName } from '@documenso/lib/universal/webhook/to-friendly-webhook-event-name';
-import { trpc } from '@documenso/trpc/react';
-import { cn } from '@documenso/ui/lib/utils';
-import { Badge } from '@documenso/ui/primitives/badge';
-import { Button } from '@documenso/ui/primitives/button';
-
-import { WebhookCreateDialog } from '~/components/dialogs/webhook-create-dialog';
-import { WebhookDeleteDialog } from '~/components/dialogs/webhook-delete-dialog';
-import { SettingsHeader } from '~/components/general/settings-header';
-
-export default function WebhookPage() {
-  const { _, i18n } = useLingui();
-
-  const { data: webhooks, isLoading } = trpc.webhook.getWebhooks.useQuery();
-
-  return (
-    <div>
-      <SettingsHeader
-        title={_(msg`Webhooks`)}
-        subtitle={_(msg`On this page, you can create new Webhooks and manage the existing ones.`)}
-      >
-        <WebhookCreateDialog />
-      </SettingsHeader>
-      {isLoading && (
-        <div className="absolute inset-0 flex items-center justify-center bg-white/50">
-          <Loader className="h-8 w-8 animate-spin text-gray-500" />
-        </div>
-      )}
-      {webhooks && webhooks.length === 0 && (
-        // TODO: Perhaps add some illustrations here to make the page more engaging
-        <div className="mb-4">
-          <p className="text-muted-foreground mt-2 text-sm italic">
-            <Trans>
-              You have no webhooks yet. Your webhooks will be shown here once you create them.
-            </Trans>
-          </p>
-        </div>
-      )}
-      {webhooks && webhooks.length > 0 && (
-        <div className="mt-4 flex max-w-xl flex-col gap-y-4">
-          {webhooks?.map((webhook) => (
-            <div
-              key={webhook.id}
-              className={cn(
-                'border-border rounded-lg border p-4',
-                !webhook.enabled && 'bg-muted/40',
-              )}
-            >
-              <div className="flex flex-col gap-x-4 sm:flex-row sm:items-center sm:justify-between">
-                <div>
-                  <div className="truncate font-mono text-xs">{webhook.id}</div>
-
-                  <div className="mt-1.5 flex items-center gap-4">
-                    <h5
-                      className="max-w-[30rem] truncate text-sm sm:max-w-[18rem]"
-                      title={webhook.webhookUrl}
-                    >
-                      {webhook.webhookUrl}
-                    </h5>
-
-                    <Badge variant={webhook.enabled ? 'neutral' : 'warning'} size="small">
-                      {webhook.enabled ? <Trans>Enabled</Trans> : <Trans>Disabled</Trans>}
-                    </Badge>
-                  </div>
-
-                  <p className="text-muted-foreground mt-2 text-xs">
-                    <Trans>
-                      Listening to{' '}
-                      {webhook.eventTriggers
-                        .map((trigger) => toFriendlyWebhookEventName(trigger))
-                        .join(', ')}
-                    </Trans>
-                  </p>
-
-                  <p className="text-muted-foreground mt-2 text-xs">
-                    <Trans>Created on {i18n.date(webhook.createdAt, DateTime.DATETIME_FULL)}</Trans>
-                  </p>
-                </div>
-
-                <div className="mt-4 flex flex-shrink-0 gap-4 sm:mt-0">
-                  <Button asChild variant="outline">
-                    <Link to={`/settings/webhooks/${webhook.id}`}>
-                      <Trans>Edit</Trans>
-                    </Link>
-                  </Button>
-                  <WebhookDeleteDialog webhook={webhook}>
-                    <Button variant="destructive">
-                      <Trans>Delete</Trans>
-                    </Button>
-                  </WebhookDeleteDialog>
-                </div>
-              </div>
-            </div>
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
index 237844835..9ffebf634 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
@@ -5,32 +5,27 @@ import { Trans } from '@lingui/react/macro';
 import { SubscriptionStatus } from '@prisma/client';
 import { Link, Outlet } from 'react-router';
 
-import { TEAM_PLAN_LIMITS } from '@documenso/ee/server-only/limits/constants';
+import { PAID_PLAN_LIMITS } from '@documenso/ee/server-only/limits/constants';
 import { LimitsProvider } from '@documenso/ee/server-only/limits/provider/client';
-import { useSession } from '@documenso/lib/client-only/providers/session';
+import { useOptionalCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { TrpcProvider } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
 
 import { GenericErrorLayout } from '~/components/general/generic-error-layout';
-import { PortalComponent } from '~/components/general/portal';
-import { TeamLayoutBillingBanner } from '~/components/general/teams/team-layout-billing-banner';
-import { TeamProvider } from '~/providers/team';
+import { useOptionalCurrentTeam } from '~/providers/team';
 
-import type { Route } from './+types/_layout';
-
-export default function Layout({ params }: Route.ComponentProps) {
-  const { teams } = useSession();
-
-  const currentTeam = teams.find((team) => team.url === params.teamUrl);
+export default function Layout() {
+  const team = useOptionalCurrentTeam();
+  const organisation = useOptionalCurrentOrganisation();
 
   const limits = useMemo(() => {
-    if (!currentTeam) {
+    if (!organisation) {
       return undefined;
     }
 
     if (
-      currentTeam?.subscription &&
-      currentTeam.subscription.status === SubscriptionStatus.INACTIVE
+      organisation?.subscription &&
+      organisation.subscription.status === SubscriptionStatus.INACTIVE
     ) {
       return {
         quota: {
@@ -47,12 +42,12 @@ export default function Layout({ params }: Route.ComponentProps) {
     }
 
     return {
-      quota: TEAM_PLAN_LIMITS,
-      remaining: TEAM_PLAN_LIMITS,
+      quota: PAID_PLAN_LIMITS,
+      remaining: PAID_PLAN_LIMITS,
     };
-  }, [currentTeam?.subscription, currentTeam?.id]);
+  }, [organisation?.subscription]);
 
-  if (!currentTeam) {
+  if (!team) {
     return (
       <GenericErrorLayout
         errorCode={404}
@@ -76,29 +71,18 @@ export default function Layout({ params }: Route.ComponentProps) {
   }
 
   const trpcHeaders = {
-    'x-team-Id': currentTeam.id.toString(),
+    'x-team-Id': team.id.toString(),
   };
 
+  // Note: We use a key to force a re-render if the team context changes.
+  // This is required otherwise you would see the wrong page content.
   return (
-    <TeamProvider team={currentTeam}>
-      <LimitsProvider initialValue={limits} teamId={currentTeam.id}>
-        <TrpcProvider headers={trpcHeaders}>
-          {currentTeam?.subscription &&
-            currentTeam.subscription.status !== SubscriptionStatus.ACTIVE && (
-              <PortalComponent target="portal-header">
-                <TeamLayoutBillingBanner
-                  subscriptionStatus={currentTeam.subscription.status}
-                  teamId={currentTeam.id}
-                  userRole={currentTeam.currentTeamMember.role}
-                />
-              </PortalComponent>
-            )}
-
-          <main className="mt-8 pb-8 md:mt-12 md:pb-12">
-            <Outlet />
-          </main>
-        </TrpcProvider>
-      </LimitsProvider>
-    </TeamProvider>
+    <div key={team.url}>
+      <TrpcProvider headers={trpcHeaders}>
+        <LimitsProvider initialValue={limits} teamId={team.id}>
+          <Outlet />
+        </LimitsProvider>
+      </TrpcProvider>
+    </div>
   );
 }
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
index 220a0f5b7..6513bddc0 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
@@ -1,5 +1,246 @@
-import DocumentPage, { loader } from '~/routes/_authenticated+/documents.$id._index';
+import { useLingui } from '@lingui/react';
+import { Plural, Trans } from '@lingui/react/macro';
+import { DocumentStatus, TeamMemberRole } from '@prisma/client';
+import { ChevronLeft, Clock9, Users2 } from 'lucide-react';
+import { Link, redirect } from 'react-router';
+import { match } from 'ts-pattern';
 
-export { loader };
+import { getSession } from '@documenso/auth/server/lib/utils/get-session';
+import { useSession } from '@documenso/lib/client-only/providers/session';
+import { getDocumentWithDetailsById } from '@documenso/lib/server-only/document/get-document-with-details-by-id';
+import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
+import { DocumentVisibility } from '@documenso/lib/types/document-visibility';
+import { formatDocumentsPath } from '@documenso/lib/utils/teams';
+import { DocumentReadOnlyFields } from '@documenso/ui/components/document/document-read-only-fields';
+import { Badge } from '@documenso/ui/primitives/badge';
+import { Button } from '@documenso/ui/primitives/button';
+import { Card, CardContent } from '@documenso/ui/primitives/card';
+import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
 
-export default DocumentPage;
+import { DocumentHistorySheet } from '~/components/general/document/document-history-sheet';
+import { DocumentPageViewButton } from '~/components/general/document/document-page-view-button';
+import { DocumentPageViewDropdown } from '~/components/general/document/document-page-view-dropdown';
+import { DocumentPageViewInformation } from '~/components/general/document/document-page-view-information';
+import { DocumentPageViewRecentActivity } from '~/components/general/document/document-page-view-recent-activity';
+import { DocumentPageViewRecipients } from '~/components/general/document/document-page-view-recipients';
+import { DocumentRecipientLinkCopyDialog } from '~/components/general/document/document-recipient-link-copy-dialog';
+import {
+  DocumentStatus as DocumentStatusComponent,
+  FRIENDLY_STATUS_MAP,
+} from '~/components/general/document/document-status';
+import { StackAvatarsWithTooltip } from '~/components/general/stack-avatars-with-tooltip';
+import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
+
+import type { Route } from './+types/documents.$id._index';
+
+export async function loader({ params, request }: Route.LoaderArgs) {
+  const { user } = await getSession(request);
+
+  const teamUrl = params.teamUrl;
+
+  if (!teamUrl) {
+    throw new Response('Not Found', { status: 404 });
+  }
+
+  const team = await getTeamByUrl({ userId: user.id, teamUrl });
+
+  const { id } = params;
+
+  const documentId = Number(id);
+
+  const documentRootPath = formatDocumentsPath(team.url);
+
+  if (!documentId || Number.isNaN(documentId)) {
+    throw redirect(documentRootPath);
+  }
+
+  const document = await getDocumentWithDetailsById({
+    documentId,
+    userId: user.id,
+    teamId: team.id,
+  }).catch(() => null);
+
+  // Todo: 401 or 404 page.
+  if (!document) {
+    throw redirect(documentRootPath);
+  }
+
+  const documentVisibility = document?.visibility;
+  const currentTeamMemberRole = team.currentTeamRole;
+  const isRecipient = document?.recipients.find((recipient) => recipient.email === user.email);
+  let canAccessDocument = true;
+
+  if (!isRecipient && document?.userId !== user.id) {
+    canAccessDocument = match([documentVisibility, currentTeamMemberRole])
+      .with([DocumentVisibility.EVERYONE, TeamMemberRole.ADMIN], () => true)
+      .with([DocumentVisibility.EVERYONE, TeamMemberRole.MANAGER], () => true)
+      .with([DocumentVisibility.EVERYONE, TeamMemberRole.MEMBER], () => true)
+      .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.ADMIN], () => true)
+      .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.MANAGER], () => true)
+      .with([DocumentVisibility.ADMIN, TeamMemberRole.ADMIN], () => true)
+      .otherwise(() => false);
+  }
+
+  if (!document || !document.documentData || !canAccessDocument) {
+    throw redirect(documentRootPath);
+  }
+
+  return superLoaderJson({
+    document,
+    documentRootPath,
+  });
+}
+
+export default function DocumentPage() {
+  const loaderData = useSuperLoaderData<typeof loader>();
+
+  const { _ } = useLingui();
+  const { user } = useSession();
+
+  const { document, documentRootPath } = loaderData;
+
+  const { recipients, documentData, documentMeta } = document;
+
+  // This was a feature flag. Leave to false since it's not ready.
+  const isDocumentHistoryEnabled = false;
+
+  return (
+    <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
+      {document.status === DocumentStatus.PENDING && (
+        <DocumentRecipientLinkCopyDialog recipients={recipients} />
+      )}
+
+      <Link to={documentRootPath} className="flex items-center text-[#7AC455] hover:opacity-80">
+        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
+        <Trans>Documents</Trans>
+      </Link>
+
+      <div className="flex flex-row justify-between truncate">
+        <div>
+          <h1
+            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
+            title={document.title}
+          >
+            {document.title}
+          </h1>
+
+          <div className="mt-2.5 flex items-center gap-x-6">
+            <DocumentStatusComponent
+              inheritColor
+              status={document.status}
+              className="text-muted-foreground"
+            />
+
+            {recipients.length > 0 && (
+              <div className="text-muted-foreground flex items-center">
+                <Users2 className="mr-2 h-5 w-5" />
+
+                <StackAvatarsWithTooltip
+                  recipients={recipients}
+                  documentStatus={document.status}
+                  position="bottom"
+                >
+                  <span>
+                    <Trans>{recipients.length} Recipient(s)</Trans>
+                  </span>
+                </StackAvatarsWithTooltip>
+              </div>
+            )}
+
+            {document.deletedAt && (
+              <Badge variant="destructive">
+                <Trans>Document deleted</Trans>
+              </Badge>
+            )}
+          </div>
+        </div>
+
+        {isDocumentHistoryEnabled && (
+          <div className="self-end">
+            <DocumentHistorySheet documentId={document.id} userId={user.id}>
+              <Button variant="outline">
+                <Clock9 className="mr-1.5 h-4 w-4" />
+                <Trans>Document history</Trans>
+              </Button>
+            </DocumentHistorySheet>
+          </div>
+        )}
+      </div>
+
+      <div className="mt-6 grid w-full grid-cols-12 gap-8">
+        <Card
+          className="relative col-span-12 rounded-xl before:rounded-xl lg:col-span-6 xl:col-span-7"
+          gradient
+        >
+          <CardContent className="p-2">
+            <PDFViewer document={document} key={documentData.id} documentData={documentData} />
+          </CardContent>
+        </Card>
+
+        {document.status !== DocumentStatus.COMPLETED && (
+          <DocumentReadOnlyFields
+            fields={document.fields}
+            documentMeta={documentMeta || undefined}
+            showRecipientTooltip={true}
+            showRecipientColors={true}
+            recipientIds={recipients.map((recipient) => recipient.id)}
+          />
+        )}
+
+        <div className="col-span-12 lg:col-span-6 xl:col-span-5">
+          <div className="space-y-6">
+            <section className="border-border bg-widget flex flex-col rounded-xl border pb-4 pt-6">
+              <div className="flex flex-row items-center justify-between px-4">
+                <h3 className="text-foreground text-2xl font-semibold">
+                  {_(FRIENDLY_STATUS_MAP[document.status].labelExtended)}
+                </h3>
+
+                <DocumentPageViewDropdown document={document} />
+              </div>
+
+              <p className="text-muted-foreground mt-2 px-4 text-sm">
+                {match(document.status)
+                  .with(DocumentStatus.COMPLETED, () => (
+                    <Trans>This document has been signed by all recipients</Trans>
+                  ))
+                  .with(DocumentStatus.REJECTED, () => (
+                    <Trans>This document has been rejected by a recipient</Trans>
+                  ))
+                  .with(DocumentStatus.DRAFT, () => (
+                    <Trans>This document is currently a draft and has not been sent</Trans>
+                  ))
+                  .with(DocumentStatus.PENDING, () => {
+                    const pendingRecipients = recipients.filter(
+                      (recipient) => recipient.signingStatus === 'NOT_SIGNED',
+                    );
+
+                    return (
+                      <Plural
+                        value={pendingRecipients.length}
+                        one="Waiting on 1 recipient"
+                        other="Waiting on # recipients"
+                      />
+                    );
+                  })
+                  .exhaustive()}
+              </p>
+
+              <div className="mt-4 border-t px-4 pt-4">
+                <DocumentPageViewButton document={document} />
+              </div>
+            </section>
+
+            {/* Document information section. */}
+            <DocumentPageViewInformation document={document} userId={user.id} />
+
+            {/* Recipients section. */}
+            <DocumentPageViewRecipients document={document} documentRootPath={documentRootPath} />
+
+            {/* Recent activity section. */}
+            <DocumentPageViewRecentActivity documentId={document.id} userId={user.id} />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
index 7cf0ef436..2932de7ac 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
@@ -1,5 +1,150 @@
-import DocumentEditPage, { loader } from '~/routes/_authenticated+/documents.$id.edit';
+import { Plural, Trans } from '@lingui/react/macro';
+import { TeamMemberRole } from '@prisma/client';
+import { ChevronLeft, Users2 } from 'lucide-react';
+import { Link, redirect } from 'react-router';
+import { match } from 'ts-pattern';
 
-export { loader };
+import { getSession } from '@documenso/auth/server/lib/utils/get-session';
+import { getDocumentWithDetailsById } from '@documenso/lib/server-only/document/get-document-with-details-by-id';
+import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
+import { DocumentVisibility } from '@documenso/lib/types/document-visibility';
+import { isDocumentCompleted } from '@documenso/lib/utils/document';
+import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 
-export default DocumentEditPage;
+import { DocumentEditForm } from '~/components/general/document/document-edit-form';
+import { DocumentStatus } from '~/components/general/document/document-status';
+import { LegacyFieldWarningPopover } from '~/components/general/legacy-field-warning-popover';
+import { StackAvatarsWithTooltip } from '~/components/general/stack-avatars-with-tooltip';
+import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
+
+import type { Route } from './+types/documents.$id.edit';
+
+export async function loader({ params, request }: Route.LoaderArgs) {
+  const { user } = await getSession(request);
+
+  const teamUrl = params.teamUrl;
+
+  if (!teamUrl) {
+    throw new Response('Not Found', { status: 404 });
+  }
+
+  const team = await getTeamByUrl({ userId: user.id, teamUrl });
+
+  const { id } = params;
+
+  const documentId = Number(id);
+
+  const documentRootPath = formatDocumentsPath(team.url);
+
+  if (!documentId || Number.isNaN(documentId)) {
+    throw redirect(documentRootPath);
+  }
+
+  const document = await getDocumentWithDetailsById({
+    documentId,
+    userId: user.id,
+    teamId: team.id,
+  }).catch(() => null);
+
+  if (document?.teamId && !team?.url) {
+    throw redirect(documentRootPath);
+  }
+
+  const documentVisibility = document?.visibility;
+  const currentTeamMemberRole = team.currentTeamRole;
+  const isRecipient = document?.recipients.find((recipient) => recipient.email === user.email);
+  let canAccessDocument = true;
+
+  if (!isRecipient && document?.userId !== user.id) {
+    canAccessDocument = match([documentVisibility, currentTeamMemberRole])
+      .with([DocumentVisibility.EVERYONE, TeamMemberRole.ADMIN], () => true)
+      .with([DocumentVisibility.EVERYONE, TeamMemberRole.MANAGER], () => true)
+      .with([DocumentVisibility.EVERYONE, TeamMemberRole.MEMBER], () => true)
+      .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.ADMIN], () => true)
+      .with([DocumentVisibility.MANAGER_AND_ABOVE, TeamMemberRole.MANAGER], () => true)
+      .with([DocumentVisibility.ADMIN, TeamMemberRole.ADMIN], () => true)
+      .otherwise(() => false);
+  }
+
+  if (!document) {
+    throw redirect(documentRootPath);
+  }
+
+  if (team && !canAccessDocument) {
+    throw redirect(documentRootPath);
+  }
+
+  if (isDocumentCompleted(document.status)) {
+    throw redirect(`${documentRootPath}/${documentId}`);
+  }
+
+  return superLoaderJson({
+    document: {
+      ...document,
+      folder: null,
+    },
+    documentRootPath,
+  });
+}
+
+export default function DocumentEditPage() {
+  const { document, documentRootPath } = useSuperLoaderData<typeof loader>();
+
+  const { recipients } = document;
+
+  return (
+    <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
+      <Link to={documentRootPath} className="flex items-center text-[#7AC455] hover:opacity-80">
+        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
+        <Trans>Documents</Trans>
+      </Link>
+
+      <div className="mt-4 flex w-full items-end justify-between">
+        <div className="flex-1">
+          <h1
+            className="block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
+            title={document.title}
+          >
+            {document.title}
+          </h1>
+
+          <div className="mt-2.5 flex items-center gap-x-6">
+            <DocumentStatus
+              inheritColor
+              status={document.status}
+              className="text-muted-foreground"
+            />
+
+            {recipients.length > 0 && (
+              <div className="text-muted-foreground flex items-center">
+                <Users2 className="mr-2 h-5 w-5" />
+
+                <StackAvatarsWithTooltip
+                  recipients={recipients}
+                  documentStatus={document.status}
+                  position="bottom"
+                >
+                  <span>
+                    <Plural one="1 Recipient" other="# Recipients" value={recipients.length} />
+                  </span>
+                </StackAvatarsWithTooltip>
+              </div>
+            )}
+          </div>
+        </div>
+
+        {document.useLegacyFieldInsertion && (
+          <div>
+            <LegacyFieldWarningPopover type="document" documentId={document.id} />
+          </div>
+        )}
+      </div>
+
+      <DocumentEditForm
+        className="mt-6"
+        initialDocument={document}
+        documentRootPath={documentRootPath}
+      />
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
index fb91a9cd8..754b008f3 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
@@ -1,5 +1,186 @@
-import DocumentLogsPage, { loader } from '~/routes/_authenticated+/documents.$id.logs';
+import type { MessageDescriptor } from '@lingui/core';
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import type { Recipient } from '@prisma/client';
+import { ChevronLeft } from 'lucide-react';
+import { DateTime } from 'luxon';
+import { Link, redirect } from 'react-router';
 
-export { loader };
+import { getSession } from '@documenso/auth/server/lib/utils/get-session';
+import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
+import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
+import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
+import { formatDocumentsPath } from '@documenso/lib/utils/teams';
+import { Card } from '@documenso/ui/primitives/card';
 
-export default DocumentLogsPage;
+import { DocumentAuditLogDownloadButton } from '~/components/general/document/document-audit-log-download-button';
+import { DocumentCertificateDownloadButton } from '~/components/general/document/document-certificate-download-button';
+import {
+  DocumentStatus as DocumentStatusComponent,
+  FRIENDLY_STATUS_MAP,
+} from '~/components/general/document/document-status';
+import { DocumentLogsTable } from '~/components/tables/document-logs-table';
+
+import type { Route } from './+types/documents.$id.logs';
+
+export async function loader({ params, request }: Route.LoaderArgs) {
+  const { user } = await getSession(request);
+
+  const team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });
+
+  const { id } = params;
+
+  const documentId = Number(id);
+
+  const documentRootPath = formatDocumentsPath(team.url);
+
+  if (!documentId || Number.isNaN(documentId)) {
+    throw redirect(documentRootPath);
+  }
+
+  const document = await getDocumentById({
+    documentId,
+    userId: user.id,
+    teamId: team?.id,
+  }).catch(() => null);
+
+  if (!document || !document.documentData) {
+    throw redirect(documentRootPath);
+  }
+
+  if (document.folderId) {
+    throw redirect(documentRootPath);
+  }
+
+  const recipients = await getRecipientsForDocument({
+    documentId,
+    userId: user.id,
+    teamId: team?.id,
+  });
+
+  return {
+    document,
+    documentRootPath,
+    recipients,
+  };
+}
+
+export default function DocumentsLogsPage({ loaderData }: Route.ComponentProps) {
+  const { document, documentRootPath, recipients } = loaderData;
+
+  const { _, i18n } = useLingui();
+
+  const documentInformation: { description: MessageDescriptor; value: string }[] = [
+    {
+      description: msg`Document title`,
+      value: document.title,
+    },
+    {
+      description: msg`Document ID`,
+      value: document.id.toString(),
+    },
+    {
+      description: msg`Document status`,
+      value: _(FRIENDLY_STATUS_MAP[document.status].label),
+    },
+    {
+      description: msg`Created by`,
+      value: document.user.name
+        ? `${document.user.name} (${document.user.email})`
+        : document.user.email,
+    },
+    {
+      description: msg`Date created`,
+      value: DateTime.fromJSDate(document.createdAt)
+        .setLocale(i18n.locales?.[0] || i18n.locale)
+        .toLocaleString(DateTime.DATETIME_MED_WITH_SECONDS),
+    },
+    {
+      description: msg`Last updated`,
+      value: DateTime.fromJSDate(document.updatedAt)
+        .setLocale(i18n.locales?.[0] || i18n.locale)
+        .toLocaleString(DateTime.DATETIME_MED_WITH_SECONDS),
+    },
+    {
+      description: msg`Time zone`,
+      value: document.documentMeta?.timezone ?? 'N/A',
+    },
+  ];
+
+  const formatRecipientText = (recipient: Recipient) => {
+    let text = recipient.email;
+
+    if (recipient.name) {
+      text = `${recipient.name} (${recipient.email})`;
+    }
+
+    return `[${recipient.role}] ${text}`;
+  };
+  return (
+    <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
+      <Link
+        to={`${documentRootPath}/${document.id}`}
+        className="flex items-center text-[#7AC455] hover:opacity-80"
+      >
+        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
+        <Trans>Document</Trans>
+      </Link>
+
+      <div className="flex flex-col">
+        <div>
+          <h1
+            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
+            title={document.title}
+          >
+            {document.title}
+          </h1>
+        </div>
+        <div className="mt-1 flex flex-col justify-between sm:flex-row">
+          <div className="mt-2.5 flex items-center gap-x-6">
+            <DocumentStatusComponent
+              inheritColor
+              status={document.status}
+              className="text-muted-foreground"
+            />
+          </div>
+          <div className="mt-4 flex w-full flex-row sm:mt-0 sm:w-auto sm:self-end">
+            <DocumentCertificateDownloadButton
+              className="mr-2"
+              documentId={document.id}
+              documentStatus={document.status}
+            />
+
+            <DocumentAuditLogDownloadButton documentId={document.id} />
+          </div>
+        </div>
+      </div>
+
+      <section className="mt-6">
+        <Card className="grid grid-cols-1 gap-4 p-4 sm:grid-cols-2" degrees={45} gradient>
+          {documentInformation.map((info, i) => (
+            <div className="text-foreground text-sm" key={i}>
+              <h3 className="font-semibold">{_(info.description)}</h3>
+              <p className="text-muted-foreground truncate">{info.value}</p>
+            </div>
+          ))}
+
+          <div className="text-foreground text-sm">
+            <h3 className="font-semibold">Recipients</h3>
+            <ul className="text-muted-foreground list-inside list-disc">
+              {recipients.map((recipient) => (
+                <li key={`recipient-${recipient.id}`}>
+                  <span className="-ml-2">{formatRecipientText(recipient)}</span>
+                </li>
+              ))}
+            </ul>
+          </div>
+        </Card>
+      </section>
+
+      <section className="mt-6">
+        <DocumentLogsTable documentId={document.id} />
+      </section>
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx
index 90f7289be..1e47253ad 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx
@@ -1,5 +1,405 @@
-import DocumentsPage, { meta } from '~/routes/_authenticated+/documents._index';
+import { useEffect, useMemo, useState } from 'react';
 
-export { meta };
+import { Trans } from '@lingui/react/macro';
+import { OrganisationType } from '@prisma/client';
+import { FolderIcon, HomeIcon, Loader2 } from 'lucide-react';
+import { useNavigate, useSearchParams } from 'react-router';
+import { Link } from 'react-router';
+import { z } from 'zod';
 
-export default DocumentsPage;
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { FolderType } from '@documenso/lib/types/folder-type';
+import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
+import { parseToIntegerArray } from '@documenso/lib/utils/params';
+import { formatDocumentsPath } from '@documenso/lib/utils/teams';
+import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
+import { trpc } from '@documenso/trpc/react';
+import {
+  type TFindDocumentsInternalResponse,
+  ZFindDocumentsInternalRequestSchema,
+} from '@documenso/trpc/server/document-router/schema';
+import { type TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';
+import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
+import { Button } from '@documenso/ui/primitives/button';
+import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
+
+import { DocumentMoveToFolderDialog } from '~/components/dialogs/document-move-to-folder-dialog';
+import { CreateFolderDialog } from '~/components/dialogs/folder-create-dialog';
+import { FolderDeleteDialog } from '~/components/dialogs/folder-delete-dialog';
+import { FolderMoveDialog } from '~/components/dialogs/folder-move-dialog';
+import { FolderSettingsDialog } from '~/components/dialogs/folder-settings-dialog';
+import { DocumentDropZoneWrapper } from '~/components/general/document/document-drop-zone-wrapper';
+import { DocumentSearch } from '~/components/general/document/document-search';
+import { DocumentStatus } from '~/components/general/document/document-status';
+import { DocumentUploadDropzone } from '~/components/general/document/document-upload';
+import { FolderCard } from '~/components/general/folder/folder-card';
+import { PeriodSelector } from '~/components/general/period-selector';
+import { DocumentsTable } from '~/components/tables/documents-table';
+import { DocumentsTableEmptyState } from '~/components/tables/documents-table-empty-state';
+import { DocumentsTableSenderFilter } from '~/components/tables/documents-table-sender-filter';
+import { useCurrentTeam } from '~/providers/team';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+  return appMetaTags('Documents');
+}
+
+const ZSearchParamsSchema = ZFindDocumentsInternalRequestSchema.pick({
+  status: true,
+  period: true,
+  page: true,
+  perPage: true,
+  query: true,
+}).extend({
+  senderIds: z.string().transform(parseToIntegerArray).optional().catch([]),
+});
+
+export default function DocumentsPage() {
+  const [searchParams] = useSearchParams();
+  const navigate = useNavigate();
+
+  const organisation = useCurrentOrganisation();
+  const team = useCurrentTeam();
+
+  const [isMovingDocument, setIsMovingDocument] = useState(false);
+  const [documentToMove, setDocumentToMove] = useState<number | null>(null);
+  const [isMovingFolder, setIsMovingFolder] = useState(false);
+  const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);
+  const [isDeletingFolder, setIsDeletingFolder] = useState(false);
+  const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);
+  const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);
+  const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);
+
+  const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();
+  const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();
+
+  const [stats, setStats] = useState<TFindDocumentsInternalResponse['stats']>({
+    [ExtendedDocumentStatus.DRAFT]: 0,
+    [ExtendedDocumentStatus.PENDING]: 0,
+    [ExtendedDocumentStatus.COMPLETED]: 0,
+    [ExtendedDocumentStatus.REJECTED]: 0,
+    [ExtendedDocumentStatus.INBOX]: 0,
+    [ExtendedDocumentStatus.ALL]: 0,
+  });
+
+  const findDocumentSearchParams = useMemo(
+    () => ZSearchParamsSchema.safeParse(Object.fromEntries(searchParams.entries())).data || {},
+    [searchParams],
+  );
+
+  const { data, isLoading, isLoadingError, refetch } = trpc.document.findDocumentsInternal.useQuery(
+    {
+      ...findDocumentSearchParams,
+    },
+  );
+
+  const {
+    data: foldersData,
+    isLoading: isFoldersLoading,
+    refetch: refetchFolders,
+  } = trpc.folder.getFolders.useQuery({
+    type: FolderType.DOCUMENT,
+    parentId: null,
+  });
+
+  useEffect(() => {
+    void refetch();
+    void refetchFolders();
+  }, [team?.url]);
+
+  const getTabHref = (value: keyof typeof ExtendedDocumentStatus) => {
+    const params = new URLSearchParams(searchParams);
+
+    params.set('status', value);
+
+    if (value === ExtendedDocumentStatus.ALL) {
+      params.delete('status');
+    }
+
+    if (value === ExtendedDocumentStatus.INBOX && organisation.type === OrganisationType.PERSONAL) {
+      params.delete('status');
+    }
+
+    if (params.has('page')) {
+      params.delete('page');
+    }
+
+    return `${formatDocumentsPath(team.url)}?${params.toString()}`;
+  };
+
+  useEffect(() => {
+    if (data?.stats) {
+      setStats(data.stats);
+    }
+  }, [data?.stats]);
+
+  const navigateToFolder = (folderId?: string | null) => {
+    const documentsPath = formatDocumentsPath(team.url);
+
+    if (folderId) {
+      void navigate(`${documentsPath}/f/${folderId}`);
+    } else {
+      void navigate(documentsPath);
+    }
+  };
+
+  const handleViewAllFolders = () => {
+    void navigate(`${formatDocumentsPath(team.url)}/folders`);
+  };
+
+  return (
+    <DocumentDropZoneWrapper>
+      <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">
+        <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
+          <div className="flex flex-1 items-center">
+            <Button
+              variant="ghost"
+              size="sm"
+              className="flex items-center space-x-2 pl-0 hover:bg-transparent"
+              onClick={() => navigateToFolder(null)}
+            >
+              <HomeIcon className="h-4 w-4" />
+              <span>Home</span>
+            </Button>
+
+            {foldersData?.breadcrumbs.map((folder) => (
+              <div key={folder.id} className="flex items-center space-x-2">
+                <span>/</span>
+                <Button
+                  variant="ghost"
+                  size="sm"
+                  className="flex items-center space-x-2 pl-1 hover:bg-transparent"
+                  onClick={() => navigateToFolder(folder.id)}
+                >
+                  <FolderIcon className="h-4 w-4" />
+                  <span>{folder.name}</span>
+                </Button>
+              </div>
+            ))}
+          </div>
+
+          <div className="flex gap-4 sm:flex-row sm:justify-end">
+            <DocumentUploadDropzone />
+            <CreateFolderDialog />
+          </div>
+        </div>
+
+        {isFoldersLoading ? (
+          <div className="mt-6 flex justify-center">
+            <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />
+          </div>
+        ) : (
+          <>
+            {foldersData?.folders?.some((folder) => folder.pinned) && (
+              <div className="mt-6">
+                <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
+                  {foldersData.folders
+                    .filter((folder) => folder.pinned)
+                    .map((folder) => (
+                      <FolderCard
+                        key={folder.id}
+                        folder={folder}
+                        onNavigate={navigateToFolder}
+                        onMove={(folder) => {
+                          setFolderToMove(folder);
+                          setIsMovingFolder(true);
+                        }}
+                        onPin={(folderId) => void pinFolder({ folderId })}
+                        onUnpin={(folderId) => void unpinFolder({ folderId })}
+                        onSettings={(folder) => {
+                          setFolderToSettings(folder);
+                          setIsSettingsFolderOpen(true);
+                        }}
+                        onDelete={(folder) => {
+                          setFolderToDelete(folder);
+                          setIsDeletingFolder(true);
+                        }}
+                      />
+                    ))}
+                </div>
+              </div>
+            )}
+
+            <div className="mt-6">
+              <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
+                {foldersData?.folders
+                  ?.filter((folder) => !folder.pinned)
+                  .slice(0, 12)
+                  .map((folder) => (
+                    <FolderCard
+                      key={folder.id}
+                      folder={folder}
+                      onNavigate={navigateToFolder}
+                      onMove={(folder) => {
+                        setFolderToMove(folder);
+                        setIsMovingFolder(true);
+                      }}
+                      onPin={(folderId) => void pinFolder({ folderId })}
+                      onUnpin={(folderId) => void unpinFolder({ folderId })}
+                      onSettings={(folder) => {
+                        setFolderToSettings(folder);
+                        setIsSettingsFolderOpen(true);
+                      }}
+                      onDelete={(folder) => {
+                        setFolderToDelete(folder);
+                        setIsDeletingFolder(true);
+                      }}
+                    />
+                  ))}
+              </div>
+
+              <div className="mt-6 flex items-center justify-center">
+                {foldersData && foldersData.folders?.length > 12 && (
+                  <Button
+                    variant="link"
+                    size="sm"
+                    className="text-muted-foreground hover:text-foreground"
+                    onClick={() => void handleViewAllFolders()}
+                  >
+                    View all folders
+                  </Button>
+                )}
+              </div>
+            </div>
+          </>
+        )}
+
+        <div className="mt-12 flex flex-wrap items-center justify-between gap-x-4 gap-y-8">
+          <div className="flex flex-row items-center">
+            {team && (
+              <Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">
+                {team.avatarImageId && <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />}
+                <AvatarFallback className="text-muted-foreground text-xs">
+                  {team.name.slice(0, 1)}
+                </AvatarFallback>
+              </Avatar>
+            )}
+
+            <h2 className="text-4xl font-semibold">
+              <Trans>Documents</Trans>
+            </h2>
+          </div>
+
+          <div className="-m-1 flex flex-wrap gap-x-4 gap-y-6 overflow-hidden p-1">
+            <Tabs value={findDocumentSearchParams.status || 'ALL'} className="overflow-x-auto">
+              <TabsList>
+                {[
+                  ExtendedDocumentStatus.INBOX,
+                  ExtendedDocumentStatus.PENDING,
+                  ExtendedDocumentStatus.COMPLETED,
+                  ExtendedDocumentStatus.DRAFT,
+                  ExtendedDocumentStatus.ALL,
+                ]
+                  .filter((value) => {
+                    if (organisation.type === OrganisationType.PERSONAL) {
+                      return value !== ExtendedDocumentStatus.INBOX;
+                    }
+
+                    return true;
+                  })
+                  .map((value) => (
+                    <TabsTrigger
+                      key={value}
+                      className="hover:text-foreground min-w-[60px]"
+                      value={value}
+                      asChild
+                    >
+                      <Link to={getTabHref(value)} preventScrollReset>
+                        <DocumentStatus status={value} />
+
+                        {value !== ExtendedDocumentStatus.ALL && (
+                          <span className="ml-1 inline-block opacity-50">{stats[value]}</span>
+                        )}
+                      </Link>
+                    </TabsTrigger>
+                  ))}
+              </TabsList>
+            </Tabs>
+
+            {team && <DocumentsTableSenderFilter teamId={team.id} />}
+
+            <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">
+              <PeriodSelector />
+            </div>
+            <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">
+              <DocumentSearch initialValue={findDocumentSearchParams.query} />
+            </div>
+          </div>
+        </div>
+
+        <div className="mt-8">
+          <div>
+            {data &&
+            data.count === 0 &&
+            (!foldersData?.folders.length || foldersData.folders.length === 0) ? (
+              <DocumentsTableEmptyState
+                status={findDocumentSearchParams.status || ExtendedDocumentStatus.ALL}
+              />
+            ) : (
+              <DocumentsTable
+                data={data}
+                isLoading={isLoading}
+                isLoadingError={isLoadingError}
+                onMoveDocument={(documentId) => {
+                  setDocumentToMove(documentId);
+                  setIsMovingDocument(true);
+                }}
+              />
+            )}
+          </div>
+        </div>
+
+        {documentToMove && (
+          <DocumentMoveToFolderDialog
+            documentId={documentToMove}
+            open={isMovingDocument}
+            onOpenChange={(open) => {
+              setIsMovingDocument(open);
+
+              if (!open) {
+                setDocumentToMove(null);
+              }
+            }}
+          />
+        )}
+
+        <FolderMoveDialog
+          foldersData={foldersData?.folders}
+          folder={folderToMove}
+          isOpen={isMovingFolder}
+          onOpenChange={(open) => {
+            setIsMovingFolder(open);
+
+            if (!open) {
+              setFolderToMove(null);
+            }
+          }}
+        />
+
+        <FolderSettingsDialog
+          folder={folderToSettings}
+          isOpen={isSettingsFolderOpen}
+          onOpenChange={(open) => {
+            setIsSettingsFolderOpen(open);
+
+            if (!open) {
+              setFolderToSettings(null);
+            }
+          }}
+        />
+
+        <FolderDeleteDialog
+          folder={folderToDelete}
+          isOpen={isDeletingFolder}
+          onOpenChange={(open) => {
+            setIsDeletingFolder(open);
+
+            if (!open) {
+              setFolderToDelete(null);
+            }
+          }}
+        />
+      </div>
+    </DocumentDropZoneWrapper>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id._index.tsx
deleted file mode 100644
index 35c8104c4..000000000
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id._index.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import DocumentPage, { loader } from '~/routes/_authenticated+/documents.f.$folderId.$id._index';
-
-export { loader };
-
-export default DocumentPage;
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id.edit.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id.edit.tsx
deleted file mode 100644
index 1227e088f..000000000
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id.edit.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import DocumentEditPage, { loader } from '~/routes/_authenticated+/documents.f.$folderId.$id.edit';
-
-export { loader };
-
-export default DocumentEditPage;
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id.logs.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id.logs.tsx
deleted file mode 100644
index ed1abe1e0..000000000
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId.$id.logs.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import DocumentLogsPage, { loader } from '~/routes/_authenticated+/documents.f.$folderId.$id.logs';
-
-export { loader };
-
-export default DocumentLogsPage;
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId._index.tsx
index 05707e676..049903f0b 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId._index.tsx
@@ -1,5 +1,374 @@
-import DocumentsPage, { meta } from '~/routes/_authenticated+/documents.f.$folderId._index';
+import { useEffect, useMemo, useState } from 'react';
 
-export { meta };
+import { Trans } from '@lingui/react/macro';
+import { FolderIcon, HomeIcon, Loader2 } from 'lucide-react';
+import { useNavigate, useParams, useSearchParams } from 'react-router';
+import { Link } from 'react-router';
+import { z } from 'zod';
 
-export default DocumentsPage;
+import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
+import { parseToIntegerArray } from '@documenso/lib/utils/params';
+import { formatDocumentsPath } from '@documenso/lib/utils/teams';
+import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
+import { trpc } from '@documenso/trpc/react';
+import {
+  type TFindDocumentsInternalResponse,
+  ZFindDocumentsInternalRequestSchema,
+} from '@documenso/trpc/server/document-router/schema';
+import { type TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';
+import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
+import { Button } from '@documenso/ui/primitives/button';
+import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
+
+import { DocumentMoveToFolderDialog } from '~/components/dialogs/document-move-to-folder-dialog';
+import { CreateFolderDialog } from '~/components/dialogs/folder-create-dialog';
+import { FolderDeleteDialog } from '~/components/dialogs/folder-delete-dialog';
+import { FolderMoveDialog } from '~/components/dialogs/folder-move-dialog';
+import { FolderSettingsDialog } from '~/components/dialogs/folder-settings-dialog';
+import { DocumentDropZoneWrapper } from '~/components/general/document/document-drop-zone-wrapper';
+import { DocumentSearch } from '~/components/general/document/document-search';
+import { DocumentStatus } from '~/components/general/document/document-status';
+import { DocumentUploadDropzone } from '~/components/general/document/document-upload';
+import { FolderCard } from '~/components/general/folder/folder-card';
+import { PeriodSelector } from '~/components/general/period-selector';
+import { DocumentsTable } from '~/components/tables/documents-table';
+import { DocumentsTableEmptyState } from '~/components/tables/documents-table-empty-state';
+import { DocumentsTableSenderFilter } from '~/components/tables/documents-table-sender-filter';
+import { useCurrentTeam } from '~/providers/team';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+  return appMetaTags('Documents');
+}
+
+const ZSearchParamsSchema = ZFindDocumentsInternalRequestSchema.pick({
+  status: true,
+  period: true,
+  page: true,
+  perPage: true,
+  query: true,
+}).extend({
+  senderIds: z.string().transform(parseToIntegerArray).optional().catch([]),
+});
+
+export default function DocumentsPage() {
+  const [searchParams] = useSearchParams();
+  const navigate = useNavigate();
+
+  const [isMovingDocument, setIsMovingDocument] = useState(false);
+  const [documentToMove, setDocumentToMove] = useState<number | null>(null);
+  const [isMovingFolder, setIsMovingFolder] = useState(false);
+  const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);
+  const [isDeletingFolder, setIsDeletingFolder] = useState(false);
+  const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);
+  const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);
+  const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);
+
+  const { folderId } = useParams();
+
+  const team = useCurrentTeam();
+
+  const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();
+  const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();
+
+  const [stats, setStats] = useState<TFindDocumentsInternalResponse['stats']>({
+    [ExtendedDocumentStatus.DRAFT]: 0,
+    [ExtendedDocumentStatus.PENDING]: 0,
+    [ExtendedDocumentStatus.COMPLETED]: 0,
+    [ExtendedDocumentStatus.REJECTED]: 0,
+    [ExtendedDocumentStatus.INBOX]: 0,
+    [ExtendedDocumentStatus.ALL]: 0,
+  });
+
+  const findDocumentSearchParams = useMemo(
+    () => ZSearchParamsSchema.safeParse(Object.fromEntries(searchParams.entries())).data || {},
+    [searchParams],
+  );
+
+  const { data, isLoading, isLoadingError, refetch } = trpc.document.findDocumentsInternal.useQuery(
+    {
+      ...findDocumentSearchParams,
+      folderId,
+    },
+  );
+
+  const {
+    data: foldersData,
+    isLoading: isFoldersLoading,
+    refetch: refetchFolders,
+  } = trpc.folder.getFolders.useQuery({
+    parentId: folderId,
+  });
+
+  useEffect(() => {
+    void refetch();
+    void refetchFolders();
+  }, [team.url]);
+
+  const getTabHref = (value: keyof typeof ExtendedDocumentStatus) => {
+    const params = new URLSearchParams(searchParams);
+
+    params.set('status', value);
+
+    if (value === ExtendedDocumentStatus.ALL) {
+      params.delete('status');
+    }
+
+    if (params.has('page')) {
+      params.delete('page');
+    }
+
+    return `${formatDocumentsPath(team.url)}/f/${folderId}?${params.toString()}`;
+  };
+
+  useEffect(() => {
+    if (data?.stats) {
+      setStats(data.stats);
+    }
+  }, [data?.stats]);
+
+  const navigateToFolder = (folderId?: string | null) => {
+    const documentsPath = formatDocumentsPath(team.url);
+
+    if (folderId) {
+      void navigate(`${documentsPath}/f/${folderId}`);
+    } else {
+      void navigate(documentsPath);
+    }
+  };
+
+  return (
+    <DocumentDropZoneWrapper>
+      <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">
+        <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
+          <div className="flex flex-1 items-center">
+            <Button
+              variant="ghost"
+              size="sm"
+              className="flex items-center space-x-2 pl-0 hover:bg-transparent"
+              onClick={() => navigateToFolder(null)}
+            >
+              <HomeIcon className="h-4 w-4" />
+              <span>Home</span>
+            </Button>
+
+            {foldersData?.breadcrumbs.map((folder) => (
+              <div key={folder.id} className="flex items-center space-x-2">
+                <span>/</span>
+                <Button
+                  variant="ghost"
+                  size="sm"
+                  className="flex items-center space-x-2 pl-1 hover:bg-transparent"
+                  onClick={() => navigateToFolder(folder.id)}
+                >
+                  <FolderIcon className="h-4 w-4" />
+                  <span>{folder.name}</span>
+                </Button>
+              </div>
+            ))}
+          </div>
+
+          <div className="flex gap-4 sm:flex-row sm:justify-end">
+            <DocumentUploadDropzone />
+            <CreateFolderDialog />
+          </div>
+        </div>
+
+        {isFoldersLoading ? (
+          <div className="mt-6 flex justify-center">
+            <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />
+          </div>
+        ) : (
+          <>
+            {foldersData?.folders && foldersData.folders.some((folder) => folder.pinned) && (
+              <div className="mt-6">
+                <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
+                  {foldersData.folders
+                    .filter((folder) => folder.pinned)
+                    .map((folder) => (
+                      <FolderCard
+                        key={folder.id}
+                        folder={folder}
+                        onNavigate={navigateToFolder}
+                        onMove={(folder) => {
+                          setFolderToMove(folder);
+                          setIsMovingFolder(true);
+                        }}
+                        onPin={(folderId) => void pinFolder({ folderId })}
+                        onUnpin={(folderId) => void unpinFolder({ folderId })}
+                        onSettings={(folder) => {
+                          setFolderToSettings(folder);
+                          setIsSettingsFolderOpen(true);
+                        }}
+                        onDelete={(folder) => {
+                          setFolderToDelete(folder);
+                          setIsDeletingFolder(true);
+                        }}
+                      />
+                    ))}
+                </div>
+              </div>
+            )}
+
+            <div className="mt-6">
+              <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
+                {foldersData?.folders
+                  .filter((folder) => !folder.pinned)
+                  .map((folder) => (
+                    <FolderCard
+                      key={folder.id}
+                      folder={folder}
+                      onNavigate={navigateToFolder}
+                      onMove={(folder) => {
+                        setFolderToMove(folder);
+                        setIsMovingFolder(true);
+                      }}
+                      onPin={(folderId) => void pinFolder({ folderId })}
+                      onUnpin={(folderId) => void unpinFolder({ folderId })}
+                      onSettings={(folder) => {
+                        setFolderToSettings(folder);
+                        setIsSettingsFolderOpen(true);
+                      }}
+                      onDelete={(folder) => {
+                        setFolderToDelete(folder);
+                        setIsDeletingFolder(true);
+                      }}
+                    />
+                  ))}
+              </div>
+            </div>
+          </>
+        )}
+
+        <div className="mt-12 flex flex-wrap items-center justify-between gap-x-4 gap-y-8">
+          <div className="flex flex-row items-center">
+            {team && (
+              <Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">
+                {team.avatarImageId && <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />}
+                <AvatarFallback className="text-muted-foreground text-xs">
+                  {team.name.slice(0, 1)}
+                </AvatarFallback>
+              </Avatar>
+            )}
+
+            <h2 className="text-4xl font-semibold">
+              <Trans>Documents</Trans>
+            </h2>
+          </div>
+
+          <div className="-m-1 flex flex-wrap gap-x-4 gap-y-6 overflow-hidden p-1">
+            <Tabs value={findDocumentSearchParams.status || 'ALL'} className="overflow-x-auto">
+              <TabsList>
+                {[
+                  ExtendedDocumentStatus.INBOX,
+                  ExtendedDocumentStatus.PENDING,
+                  ExtendedDocumentStatus.COMPLETED,
+                  ExtendedDocumentStatus.DRAFT,
+                  ExtendedDocumentStatus.ALL,
+                ].map((value) => (
+                  <TabsTrigger
+                    key={value}
+                    className="hover:text-foreground min-w-[60px]"
+                    value={value}
+                    asChild
+                  >
+                    <Link to={getTabHref(value)} preventScrollReset>
+                      <DocumentStatus status={value} />
+
+                      {value !== ExtendedDocumentStatus.ALL && (
+                        <span className="ml-1 inline-block opacity-50">{stats[value]}</span>
+                      )}
+                    </Link>
+                  </TabsTrigger>
+                ))}
+              </TabsList>
+            </Tabs>
+
+            {team && <DocumentsTableSenderFilter teamId={team.id} />}
+
+            <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">
+              <PeriodSelector />
+            </div>
+            <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">
+              <DocumentSearch initialValue={findDocumentSearchParams.query} />
+            </div>
+          </div>
+        </div>
+
+        <div className="mt-8">
+          <div>
+            {data &&
+            data.count === 0 &&
+            (!foldersData?.folders.length || foldersData.folders.length === 0) ? (
+              <DocumentsTableEmptyState
+                status={findDocumentSearchParams.status || ExtendedDocumentStatus.ALL}
+              />
+            ) : (
+              <DocumentsTable
+                data={data}
+                isLoading={isLoading}
+                isLoadingError={isLoadingError}
+                onMoveDocument={(documentId) => {
+                  setDocumentToMove(documentId);
+                  setIsMovingDocument(true);
+                }}
+              />
+            )}
+          </div>
+        </div>
+
+        {documentToMove && (
+          <DocumentMoveToFolderDialog
+            documentId={documentToMove}
+            open={isMovingDocument}
+            onOpenChange={(open) => {
+              setIsMovingDocument(open);
+
+              if (!open) {
+                setDocumentToMove(null);
+              }
+            }}
+            currentFolderId={folderId}
+          />
+        )}
+
+        <FolderMoveDialog
+          foldersData={foldersData?.folders}
+          folder={folderToMove}
+          isOpen={isMovingFolder}
+          onOpenChange={(open) => {
+            setIsMovingFolder(open);
+
+            if (!open) {
+              setFolderToMove(null);
+            }
+          }}
+        />
+
+        <FolderSettingsDialog
+          folder={folderToSettings}
+          isOpen={isSettingsFolderOpen}
+          onOpenChange={(open) => {
+            setIsSettingsFolderOpen(open);
+
+            if (!open) {
+              setFolderToSettings(null);
+            }
+          }}
+        />
+
+        <FolderDeleteDialog
+          folder={folderToDelete}
+          isOpen={isDeletingFolder}
+          onOpenChange={(open) => {
+            setIsDeletingFolder(open);
+
+            if (!open) {
+              setFolderToDelete(null);
+            }
+          }}
+        />
+      </div>
+    </DocumentDropZoneWrapper>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.folders._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.folders._index.tsx
index 0dd6e5103..c3111e02b 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.folders._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.folders._index.tsx
@@ -1,5 +1,184 @@
-import DocumentsFoldersPage, { meta } from '~/routes/_authenticated+/documents.folders._index';
+import { useState } from 'react';
 
-export { meta };
+import { Trans } from '@lingui/react/macro';
+import { HomeIcon, Loader2 } from 'lucide-react';
+import { useNavigate } from 'react-router';
 
-export default DocumentsFoldersPage;
+import { FolderType } from '@documenso/lib/types/folder-type';
+import { formatDocumentsPath } from '@documenso/lib/utils/teams';
+import { trpc } from '@documenso/trpc/react';
+import { type TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';
+import { Button } from '@documenso/ui/primitives/button';
+
+import { CreateFolderDialog } from '~/components/dialogs/folder-create-dialog';
+import { FolderDeleteDialog } from '~/components/dialogs/folder-delete-dialog';
+import { FolderMoveDialog } from '~/components/dialogs/folder-move-dialog';
+import { FolderSettingsDialog } from '~/components/dialogs/folder-settings-dialog';
+import { FolderCard } from '~/components/general/folder/folder-card';
+import { useCurrentTeam } from '~/providers/team';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+  return appMetaTags('Documents');
+}
+
+export default function DocumentsFoldersPage() {
+  const navigate = useNavigate();
+  const team = useCurrentTeam();
+
+  const [isMovingFolder, setIsMovingFolder] = useState(false);
+  const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);
+  const [isDeletingFolder, setIsDeletingFolder] = useState(false);
+  const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);
+  const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);
+  const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);
+
+  const { data: foldersData, isLoading: isFoldersLoading } = trpc.folder.getFolders.useQuery({
+    type: FolderType.DOCUMENT,
+    parentId: null,
+  });
+
+  const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();
+  const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();
+
+  const navigateToFolder = (folderId?: string | null) => {
+    const documentsPath = formatDocumentsPath(team.url);
+
+    if (folderId) {
+      void navigate(`${documentsPath}/f/${folderId}`);
+    } else {
+      void navigate(documentsPath);
+    }
+  };
+
+  return (
+    <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">
+      <div className="flex w-full items-center justify-between">
+        <div className="flex flex-1 items-center">
+          <Button
+            variant="ghost"
+            size="sm"
+            className="flex items-center space-x-2 pl-0 hover:bg-transparent"
+            onClick={() => navigateToFolder(null)}
+          >
+            <HomeIcon className="h-4 w-4" />
+            <span>Home</span>
+          </Button>
+        </div>
+
+        <div className="flex flex-col gap-y-4 sm:flex-row sm:justify-end sm:gap-x-4">
+          <CreateFolderDialog />
+        </div>
+      </div>
+
+      <div className="mt-6">
+        {isFoldersLoading ? (
+          <div className="mt-6 flex justify-center">
+            <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />
+          </div>
+        ) : (
+          <>
+            {foldersData?.folders?.some((folder) => folder.pinned) && (
+              <div className="mt-6">
+                <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
+                  {foldersData.folders
+                    .filter((folder) => folder.pinned)
+                    .map((folder) => (
+                      <FolderCard
+                        key={folder.id}
+                        folder={folder}
+                        onNavigate={navigateToFolder}
+                        onMove={(folder) => {
+                          setFolderToMove(folder);
+                          setIsMovingFolder(true);
+                        }}
+                        onPin={(folderId) => void pinFolder({ folderId })}
+                        onUnpin={(folderId) => void unpinFolder({ folderId })}
+                        onSettings={(folder) => {
+                          setFolderToSettings(folder);
+                          setIsSettingsFolderOpen(true);
+                        }}
+                        onDelete={(folder) => {
+                          setFolderToDelete(folder);
+                          setIsDeletingFolder(true);
+                        }}
+                      />
+                    ))}
+                </div>
+              </div>
+            )}
+
+            <div className="mt-12">
+              <h1 className="truncate text-2xl font-semibold md:text-3xl">
+                <Trans>All Folders</Trans>
+              </h1>
+
+              <div className="mt-6 grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
+                {foldersData?.folders
+                  .filter((folder) => !folder.pinned)
+                  .map((folder) => (
+                    <FolderCard
+                      key={folder.id}
+                      folder={folder}
+                      onNavigate={navigateToFolder}
+                      onMove={(folder) => {
+                        setFolderToMove(folder);
+                        setIsMovingFolder(true);
+                      }}
+                      onPin={(folderId) => void pinFolder({ folderId })}
+                      onUnpin={(folderId) => void unpinFolder({ folderId })}
+                      onSettings={(folder) => {
+                        setFolderToSettings(folder);
+                        setIsSettingsFolderOpen(true);
+                      }}
+                      onDelete={(folder) => {
+                        setFolderToDelete(folder);
+                        setIsDeletingFolder(true);
+                      }}
+                    />
+                  ))}
+              </div>
+            </div>
+          </>
+        )}
+      </div>
+
+      <FolderMoveDialog
+        foldersData={foldersData?.folders}
+        folder={folderToMove}
+        isOpen={isMovingFolder}
+        onOpenChange={(open) => {
+          setIsMovingFolder(open);
+
+          if (!open) {
+            setFolderToMove(null);
+          }
+        }}
+      />
+
+      <FolderSettingsDialog
+        folder={folderToSettings}
+        isOpen={isSettingsFolderOpen}
+        onOpenChange={(open) => {
+          setIsSettingsFolderOpen(open);
+
+          if (!open) {
+            setFolderToSettings(null);
+          }
+        }}
+      />
+
+      <FolderDeleteDialog
+        folder={folderToDelete}
+        isOpen={isDeletingFolder}
+        onOpenChange={(open) => {
+          setIsDeletingFolder(open);
+
+          if (!open) {
+            setFolderToDelete(null);
+          }
+        }}
+      />
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
index 04d7bf668..d8c0f6077 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
@@ -3,29 +3,27 @@ import { CheckCircle2, Clock } from 'lucide-react';
 import { P, match } from 'ts-pattern';
 
 import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { useSession } from '@documenso/lib/client-only/providers/session';
-import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
+import { getTeamWithEmail } from '@documenso/lib/server-only/team/get-team-email-by-email';
 import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
 import { extractInitials } from '@documenso/lib/utils/recipient-formatter';
-import { isTokenExpired } from '@documenso/lib/utils/token-verification';
+import { canExecuteTeamAction } from '@documenso/lib/utils/teams';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { AvatarWithText } from '@documenso/ui/primitives/avatar';
 
 import { TeamDeleteDialog } from '~/components/dialogs/team-delete-dialog';
 import { TeamEmailAddDialog } from '~/components/dialogs/team-email-add-dialog';
-import { TeamTransferDialog } from '~/components/dialogs/team-transfer-dialog';
 import { AvatarImageForm } from '~/components/forms/avatar-image';
 import { TeamUpdateForm } from '~/components/forms/team-update-form';
 import { SettingsHeader } from '~/components/general/settings-header';
 import { TeamEmailDropdown } from '~/components/general/teams/team-email-dropdown';
-import { TeamTransferStatus } from '~/components/general/teams/team-transfer-status';
+import { useCurrentTeam } from '~/providers/team';
 
 import type { Route } from './+types/settings._index';
 
 export async function loader({ request, params }: Route.LoaderArgs) {
   const { user } = await getSession(request);
 
-  const team = await getTeamByUrl({
+  const team = await getTeamWithEmail({
     userId: user.id,
     teamUrl: params.teamUrl,
   });
@@ -38,23 +36,13 @@ export async function loader({ request, params }: Route.LoaderArgs) {
 export default function TeamsSettingsPage({ loaderData }: Route.ComponentProps) {
   const { team } = loaderData;
 
-  const { user } = useSession();
-
-  const isTransferVerificationExpired =
-    !team.transferVerification || isTokenExpired(team.transferVerification.expiresAt);
+  const currentTeam = useCurrentTeam();
 
   return (
-    <div>
+    <div className="max-w-2xl">
       <SettingsHeader title="General settings" subtitle="Here you can edit your team's details." />
 
-      <TeamTransferStatus
-        className="mb-4"
-        currentUserTeamRole={team.currentTeamMember.role}
-        teamId={team.id}
-        transferVerification={team.transferVerification}
-      />
-
-      <AvatarImageForm className="mb-8" />
+      <AvatarImageForm team={currentTeam} className="mb-8" />
 
       <TeamUpdateForm teamId={team.id} teamName={team.name} teamUrl={team.url} />
 
@@ -161,51 +149,26 @@ export default function TeamsSettingsPage({ loaderData }: Route.ComponentProps)
           </Alert>
         )}
 
-        {team.ownerUserId === user.id && (
-          <>
-            {isTransferVerificationExpired && (
-              <Alert
-                className="flex flex-col justify-between p-6 sm:flex-row sm:items-center"
-                variant="neutral"
-              >
-                <div className="mb-4 sm:mb-0">
-                  <AlertTitle>
-                    <Trans>Transfer team</Trans>
-                  </AlertTitle>
+        {canExecuteTeamAction('MANAGE_TEAM', currentTeam.currentTeamRole) && (
+          <Alert
+            className="flex flex-col justify-between p-6 sm:flex-row sm:items-center"
+            variant="neutral"
+          >
+            <div className="mb-4 sm:mb-0">
+              <AlertTitle>
+                <Trans>Delete team</Trans>
+              </AlertTitle>
 
-                  <AlertDescription className="mr-2">
-                    <Trans>Transfer the ownership of the team to another team member.</Trans>
-                  </AlertDescription>
-                </div>
+              <AlertDescription className="mr-2">
+                <Trans>
+                  This team, and any associated data excluding billing invoices will be permanently
+                  deleted.
+                </Trans>
+              </AlertDescription>
+            </div>
 
-                <TeamTransferDialog
-                  ownerUserId={team.ownerUserId}
-                  teamId={team.id}
-                  teamName={team.name}
-                />
-              </Alert>
-            )}
-
-            <Alert
-              className="flex flex-col justify-between p-6 sm:flex-row sm:items-center"
-              variant="neutral"
-            >
-              <div className="mb-4 sm:mb-0">
-                <AlertTitle>
-                  <Trans>Delete team</Trans>
-                </AlertTitle>
-
-                <AlertDescription className="mr-2">
-                  <Trans>
-                    This team, and any associated data excluding billing invoices will be
-                    permanently deleted.
-                  </Trans>
-                </AlertDescription>
-              </div>
-
-              <TeamDeleteDialog teamId={team.id} teamName={team.name} />
-            </Alert>
-          </>
+            <TeamDeleteDialog teamId={team.id} teamName={team.name} redirectTo="/dashboard" />
+          </Alert>
         )}
       </section>
     </div>
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
index 9996d96c8..004f8aa7a 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
@@ -1,12 +1,16 @@
+import { msg } from '@lingui/core/macro';
 import { Trans } from '@lingui/react/macro';
-import { Outlet, redirect } from 'react-router';
+import { Link, Outlet, redirect } from 'react-router';
 
 import { getSession } from '@documenso/auth/server/lib/utils/get-session';
 import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
 import { canExecuteTeamAction } from '@documenso/lib/utils/teams';
+import { Button } from '@documenso/ui/primitives/button';
 
+import { GenericErrorLayout } from '~/components/general/generic-error-layout';
 import { TeamSettingsNavDesktop } from '~/components/general/teams/team-settings-nav-desktop';
 import { TeamSettingsNavMobile } from '~/components/general/teams/team-settings-nav-mobile';
+import { useCurrentTeam } from '~/providers/team';
 import { appMetaTags } from '~/utils/meta';
 
 import type { Route } from './+types/settings._layout';
@@ -23,7 +27,7 @@ export async function loader({ request, params }: Route.LoaderArgs) {
     teamUrl: params.teamUrl,
   });
 
-  if (!team || !canExecuteTeamAction('MANAGE_TEAM', team.currentTeamMember.role)) {
+  if (!team || !canExecuteTeamAction('MANAGE_TEAM', team.currentTeamRole)) {
     throw redirect(`/t/${params.teamUrl}`);
   }
 }
@@ -33,6 +37,31 @@ export async function clientLoader() {
 }
 
 export default function TeamsSettingsLayout() {
+  const team = useCurrentTeam();
+
+  if (!canExecuteTeamAction('MANAGE_TEAM', team.currentTeamRole)) {
+    return (
+      <GenericErrorLayout
+        errorCode={401}
+        errorCodeMap={{
+          401: {
+            heading: msg`Unauthorized`,
+            subHeading: msg`401 Unauthorized`,
+            message: msg`You are not authorized to access this page.`,
+          },
+        }}
+        primaryButton={
+          <Button asChild>
+            <Link to={`/t/${team.url}`}>
+              <Trans>Go Back</Trans>
+            </Link>
+          </Button>
+        }
+        secondaryButton={null}
+      />
+    );
+  }
+
   return (
     <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">
       <h1 className="text-4xl font-semibold">
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
deleted file mode 100644
index f03534d25..000000000
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Plural, Trans } from '@lingui/react/macro';
-import { DateTime } from 'luxon';
-import type Stripe from 'stripe';
-import { match } from 'ts-pattern';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { stripe } from '@documenso/lib/server-only/stripe';
-import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
-import { canExecuteTeamAction } from '@documenso/lib/utils/teams';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
-
-import { SettingsHeader } from '~/components/general/settings-header';
-import { TeamBillingPortalButton } from '~/components/general/teams/team-billing-portal-button';
-import { TeamSettingsBillingInvoicesTable } from '~/components/tables/team-settings-billing-invoices-table';
-import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
-
-import type { Route } from './+types/settings.billing';
-
-export async function loader({ request, params }: Route.LoaderArgs) {
-  const session = await getSession(request);
-
-  const team = await getTeamByUrl({
-    userId: session.user.id,
-    teamUrl: params.teamUrl,
-  });
-
-  let teamSubscription: Stripe.Subscription | null = null;
-
-  if (team.subscription) {
-    teamSubscription = await stripe.subscriptions.retrieve(team.subscription.planId);
-  }
-
-  return superLoaderJson({
-    team,
-    teamSubscription,
-  });
-}
-
-export default function TeamsSettingBillingPage() {
-  const { _ } = useLingui();
-
-  const { team, teamSubscription } = useSuperLoaderData<typeof loader>();
-
-  const canManageBilling = canExecuteTeamAction('MANAGE_BILLING', team.currentTeamMember.role);
-
-  const formatTeamSubscriptionDetails = (subscription: Stripe.Subscription | null) => {
-    if (!subscription) {
-      return <Trans>No payment required</Trans>;
-    }
-
-    const numberOfSeats = subscription.items.data[0].quantity ?? 0;
-
-    const formattedDate = DateTime.fromSeconds(subscription.current_period_end).toFormat(
-      'LLL dd, yyyy',
-    );
-
-    const subscriptionInterval = match(subscription?.items.data[0].plan.interval)
-      .with('year', () => _(msg`Yearly`))
-      .with('month', () => _(msg`Monthly`))
-      .otherwise(() => _(msg`Unknown`));
-
-    return (
-      <span>
-        <Plural value={numberOfSeats} one="# member" other="# members" />
-        {' • '}
-        <span>{subscriptionInterval}</span>
-        {' • '}
-        <Trans>Renews: {formattedDate}</Trans>
-      </span>
-    );
-  };
-
-  return (
-    <div>
-      <SettingsHeader
-        title={_(msg`Billing`)}
-        subtitle={_(msg`Your subscription is currently active.`)}
-      />
-
-      <Card gradient className="shadow-sm">
-        <CardContent className="flex flex-row items-center justify-between p-4">
-          <div className="flex flex-col text-sm">
-            <p className="text-foreground font-semibold">
-              {formatTeamSubscriptionDetails(teamSubscription)}
-            </p>
-          </div>
-
-          {teamSubscription && (
-            <div
-              title={
-                canManageBilling
-                  ? _(msg`Manage team subscription.`)
-                  : _(msg`You must be an admin of this team to manage billing.`)
-              }
-            >
-              <TeamBillingPortalButton teamId={team.id} />
-            </div>
-          )}
-        </CardContent>
-      </Card>
-
-      <section className="mt-6">
-        <TeamSettingsBillingInvoicesTable teamId={team.id} />
-      </section>
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
new file mode 100644
index 000000000..446b58bd6
--- /dev/null
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
@@ -0,0 +1,81 @@
+import { useEffect, useState } from 'react';
+
+import { useLingui } from '@lingui/react/macro';
+import { OrganisationGroupType, OrganisationMemberRole } from '@prisma/client';
+import { useLocation, useSearchParams } from 'react-router';
+
+import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
+import { trpc } from '@documenso/trpc/react';
+import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';
+import { Input } from '@documenso/ui/primitives/input';
+
+import { TeamGroupCreateDialog } from '~/components/dialogs/team-group-create-dialog';
+import { SettingsHeader } from '~/components/general/settings-header';
+import { TeamInheritMemberAlert } from '~/components/general/teams/team-inherit-member-alert';
+import { TeamGroupsTable } from '~/components/tables/team-groups-table';
+import { useCurrentTeam } from '~/providers/team';
+
+export default function TeamsSettingsGroupsPage() {
+  const { t } = useLingui();
+
+  const [searchParams, setSearchParams] = useSearchParams();
+
+  const { pathname } = useLocation();
+  const team = useCurrentTeam();
+
+  const [searchQuery, setSearchQuery] = useState(() => searchParams?.get('query') ?? '');
+
+  const debouncedSearchQuery = useDebouncedValue(searchQuery, 500);
+
+  /**
+   * Handle debouncing the search query.
+   */
+  useEffect(() => {
+    const params = new URLSearchParams(searchParams?.toString());
+
+    params.set('query', debouncedSearchQuery);
+
+    if (debouncedSearchQuery === '') {
+      params.delete('query');
+    }
+
+    // If nothing  to change then do nothing.
+    if (params.toString() === searchParams?.toString()) {
+      return;
+    }
+
+    setSearchParams(params);
+  }, [debouncedSearchQuery, pathname, searchParams]);
+
+  const everyoneGroupQuery = trpc.team.group.find.useQuery({
+    teamId: team.id,
+    types: [OrganisationGroupType.INTERNAL_ORGANISATION],
+    organisationRoles: [OrganisationMemberRole.MEMBER],
+    perPage: 1,
+  });
+
+  const memberAccessTeamGroup = everyoneGroupQuery.data?.data[0] || null;
+
+  return (
+    <div>
+      <SettingsHeader title={t`Team Groups`} subtitle={t`Manage the groups assigned to this team.`}>
+        <TeamGroupCreateDialog />
+      </SettingsHeader>
+
+      <Input
+        defaultValue={searchQuery}
+        onChange={(e) => setSearchQuery(e.target.value)}
+        placeholder={t`Search`}
+        className="mb-4"
+      />
+
+      <TeamGroupsTable />
+
+      <AnimateGenericFadeInOut key={everyoneGroupQuery.isFetched ? 'true' : 'false'}>
+        {everyoneGroupQuery.isFetched && (
+          <TeamInheritMemberAlert memberAccessTeamGroup={memberAccessTeamGroup} />
+        )}
+      </AnimateGenericFadeInOut>
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
index 02a7fea7b..100569623 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
@@ -1,21 +1,17 @@
 import { useEffect, useState } from 'react';
 
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import { Link, useLocation, useSearchParams } from 'react-router';
+import { useLingui } from '@lingui/react/macro';
+import { useLocation, useSearchParams } from 'react-router';
 
 import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
 import { Input } from '@documenso/ui/primitives/input';
-import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
 
-import { TeamMemberInviteDialog } from '~/components/dialogs/team-member-invite-dialog';
+import { TeamMemberCreateDialog } from '~/components/dialogs/team-member-create-dialog';
 import { SettingsHeader } from '~/components/general/settings-header';
-import { TeamSettingsMemberInvitesTable } from '~/components/tables/team-settings-member-invites-table';
-import { TeamSettingsMembersDataTable } from '~/components/tables/team-settings-members-table';
+import { TeamMembersTable } from '~/components/tables/team-members-table';
 
 export default function TeamsSettingsMembersPage() {
-  const { _ } = useLingui();
+  const { t } = useLingui();
 
   const [searchParams, setSearchParams] = useSearchParams();
   const { pathname } = useLocation();
@@ -24,8 +20,6 @@ export default function TeamsSettingsMembersPage() {
 
   const debouncedSearchQuery = useDebouncedValue(searchQuery, 500);
 
-  const currentTab = searchParams?.get('tab') === 'invites' ? 'invites' : 'members';
-
   /**
    * Handle debouncing the search query.
    */
@@ -48,44 +42,18 @@ export default function TeamsSettingsMembersPage() {
 
   return (
     <div>
-      <SettingsHeader
-        title={_(msg`Members`)}
-        subtitle={_(msg`Manage the members or invite new members.`)}
-      >
-        <TeamMemberInviteDialog />
+      <SettingsHeader title={t`Team Members`} subtitle={t`Manage the members of your team.`}>
+        <TeamMemberCreateDialog />
       </SettingsHeader>
 
-      <div>
-        <div className="my-4 flex flex-row items-center justify-between space-x-4">
-          <Input
-            defaultValue={searchQuery}
-            onChange={(e) => setSearchQuery(e.target.value)}
-            placeholder={_(msg`Search`)}
-          />
+      <Input
+        defaultValue={searchQuery}
+        onChange={(e) => setSearchQuery(e.target.value)}
+        placeholder={t`Search`}
+        className="mb-4"
+      />
 
-          <Tabs value={currentTab} className="flex-shrink-0 overflow-x-auto">
-            <TabsList>
-              <TabsTrigger className="min-w-[60px]" value="members" asChild>
-                <Link to={pathname ?? '/'}>
-                  <Trans>Active</Trans>
-                </Link>
-              </TabsTrigger>
-
-              <TabsTrigger className="min-w-[60px]" value="invites" asChild>
-                <Link to={`${pathname}?tab=invites`}>
-                  <Trans>Pending</Trans>
-                </Link>
-              </TabsTrigger>
-            </TabsList>
-          </Tabs>
-        </div>
-
-        {currentTab === 'invites' ? (
-          <TeamSettingsMemberInvitesTable key="invites" />
-        ) : (
-          <TeamSettingsMembersDataTable key="members" />
-        )}
-      </div>
+      <TeamMembersTable />
     </div>
   );
 }
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
index 5bd2b692e..c7d631de9 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
@@ -1,49 +1,156 @@
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
+import { useLingui } from '@lingui/react/macro';
+import { Loader } from 'lucide-react';
 
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
+import { DocumentSignatureType } from '@documenso/lib/constants/document';
+import { putFile } from '@documenso/lib/universal/upload/put-file';
+import { trpc } from '@documenso/trpc/react';
+import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { TeamBrandingPreferencesForm } from '~/components/forms/team-branding-preferences-form';
-import { TeamDocumentPreferencesForm } from '~/components/forms/team-document-preferences-form';
+import {
+  BrandingPreferencesForm,
+  type TBrandingPreferencesFormSchema,
+} from '~/components/forms/branding-preferences-form';
+import {
+  DocumentPreferencesForm,
+  type TDocumentPreferencesFormSchema,
+} from '~/components/forms/document-preferences-form';
 import { SettingsHeader } from '~/components/general/settings-header';
+import { useCurrentTeam } from '~/providers/team';
+import { appMetaTags } from '~/utils/meta';
 
-import type { Route } from './+types/settings.preferences';
-
-export async function loader({ request, params }: Route.LoaderArgs) {
-  const { user } = await getSession(request);
-
-  const team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });
-
-  return {
-    team,
-  };
+export function meta() {
+  return appMetaTags('Preferences');
 }
 
-export default function TeamsSettingsPage({ loaderData }: Route.ComponentProps) {
-  const { team } = loaderData;
+export default function TeamsSettingsPage() {
+  const team = useCurrentTeam();
 
-  const { _ } = useLingui();
+  const { t } = useLingui();
+  const { toast } = useToast();
+
+  const { data: teamWithSettings, isLoading: isLoadingTeam } = trpc.team.get.useQuery({
+    teamReference: team.id,
+  });
+
+  const { mutateAsync: updateTeamSettings } = trpc.team.settings.update.useMutation();
+
+  const onDocumentPreferencesSubmit = async (data: TDocumentPreferencesFormSchema) => {
+    try {
+      const {
+        documentVisibility,
+        documentLanguage,
+        includeSenderDetails,
+        includeSigningCertificate,
+        signatureTypes,
+      } = data;
+
+      await updateTeamSettings({
+        teamId: team.id,
+        data: {
+          documentVisibility,
+          documentLanguage,
+          includeSenderDetails,
+          includeSigningCertificate,
+          ...(signatureTypes.length === 0
+            ? {
+                typedSignatureEnabled: null,
+                uploadSignatureEnabled: null,
+                drawSignatureEnabled: null,
+              }
+            : {
+                typedSignatureEnabled: signatureTypes.includes(DocumentSignatureType.TYPE),
+                uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
+                drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
+              }),
+        },
+      });
+
+      toast({
+        title: t`Document preferences updated`,
+        description: t`Your document preferences have been updated`,
+      });
+    } catch (err) {
+      toast({
+        title: t`Something went wrong!`,
+        description: t`We were unable to update your document preferences at this time, please try again later`,
+        variant: 'destructive',
+      });
+    }
+  };
+
+  const onBrandingPreferencesFormSubmit = async (data: TBrandingPreferencesFormSchema) => {
+    try {
+      const { brandingEnabled, brandingLogo, brandingUrl, brandingCompanyDetails } = data;
+
+      let uploadedBrandingLogo = teamWithSettings?.teamSettings?.brandingLogo;
+
+      if (brandingLogo) {
+        uploadedBrandingLogo = JSON.stringify(await putFile(brandingLogo));
+      }
+
+      if (brandingLogo === null) {
+        uploadedBrandingLogo = '';
+      }
+
+      await updateTeamSettings({
+        teamId: team.id,
+        data: {
+          brandingEnabled,
+          brandingLogo: uploadedBrandingLogo || null,
+          brandingUrl: brandingUrl || null,
+          brandingCompanyDetails: brandingCompanyDetails || null,
+        },
+      });
+
+      toast({
+        title: t`Branding preferences updated`,
+        description: t`Your branding preferences have been updated`,
+      });
+    } catch (err) {
+      toast({
+        title: t`Something went wrong`,
+        description: t`We were unable to update your branding preferences at this time, please try again later`,
+        variant: 'destructive',
+      });
+    }
+  };
+
+  if (isLoadingTeam || !teamWithSettings) {
+    return (
+      <div className="flex items-center justify-center rounded-lg py-32">
+        <Loader className="text-muted-foreground h-6 w-6 animate-spin" />
+      </div>
+    );
+  }
 
   return (
-    <div>
+    <div className="max-w-2xl">
       <SettingsHeader
-        title={_(msg`Team Preferences`)}
-        subtitle={_(msg`Here you can set preferences and defaults for your team.`)}
+        title={t`Team Preferences`}
+        subtitle={t`Here you can set preferences and defaults for your team.`}
       />
 
       <section>
-        <TeamDocumentPreferencesForm team={team} settings={team.teamGlobalSettings} />
+        <DocumentPreferencesForm
+          canInherit={true}
+          settings={teamWithSettings.teamSettings}
+          onFormSubmit={onDocumentPreferencesSubmit}
+        />
       </section>
 
       <SettingsHeader
-        title={_(msg`Branding Preferences`)}
-        subtitle={_(msg`Here you can set preferences and defaults for branding.`)}
+        title={t`Branding Preferences`}
+        subtitle={t`Here you can set preferences and defaults for branding.`}
         className="mt-8"
       />
 
       <section>
-        <TeamBrandingPreferencesForm team={team} settings={team.teamGlobalSettings} />
+        <BrandingPreferencesForm
+          canInherit={true}
+          context="Team"
+          settings={teamWithSettings.teamSettings}
+          onFormSubmit={onBrandingPreferencesFormSubmit}
+        />
       </section>
     </div>
   );
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
index 91fd962da..f6c6d36e4 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
@@ -1,11 +1,40 @@
+import { useEffect, useMemo, useState } from 'react';
+
+import { useLingui } from '@lingui/react/macro';
+import { Trans } from '@lingui/react/macro';
+import type { TemplateDirectLink } from '@prisma/client';
+import { TemplateType } from '@prisma/client';
+
 import { getSession } from '@documenso/auth/server/lib/utils/get-session';
+import { useSession } from '@documenso/lib/client-only/providers/session';
 import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
 import { getTeamPublicProfile } from '@documenso/lib/server-only/team/get-team-public-profile';
+import { trpc } from '@documenso/trpc/react';
+import type { FindTemplateRow } from '@documenso/trpc/server/template-router/schema';
+import { cn } from '@documenso/ui/lib/utils';
+import { Button } from '@documenso/ui/primitives/button';
+import { Switch } from '@documenso/ui/primitives/switch';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
+import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import PublicProfilePage from '~/routes/_authenticated+/settings+/public-profile';
+import { ManagePublicTemplateDialog } from '~/components/dialogs/public-profile-template-manage-dialog';
+import type { TPublicProfileFormSchema } from '~/components/forms/public-profile-form';
+import { PublicProfileForm } from '~/components/forms/public-profile-form';
+import { SettingsHeader } from '~/components/general/settings-header';
+import { SettingsPublicProfileTemplatesTable } from '~/components/tables/settings-public-profile-templates-table';
+import { useCurrentTeam } from '~/providers/team';
+import { appMetaTags } from '~/utils/meta';
 
 import type { Route } from './+types/settings.public-profile';
 
+type DirectTemplate = FindTemplateRow & {
+  directLink: Pick<TemplateDirectLink, 'token' | 'enabled'>;
+};
+
+export function meta() {
+  return appMetaTags('Public Profile');
+}
+
 // Todo: This can be optimized.
 export async function loader({ request, params }: Route.LoaderArgs) {
   const session = await getSession(request);
@@ -25,5 +54,170 @@ export async function loader({ request, params }: Route.LoaderArgs) {
   };
 }
 
-// Todo: Test that the profile shows up correctly for teams.
-export default PublicProfilePage;
+export default function PublicProfilePage({ loaderData }: Route.ComponentProps) {
+  const { profile } = loaderData;
+
+  const { t } = useLingui();
+  const { toast } = useToast();
+
+  const team = useCurrentTeam();
+
+  const { refreshSession } = useSession();
+
+  const [isPublicProfileVisible, setIsPublicProfileVisible] = useState(profile.enabled);
+  const [isTooltipOpen, setIsTooltipOpen] = useState(false);
+
+  const { data } = trpc.template.findTemplates.useQuery({
+    perPage: 100,
+  });
+
+  const { mutateAsync: updateTeam, isPending: isUpdatingTeamProfile } =
+    trpc.team.update.useMutation({
+      onSuccess: async () => {
+        await refreshSession();
+      },
+    });
+
+  const isUpdating = isUpdatingTeamProfile;
+
+  const enabledPrivateDirectTemplates = useMemo(
+    () =>
+      (data?.data ?? []).filter(
+        (template): template is DirectTemplate =>
+          template.directLink?.enabled === true && template.type !== TemplateType.PUBLIC,
+      ),
+    [data],
+  );
+
+  const onProfileUpdate = async (data: TPublicProfileFormSchema) => {
+    await updateTeam({
+      teamId: team.id,
+      data: {
+        ...data,
+        profileEnabled: isPublicProfileVisible,
+      },
+    });
+
+    if (!isPublicProfileVisible) {
+      setIsTooltipOpen(true);
+    }
+  };
+
+  const togglePublicProfileVisibility = async (isVisible: boolean) => {
+    setIsTooltipOpen(false);
+
+    if (isUpdating) {
+      return;
+    }
+
+    setIsPublicProfileVisible(isVisible);
+
+    try {
+      await updateTeam({
+        teamId: team.id,
+        data: {
+          profileEnabled: isVisible,
+        },
+      });
+    } catch {
+      toast({
+        title: t`Something went wrong`,
+        description: t`We were unable to set your public profile to public. Please try again.`,
+        variant: 'destructive',
+      });
+
+      setIsPublicProfileVisible(!isVisible);
+    }
+  };
+
+  useEffect(() => {
+    setIsPublicProfileVisible(profile.enabled);
+  }, [profile.enabled]);
+
+  return (
+    <div className="max-w-2xl">
+      <SettingsHeader
+        title={t`Public Profile`}
+        subtitle={t`You can choose to enable or disable the profile for public view.`}
+      >
+        <Tooltip open={isTooltipOpen} onOpenChange={setIsTooltipOpen}>
+          <TooltipTrigger asChild>
+            <div
+              className={cn(
+                'text-muted-foreground/50 flex flex-row items-center justify-center space-x-2 text-xs',
+                {
+                  '[&>*:first-child]:text-muted-foreground': !isPublicProfileVisible,
+                  '[&>*:last-child]:text-muted-foreground': isPublicProfileVisible,
+                },
+              )}
+            >
+              <span>
+                <Trans>Hide</Trans>
+              </span>
+              <Switch
+                disabled={isUpdating}
+                checked={isPublicProfileVisible}
+                onCheckedChange={togglePublicProfileVisibility}
+              />
+              <span>
+                <Trans>Show</Trans>
+              </span>
+            </div>
+          </TooltipTrigger>
+
+          <TooltipContent className="text-muted-foreground max-w-[40ch] space-y-2 py-2">
+            {isPublicProfileVisible ? (
+              <>
+                <p>
+                  <Trans>
+                    Profile is currently <strong>visible</strong>.
+                  </Trans>
+                </p>
+
+                <p>
+                  <Trans>Toggle the switch to hide your profile from the public.</Trans>
+                </p>
+              </>
+            ) : (
+              <>
+                <p>
+                  <Trans>
+                    Profile is currently <strong>hidden</strong>.
+                  </Trans>
+                </p>
+
+                <p>
+                  <Trans>Toggle the switch to show your profile to the public.</Trans>
+                </p>
+              </>
+            )}
+          </TooltipContent>
+        </Tooltip>
+      </SettingsHeader>
+
+      <PublicProfileForm profile={profile} onProfileUpdate={onProfileUpdate} />
+
+      <div className="mt-4">
+        <SettingsHeader
+          title={t`Templates`}
+          subtitle={t`Show templates in your public profile for your audience to sign and get started quickly`}
+          hideDivider={true}
+          className="mt-8 [&>*>h3]:text-base"
+        >
+          <ManagePublicTemplateDialog
+            directTemplates={enabledPrivateDirectTemplates}
+            trigger={
+              <Button variant="outline">
+                <Trans>Link template</Trans>
+              </Button>
+            }
+          />
+        </SettingsHeader>
+
+        <div className="mt-6">
+          <SettingsPublicProfileTemplatesTable />
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
index b9fb2e4f6..1d5f86bd5 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
@@ -1,3 +1,121 @@
-import ApiTokensPage from '~/routes/_authenticated+/settings+/tokens';
+import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
+import { TeamMemberRole } from '@prisma/client';
+import { DateTime } from 'luxon';
 
-export default ApiTokensPage;
+import { trpc } from '@documenso/trpc/react';
+import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
+import { AlertTitle } from '@documenso/ui/primitives/alert';
+import { Button } from '@documenso/ui/primitives/button';
+
+import TokenDeleteDialog from '~/components/dialogs/token-delete-dialog';
+import { ApiTokenForm } from '~/components/forms/token';
+import { SettingsHeader } from '~/components/general/settings-header';
+import { useOptionalCurrentTeam } from '~/providers/team';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+  return appMetaTags('API Tokens');
+}
+
+export default function ApiTokensPage() {
+  const { i18n } = useLingui();
+
+  const { data: tokens } = trpc.apiToken.getTokens.useQuery();
+
+  const team = useOptionalCurrentTeam();
+
+  return (
+    <div>
+      <SettingsHeader
+        title={<Trans>API Tokens</Trans>}
+        subtitle={
+          <Trans>
+            On this page, you can create and manage API tokens. See our{' '}
+            <a
+              className="text-primary underline"
+              href={'https://docs.documenso.com/developers/public-api'}
+              target="_blank"
+            >
+              Documentation
+            </a>{' '}
+            for more information.
+          </Trans>
+        }
+      />
+
+      {team && team?.currentTeamRole !== TeamMemberRole.ADMIN ? (
+        <Alert
+          className="flex flex-col items-center justify-between gap-4 p-6 md:flex-row"
+          variant="warning"
+        >
+          <div>
+            <AlertTitle>
+              <Trans>Unauthorized</Trans>
+            </AlertTitle>
+            <AlertDescription className="mr-2">
+              <Trans>You need to be an admin to manage API tokens.</Trans>
+            </AlertDescription>
+          </div>
+        </Alert>
+      ) : (
+        <>
+          <ApiTokenForm className="max-w-xl" tokens={tokens} />
+
+          <hr className="mb-4 mt-8" />
+
+          <h4 className="text-xl font-medium">
+            <Trans>Your existing tokens</Trans>
+          </h4>
+
+          {tokens && tokens.length === 0 && (
+            <div className="mb-4">
+              <p className="text-muted-foreground mt-2 text-sm italic">
+                <Trans>Your tokens will be shown here once you create them.</Trans>
+              </p>
+            </div>
+          )}
+
+          {tokens && tokens.length > 0 && (
+            <div className="mt-4 flex max-w-xl flex-col gap-y-4">
+              {tokens.map((token) => (
+                <div key={token.id} className="border-border rounded-lg border p-4">
+                  <div className="flex items-center justify-between gap-x-4">
+                    <div>
+                      <h5 className="text-base">{token.name}</h5>
+
+                      <p className="text-muted-foreground mt-2 text-xs">
+                        <Trans>
+                          Created on {i18n.date(token.createdAt, DateTime.DATETIME_FULL)}
+                        </Trans>
+                      </p>
+                      {token.expires ? (
+                        <p className="text-muted-foreground mt-1 text-xs">
+                          <Trans>
+                            Expires on {i18n.date(token.expires, DateTime.DATETIME_FULL)}
+                          </Trans>
+                        </p>
+                      ) : (
+                        <p className="text-muted-foreground mt-1 text-xs">
+                          <Trans>Token doesn't have an expiration date</Trans>
+                        </p>
+                      )}
+                    </div>
+
+                    <div>
+                      <TokenDeleteDialog token={token}>
+                        <Button variant="destructive">
+                          <Trans>Delete</Trans>
+                        </Button>
+                      </TokenDeleteDialog>
+                    </div>
+                  </div>
+                </div>
+              ))}
+            </div>
+          )}
+        </>
+      )}
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
index 21e1ff1c7..63d10148e 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
@@ -8,7 +8,7 @@ import { useRevalidator } from 'react-router';
 import type { z } from 'zod';
 
 import { trpc } from '@documenso/trpc/react';
-import { ZEditWebhookMutationSchema } from '@documenso/trpc/server/webhook-router/schema';
+import { ZEditWebhookRequestSchema } from '@documenso/trpc/server/webhook-router/schema';
 import { Button } from '@documenso/ui/primitives/button';
 import {
   Form,
@@ -27,13 +27,18 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 import { SettingsHeader } from '~/components/general/settings-header';
 import { WebhookMultiSelectCombobox } from '~/components/general/webhook-multiselect-combobox';
 import { useCurrentTeam } from '~/providers/team';
+import { appMetaTags } from '~/utils/meta';
 
 import type { Route } from './+types/settings.webhooks.$id';
 
-const ZEditWebhookFormSchema = ZEditWebhookMutationSchema.omit({ id: true });
+const ZEditWebhookFormSchema = ZEditWebhookRequestSchema.omit({ id: true, teamId: true });
 
 type TEditWebhookFormSchema = z.infer<typeof ZEditWebhookFormSchema>;
 
+export function meta() {
+  return appMetaTags('Webhooks');
+}
+
 export default function WebhookPage({ params }: Route.ComponentProps) {
   const { _ } = useLingui();
   const { toast } = useToast();
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
index ae154a31c..c9e71d3ab 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
@@ -15,6 +15,11 @@ import { WebhookCreateDialog } from '~/components/dialogs/webhook-create-dialog'
 import { WebhookDeleteDialog } from '~/components/dialogs/webhook-delete-dialog';
 import { SettingsHeader } from '~/components/general/settings-header';
 import { useCurrentTeam } from '~/providers/team';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+  return appMetaTags('Webhooks');
+}
 
 export default function WebhookPage() {
   const { _, i18n } = useLingui();
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
index 7d207d34f..2b65d8df6 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
@@ -1,5 +1,217 @@
-import TemplatePage, { loader } from '~/routes/_authenticated+/templates.$id._index';
+import { Trans } from '@lingui/react/macro';
+import { DocumentSigningOrder, SigningStatus } from '@prisma/client';
+import { ChevronLeft, LucideEdit } from 'lucide-react';
+import { Link, redirect, useNavigate } from 'react-router';
 
-export { loader };
+import { getSession } from '@documenso/auth/server/lib/utils/get-session';
+import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
+import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
+import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';
+import { DocumentReadOnlyFields } from '@documenso/ui/components/document/document-read-only-fields';
+import { Button } from '@documenso/ui/primitives/button';
+import { Card, CardContent } from '@documenso/ui/primitives/card';
+import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
 
-export default TemplatePage;
+import { TemplateBulkSendDialog } from '~/components/dialogs/template-bulk-send-dialog';
+import { TemplateDirectLinkDialogWrapper } from '~/components/dialogs/template-direct-link-dialog-wrapper';
+import { TemplateUseDialog } from '~/components/dialogs/template-use-dialog';
+import { TemplateDirectLinkBadge } from '~/components/general/template/template-direct-link-badge';
+import { TemplatePageViewDocumentsTable } from '~/components/general/template/template-page-view-documents-table';
+import { TemplatePageViewInformation } from '~/components/general/template/template-page-view-information';
+import { TemplatePageViewRecentActivity } from '~/components/general/template/template-page-view-recent-activity';
+import { TemplatePageViewRecipients } from '~/components/general/template/template-page-view-recipients';
+import { TemplateType } from '~/components/general/template/template-type';
+import { TemplatesTableActionDropdown } from '~/components/tables/templates-table-action-dropdown';
+import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
+
+import type { Route } from './+types/templates.$id._index';
+
+export async function loader({ params, request }: Route.LoaderArgs) {
+  const { user } = await getSession(request);
+
+  const team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });
+
+  const { id } = params;
+
+  const templateId = Number(id);
+  const templateRootPath = formatTemplatesPath(team.url);
+  const documentRootPath = formatDocumentsPath(team.url);
+
+  if (!templateId || Number.isNaN(templateId)) {
+    throw redirect(templateRootPath);
+  }
+
+  const template = await getTemplateById({
+    id: templateId,
+    userId: user.id,
+    teamId: team?.id,
+  }).catch(() => null);
+
+  if (!template || !template.templateDocumentData || (template?.teamId && !team.url)) {
+    throw redirect(templateRootPath);
+  }
+
+  return superLoaderJson({
+    user,
+    team,
+    template,
+    templateRootPath,
+    documentRootPath,
+  });
+}
+
+export default function TemplatePage() {
+  const { user, team, template, templateRootPath, documentRootPath } =
+    useSuperLoaderData<typeof loader>();
+
+  const { templateDocumentData, fields, recipients, templateMeta } = template;
+
+  const navigate = useNavigate();
+
+  // Remap to fit the DocumentReadOnlyFields component.
+  const readOnlyFields = fields.map((field) => {
+    const recipient = recipients.find((recipient) => recipient.id === field.recipientId) || {
+      name: '',
+      email: '',
+      signingStatus: SigningStatus.NOT_SIGNED,
+    };
+
+    return {
+      ...field,
+      recipient,
+      signature: null,
+    };
+  });
+
+  const mockedDocumentMeta = templateMeta
+    ? {
+        ...templateMeta,
+        signingOrder: templateMeta.signingOrder || DocumentSigningOrder.SEQUENTIAL,
+        documentId: 0,
+      }
+    : undefined;
+
+  return (
+    <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
+      <Link to={templateRootPath} className="flex items-center text-[#7AC455] hover:opacity-80">
+        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
+        <Trans>Templates</Trans>
+      </Link>
+
+      <div className="flex flex-row justify-between truncate">
+        <div>
+          <h1
+            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
+            title={template.title}
+          >
+            {template.title}
+          </h1>
+
+          <div className="mt-2.5 flex items-center">
+            <TemplateType inheritColor className="text-muted-foreground" type={template.type} />
+
+            {template.directLink?.token && (
+              <TemplateDirectLinkBadge
+                className="ml-4"
+                token={template.directLink.token}
+                enabled={template.directLink.enabled}
+              />
+            )}
+          </div>
+        </div>
+
+        <div className="mt-2 flex flex-row space-x-4 sm:mt-0 sm:self-end">
+          <TemplateDirectLinkDialogWrapper template={template} />
+
+          <TemplateBulkSendDialog templateId={template.id} recipients={template.recipients} />
+
+          <Button className="w-full" asChild>
+            <Link to={`${templateRootPath}/${template.id}/edit`}>
+              <LucideEdit className="mr-1.5 h-3.5 w-3.5" />
+              <Trans>Edit Template</Trans>
+            </Link>
+          </Button>
+        </div>
+      </div>
+
+      <div className="mt-6 grid w-full grid-cols-12 gap-8">
+        <Card
+          className="relative col-span-12 rounded-xl before:rounded-xl lg:col-span-6 xl:col-span-7"
+          gradient
+        >
+          <CardContent className="p-2">
+            <PDFViewer document={template} key={template.id} documentData={templateDocumentData} />
+          </CardContent>
+        </Card>
+
+        <DocumentReadOnlyFields
+          fields={readOnlyFields}
+          showFieldStatus={false}
+          showRecipientTooltip={true}
+          showRecipientColors={true}
+          recipientIds={recipients.map((recipient) => recipient.id)}
+          documentMeta={mockedDocumentMeta}
+        />
+
+        <div className="col-span-12 lg:col-span-6 xl:col-span-5">
+          <div className="space-y-6">
+            <section className="border-border bg-widget flex flex-col rounded-xl border pb-4 pt-6">
+              <div className="flex flex-row items-center justify-between px-4">
+                <h3 className="text-foreground text-2xl font-semibold">
+                  <Trans>Template</Trans>
+                </h3>
+
+                <div>
+                  <TemplatesTableActionDropdown
+                    row={template}
+                    teamId={team?.id}
+                    templateRootPath={templateRootPath}
+                    onDelete={async () => navigate(templateRootPath)}
+                  />
+                </div>
+              </div>
+
+              <p className="text-muted-foreground mt-2 px-4 text-sm">
+                <Trans>Manage and view template</Trans>
+              </p>
+
+              <div className="mt-4 border-t px-4 pt-4">
+                <TemplateUseDialog
+                  templateId={template.id}
+                  templateSigningOrder={template.templateMeta?.signingOrder}
+                  recipients={template.recipients}
+                  documentRootPath={documentRootPath}
+                  trigger={
+                    <Button className="w-full">
+                      <Trans>Use</Trans>
+                    </Button>
+                  }
+                />
+              </div>
+            </section>
+
+            {/* Template information section. */}
+            <TemplatePageViewInformation template={template} userId={user.id} />
+
+            {/* Recipients section. */}
+            <TemplatePageViewRecipients template={template} templateRootPath={templateRootPath} />
+
+            {/* Recent activity section. */}
+            <TemplatePageViewRecentActivity
+              documentRootPath={documentRootPath}
+              templateId={template.id}
+            />
+          </div>
+        </div>
+      </div>
+
+      <div className="mt-16" id="documents">
+        <h1 className="mb-4 text-2xl font-bold">
+          <Trans>Documents created from template</Trans>
+        </h1>
+
+        <TemplatePageViewDocumentsTable templateId={template.id} />
+      </div>
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id.edit.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id.edit.tsx
index 7f4b0b459..e3bd0eae3 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id.edit.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id.edit.tsx
@@ -1,5 +1,108 @@
-import TemplateEditPage, { loader } from '~/routes/_authenticated+/templates.$id.edit';
+import { Trans } from '@lingui/react/macro';
+import { ChevronLeft } from 'lucide-react';
+import { Link, redirect } from 'react-router';
 
-export { loader };
+import { getSession } from '@documenso/auth/server/lib/utils/get-session';
+import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
+import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
+import { formatTemplatesPath } from '@documenso/lib/utils/teams';
 
-export default TemplateEditPage;
+import { TemplateDirectLinkDialogWrapper } from '~/components/dialogs/template-direct-link-dialog-wrapper';
+import { LegacyFieldWarningPopover } from '~/components/general/legacy-field-warning-popover';
+import { TemplateDirectLinkBadge } from '~/components/general/template/template-direct-link-badge';
+import { TemplateEditForm } from '~/components/general/template/template-edit-form';
+import { TemplateType } from '~/components/general/template/template-type';
+import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
+
+import type { Route } from './+types/templates.$id.edit';
+
+export async function loader({ params, request }: Route.LoaderArgs) {
+  const { user } = await getSession(request);
+
+  const team: TGetTeamByUrlResponse = await getTeamByUrl({
+    userId: user.id,
+    teamUrl: params.teamUrl,
+  });
+
+  const { id } = params;
+
+  const templateId = Number(id);
+  const templateRootPath = formatTemplatesPath(team?.url);
+
+  if (!templateId || Number.isNaN(templateId)) {
+    throw redirect(templateRootPath);
+  }
+
+  const template = await getTemplateById({
+    id: templateId,
+    userId: user.id,
+    teamId: team?.id,
+  }).catch(() => null);
+
+  if (!template || !template.templateDocumentData) {
+    throw redirect(templateRootPath);
+  }
+
+  return superLoaderJson({
+    template: {
+      ...template,
+      folder: null,
+    },
+    templateRootPath,
+  });
+}
+
+export default function TemplateEditPage() {
+  const { template, templateRootPath } = useSuperLoaderData<typeof loader>();
+
+  return (
+    <div className="mx-auto -mt-4 max-w-screen-xl px-4 md:px-8">
+      <div className="flex flex-col justify-between sm:flex-row">
+        <div>
+          <Link
+            to={`${templateRootPath}/${template.id}`}
+            className="flex items-center text-[#7AC455] hover:opacity-80"
+          >
+            <ChevronLeft className="mr-2 inline-block h-5 w-5" />
+            <Trans>Template</Trans>
+          </Link>
+
+          <h1
+            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
+            title={template.title}
+          >
+            {template.title}
+          </h1>
+
+          <div className="mt-2.5 flex items-center">
+            <TemplateType inheritColor className="text-muted-foreground" type={template.type} />
+
+            {template.directLink?.token && (
+              <TemplateDirectLinkBadge
+                className="ml-4"
+                token={template.directLink.token}
+                enabled={template.directLink.enabled}
+              />
+            )}
+          </div>
+        </div>
+
+        <div className="mt-2 flex items-center gap-2 sm:mt-0 sm:self-end">
+          <TemplateDirectLinkDialogWrapper template={template} />
+
+          {template.useLegacyFieldInsertion && (
+            <div>
+              <LegacyFieldWarningPopover type="template" templateId={template.id} />
+            </div>
+          )}
+        </div>
+      </div>
+
+      <TemplateEditForm
+        className="mt-6"
+        initialTemplate={template}
+        templateRootPath={templateRootPath}
+      />
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
index 7781ededd..b46174fb0 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
@@ -1,5 +1,292 @@
-import TemplatesPage, { meta } from '~/routes/_authenticated+/templates._index';
+import { useEffect, useState } from 'react';
 
-export { meta };
+import { Trans } from '@lingui/react/macro';
+import { Bird, FolderIcon, HomeIcon, Loader2 } from 'lucide-react';
+import { useNavigate, useSearchParams } from 'react-router';
 
-export default TemplatesPage;
+import { FolderType } from '@documenso/lib/types/folder-type';
+import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
+import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';
+import { trpc } from '@documenso/trpc/react';
+import type { TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';
+import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
+import { Button } from '@documenso/ui/primitives/button';
+
+import { TemplateCreateDialog } from '~/components/dialogs/template-create-dialog';
+import { TemplateFolderCreateDialog } from '~/components/dialogs/template-folder-create-dialog';
+import { TemplateFolderDeleteDialog } from '~/components/dialogs/template-folder-delete-dialog';
+import { TemplateFolderMoveDialog } from '~/components/dialogs/template-folder-move-dialog';
+import { TemplateFolderSettingsDialog } from '~/components/dialogs/template-folder-settings-dialog';
+import { FolderCard } from '~/components/general/folder/folder-card';
+import { TemplatesTable } from '~/components/tables/templates-table';
+import { useCurrentTeam } from '~/providers/team';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+  return appMetaTags('Templates');
+}
+
+export default function TemplatesPage() {
+  const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
+
+  const [isMovingFolder, setIsMovingFolder] = useState(false);
+  const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);
+  const [isDeletingFolder, setIsDeletingFolder] = useState(false);
+  const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);
+  const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);
+  const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);
+
+  const team = useCurrentTeam();
+
+  const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();
+  const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();
+
+  const page = Number(searchParams.get('page')) || 1;
+  const perPage = Number(searchParams.get('perPage')) || 10;
+
+  const documentRootPath = formatDocumentsPath(team.url);
+  const templateRootPath = formatTemplatesPath(team.url);
+
+  const { data, isLoading, isLoadingError, refetch } = trpc.template.findTemplates.useQuery({
+    page: page,
+    perPage: perPage,
+  });
+
+  const {
+    data: foldersData,
+    isLoading: isFoldersLoading,
+    refetch: refetchFolders,
+  } = trpc.folder.getFolders.useQuery({
+    type: FolderType.TEMPLATE,
+    parentId: null,
+  });
+
+  useEffect(() => {
+    void refetch();
+    void refetchFolders();
+  }, [team.url]);
+
+  const navigateToFolder = (folderId?: string | null) => {
+    const templatesPath = formatTemplatesPath(team.url);
+
+    if (folderId) {
+      void navigate(`${templatesPath}/f/${folderId}`);
+    } else {
+      void navigate(templatesPath);
+    }
+  };
+
+  const handleNavigate = (folderId: string) => {
+    navigateToFolder(folderId);
+  };
+
+  const handleMove = (folder: TFolderWithSubfolders) => {
+    setFolderToMove(folder);
+    setIsMovingFolder(true);
+  };
+
+  const handlePin = (folderId: string) => {
+    void pinFolder({ folderId });
+  };
+
+  const handleUnpin = (folderId: string) => {
+    void unpinFolder({ folderId });
+  };
+
+  const handleSettings = (folder: TFolderWithSubfolders) => {
+    setFolderToSettings(folder);
+    setIsSettingsFolderOpen(true);
+  };
+
+  const handleDelete = (folder: TFolderWithSubfolders) => {
+    setFolderToDelete(folder);
+    setIsDeletingFolder(true);
+  };
+
+  const handleViewAllFolders = () => {
+    void navigate(`${formatTemplatesPath(team.url)}/folders`);
+  };
+
+  return (
+    <div className="mx-auto max-w-screen-xl px-4 md:px-8">
+      <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
+        <div className="flex flex-1 items-center">
+          <Button
+            variant="ghost"
+            size="sm"
+            className="flex items-center space-x-2 pl-0 hover:bg-transparent"
+            onClick={() => navigateToFolder(null)}
+          >
+            <HomeIcon className="h-4 w-4" />
+            <span>Home</span>
+          </Button>
+
+          {foldersData?.breadcrumbs.map((folder) => (
+            <div key={folder.id} className="flex items-center space-x-2">
+              <span>/</span>
+              <Button
+                variant="ghost"
+                size="sm"
+                className="flex items-center space-x-2 pl-1 hover:bg-transparent"
+                onClick={() => navigateToFolder(folder.id)}
+              >
+                <FolderIcon className="h-4 w-4" />
+                <span>{folder.name}</span>
+              </Button>
+            </div>
+          ))}
+        </div>
+
+        <div className="flex gap-4 sm:flex-row sm:justify-end">
+          <TemplateCreateDialog templateRootPath={templateRootPath} />
+          <TemplateFolderCreateDialog />
+        </div>
+      </div>
+
+      {isFoldersLoading ? (
+        <div className="mt-6 flex justify-center">
+          <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />
+        </div>
+      ) : (
+        <>
+          {foldersData?.folders && foldersData.folders.some((folder) => folder.pinned) && (
+            <div className="mt-6">
+              <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
+                {foldersData.folders
+                  .filter((folder) => folder.pinned)
+                  .map((folder) => (
+                    <FolderCard
+                      key={folder.id}
+                      folder={folder}
+                      onNavigate={handleNavigate}
+                      onMove={handleMove}
+                      onPin={handlePin}
+                      onUnpin={handleUnpin}
+                      onSettings={handleSettings}
+                      onDelete={handleDelete}
+                    />
+                  ))}
+              </div>
+            </div>
+          )}
+
+          <div className="mt-6">
+            <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
+              {foldersData?.folders
+                ?.filter((folder) => !folder.pinned)
+                .slice(0, 12)
+                .map((folder) => (
+                  <FolderCard
+                    key={folder.id}
+                    folder={folder}
+                    onNavigate={handleNavigate}
+                    onMove={handleMove}
+                    onPin={handlePin}
+                    onUnpin={handleUnpin}
+                    onSettings={handleSettings}
+                    onDelete={handleDelete}
+                  />
+                ))}
+            </div>
+
+            <div className="mt-6 flex items-center justify-center">
+              {foldersData && foldersData.folders?.length > 12 && (
+                <Button
+                  variant="link"
+                  size="sm"
+                  className="text-muted-foreground hover:text-foreground"
+                  onClick={() => void handleViewAllFolders()}
+                >
+                  View all folders
+                </Button>
+              )}
+            </div>
+          </div>
+        </>
+      )}
+
+      <div className="mt-12">
+        <div className="flex flex-row items-center">
+          {team && (
+            <Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">
+              {team.avatarImageId && <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />}
+              <AvatarFallback className="text-muted-foreground text-xs">
+                {team.name.slice(0, 1)}
+              </AvatarFallback>
+            </Avatar>
+          )}
+
+          <h1 className="truncate text-2xl font-semibold md:text-3xl">
+            <Trans>Templates</Trans>
+          </h1>
+        </div>
+
+        <div className="mt-8">
+          {data && data.count === 0 ? (
+            <div className="text-muted-foreground/60 flex h-96 flex-col items-center justify-center gap-y-4">
+              <Bird className="h-12 w-12" strokeWidth={1.5} />
+
+              <div className="text-center">
+                <h3 className="text-lg font-semibold">
+                  <Trans>We're all empty</Trans>
+                </h3>
+
+                <p className="mt-2 max-w-[50ch]">
+                  <Trans>
+                    You have not yet created any templates. To create a template please upload one.
+                  </Trans>
+                </p>
+              </div>
+            </div>
+          ) : (
+            <TemplatesTable
+              data={data}
+              isLoading={isLoading}
+              isLoadingError={isLoadingError}
+              documentRootPath={documentRootPath}
+              templateRootPath={templateRootPath}
+            />
+          )}
+        </div>
+      </div>
+
+      <TemplateFolderMoveDialog
+        foldersData={foldersData?.folders}
+        folder={folderToMove}
+        isOpen={isMovingFolder}
+        onOpenChange={(open) => {
+          setIsMovingFolder(open);
+
+          if (!open) {
+            setFolderToMove(null);
+          }
+        }}
+      />
+
+      <TemplateFolderSettingsDialog
+        folder={folderToSettings}
+        isOpen={isSettingsFolderOpen}
+        onOpenChange={(open) => {
+          setIsSettingsFolderOpen(open);
+
+          if (!open) {
+            setFolderToSettings(null);
+          }
+        }}
+      />
+
+      <TemplateFolderDeleteDialog
+        folder={folderToDelete}
+        isOpen={isDeletingFolder}
+        onOpenChange={(open) => {
+          setIsDeletingFolder(open);
+
+          if (!open) {
+            setFolderToDelete(null);
+          }
+        }}
+      />
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId.$id._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId.$id._index.tsx
deleted file mode 100644
index 581561fc9..000000000
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId.$id._index.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import TemplatePage, { loader } from '~/routes/_authenticated+/templates.f.$folderId.$id._index';
-
-export { loader };
-
-export default TemplatePage;
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId.$id.edit.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId.$id.edit.tsx
deleted file mode 100644
index 0de6a0574..000000000
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId.$id.edit.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import TemplateEditPage, { loader } from '~/routes/_authenticated+/templates.f.$folderId.$id.edit';
-
-export { loader };
-
-export default TemplateEditPage;
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
index 5bacbff06..ff2d85020 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
@@ -1,5 +1,369 @@
-import TemplatesPage, { meta } from '~/routes/_authenticated+/templates.f.$folderId._index';
+import { useEffect, useState } from 'react';
 
-export { meta };
+import { Trans } from '@lingui/react/macro';
+import { Bird, FolderIcon, HomeIcon, Loader2, PinIcon } from 'lucide-react';
+import { useNavigate, useParams, useSearchParams } from 'react-router';
 
-export default TemplatesPage;
+import { FolderType } from '@documenso/lib/types/folder-type';
+import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
+import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';
+import { trpc } from '@documenso/trpc/react';
+import type { TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';
+import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@documenso/ui/primitives/dropdown-menu';
+
+import { FolderDeleteDialog } from '~/components/dialogs/folder-delete-dialog';
+import { FolderMoveDialog } from '~/components/dialogs/folder-move-dialog';
+import { FolderSettingsDialog } from '~/components/dialogs/folder-settings-dialog';
+import { TemplateCreateDialog } from '~/components/dialogs/template-create-dialog';
+import { TemplateFolderCreateDialog } from '~/components/dialogs/template-folder-create-dialog';
+import { TemplatesTable } from '~/components/tables/templates-table';
+import { useCurrentTeam } from '~/providers/team';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+  return appMetaTags('Templates');
+}
+
+export default function TemplatesPage() {
+  const [searchParams] = useSearchParams();
+  const { folderId } = useParams();
+  const navigate = useNavigate();
+
+  const team = useCurrentTeam();
+
+  const page = Number(searchParams.get('page')) || 1;
+  const perPage = Number(searchParams.get('perPage')) || 10;
+
+  const documentRootPath = formatDocumentsPath(team.url);
+  const templateRootPath = formatTemplatesPath(team.url);
+
+  const { data, isLoading, isLoadingError, refetch } = trpc.template.findTemplates.useQuery({
+    page: page,
+    perPage: perPage,
+    folderId: folderId,
+  });
+
+  const {
+    data: foldersData,
+    isLoading: isFoldersLoading,
+    refetch: refetchFolders,
+  } = trpc.folder.getFolders.useQuery({
+    parentId: folderId,
+    type: FolderType.TEMPLATE,
+  });
+
+  const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();
+  const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();
+
+  const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);
+  const [isMovingFolder, setIsMovingFolder] = useState(false);
+  const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);
+  const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);
+  const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);
+  const [isDeletingFolder, setIsDeletingFolder] = useState(false);
+
+  useEffect(() => {
+    void refetch();
+    void refetchFolders();
+  }, [team?.url]);
+
+  const navigateToFolder = (folderId?: string) => {
+    const templatesPath = formatTemplatesPath(team.url);
+
+    if (folderId) {
+      void navigate(`${templatesPath}/f/${folderId}`);
+    } else {
+      void navigate(templatesPath);
+    }
+  };
+
+  return (
+    <div className="mx-auto max-w-screen-xl px-4 md:px-8">
+      <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
+        <div className="flex flex-1 items-center">
+          <Button
+            variant="ghost"
+            size="sm"
+            className="flex items-center space-x-2 pl-0 hover:bg-transparent"
+            onClick={() => navigateToFolder()}
+          >
+            <HomeIcon className="h-4 w-4" />
+            <span>Home</span>
+          </Button>
+
+          {foldersData?.breadcrumbs.map((folder) => (
+            <div key={folder.id} className="flex items-center space-x-2">
+              <span>/</span>
+              <Button
+                variant="ghost"
+                size="sm"
+                className="flex items-center space-x-2 pl-1 hover:bg-transparent"
+                onClick={() => navigateToFolder(folder.id)}
+              >
+                <FolderIcon className="h-4 w-4" />
+                <span>{folder.name}</span>
+              </Button>
+            </div>
+          ))}
+        </div>
+
+        <div className="flex gap-4 sm:flex-row sm:justify-end">
+          <TemplateFolderCreateDialog />
+          <TemplateCreateDialog templateRootPath={templateRootPath} folderId={folderId} />
+        </div>
+      </div>
+
+      {isFoldersLoading ? (
+        <div className="mt-6 flex justify-center">
+          <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />
+        </div>
+      ) : (
+        <>
+          {foldersData?.folders.some((folder) => folder.pinned) && (
+            <div className="mt-6">
+              <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
+                {foldersData?.folders
+                  .filter((folder) => folder.pinned)
+                  .map((folder) => (
+                    <div
+                      key={folder.id}
+                      className="border-border hover:border-muted-foreground/40 group relative flex flex-col rounded-lg border p-4 transition-all hover:shadow-sm"
+                    >
+                      <div className="flex items-start justify-between">
+                        <button
+                          className="flex items-center space-x-2 text-left"
+                          onClick={() => navigateToFolder(folder.id)}
+                        >
+                          <FolderIcon className="text-documenso h-6 w-6" />
+                          <div>
+                            <div className="flex items-center gap-2">
+                              <h3 className="font-medium">{folder.name}</h3>
+                              <PinIcon className="text-documenso h-3 w-3" />
+                            </div>
+                            <div className="mt-1 flex space-x-2 text-xs text-gray-500">
+                              <span>{folder._count.templates || 0} templates</span>
+                              <span>•</span>
+                              <span>{folder._count.subfolders} folders</span>
+                            </div>
+                          </div>
+                        </button>
+
+                        <DropdownMenu>
+                          <DropdownMenuTrigger asChild>
+                            <Button
+                              variant="ghost"
+                              size="sm"
+                              className="opacity-0 group-hover:opacity-100"
+                            >
+                              •••
+                            </Button>
+                          </DropdownMenuTrigger>
+                          <DropdownMenuContent align="end">
+                            <DropdownMenuItem
+                              onClick={() => {
+                                setFolderToMove(folder);
+                                setIsMovingFolder(true);
+                              }}
+                            >
+                              Move
+                            </DropdownMenuItem>
+                            <DropdownMenuItem
+                              onClick={() => {
+                                void unpinFolder({ folderId: folder.id });
+                              }}
+                            >
+                              Unpin
+                            </DropdownMenuItem>
+                            <DropdownMenuItem
+                              onClick={() => {
+                                setFolderToSettings(folder);
+                                setIsSettingsFolderOpen(true);
+                              }}
+                            >
+                              Settings
+                            </DropdownMenuItem>
+                            <DropdownMenuItem
+                              className="text-red-500"
+                              onClick={() => {
+                                setFolderToDelete(folder);
+                                setIsDeletingFolder(true);
+                              }}
+                            >
+                              Delete
+                            </DropdownMenuItem>
+                          </DropdownMenuContent>
+                        </DropdownMenu>
+                      </div>
+                    </div>
+                  ))}
+              </div>
+            </div>
+          )}
+
+          <div className="mt-6 grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
+            {foldersData?.folders
+              .filter((folder) => !folder.pinned)
+              .map((folder) => (
+                <div
+                  key={folder.id}
+                  className="border-border hover:border-muted-foreground/40 group relative flex flex-col rounded-lg border p-4 transition-all hover:shadow-sm"
+                >
+                  <div className="flex items-start justify-between">
+                    <button
+                      className="flex items-center space-x-2 text-left"
+                      onClick={() => navigateToFolder(folder.id)}
+                    >
+                      <FolderIcon className="text-documenso h-6 w-6" />
+                      <div>
+                        <h3 className="font-medium">{folder.name}</h3>
+                        <div className="mt-1 flex space-x-2 text-xs text-gray-500">
+                          <span>{folder._count.templates || 0} templates</span>
+                          <span>•</span>
+                          <span>{folder._count.subfolders} folders</span>
+                        </div>
+                      </div>
+                    </button>
+
+                    <DropdownMenu>
+                      <DropdownMenuTrigger asChild>
+                        <Button
+                          variant="ghost"
+                          size="sm"
+                          className="opacity-0 group-hover:opacity-100"
+                        >
+                          •••
+                        </Button>
+                      </DropdownMenuTrigger>
+                      <DropdownMenuContent align="end">
+                        <DropdownMenuItem
+                          onClick={() => {
+                            setFolderToMove(folder);
+                            setIsMovingFolder(true);
+                          }}
+                        >
+                          Move
+                        </DropdownMenuItem>
+                        <DropdownMenuItem
+                          onClick={() => {
+                            void pinFolder({ folderId: folder.id });
+                          }}
+                        >
+                          Pin
+                        </DropdownMenuItem>
+                        <DropdownMenuItem
+                          onClick={() => {
+                            setFolderToSettings(folder);
+                            setIsSettingsFolderOpen(true);
+                          }}
+                        >
+                          Settings
+                        </DropdownMenuItem>
+                        <DropdownMenuItem
+                          className="text-red-500"
+                          onClick={() => {
+                            setFolderToDelete(folder);
+                            setIsDeletingFolder(true);
+                          }}
+                        >
+                          Delete
+                        </DropdownMenuItem>
+                      </DropdownMenuContent>
+                    </DropdownMenu>
+                  </div>
+                </div>
+              ))}
+          </div>
+        </>
+      )}
+
+      <div className="relative mt-12">
+        <div className="flex flex-row items-center">
+          {team && (
+            <Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">
+              {team.avatarImageId && <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />}
+              <AvatarFallback className="text-muted-foreground text-xs">
+                {team.name.slice(0, 1)}
+              </AvatarFallback>
+            </Avatar>
+          )}
+
+          <h1 className="truncate text-2xl font-semibold md:text-3xl">
+            <Trans>Templates</Trans>
+          </h1>
+        </div>
+
+        <div className="mt-8">
+          {data && data.count === 0 ? (
+            <div className="text-muted-foreground/60 flex h-96 flex-col items-center justify-center gap-y-4">
+              <Bird className="h-12 w-12" strokeWidth={1.5} />
+
+              <div className="text-center">
+                <h3 className="text-lg font-semibold">
+                  <Trans>We're all empty</Trans>
+                </h3>
+
+                <p className="mt-2 max-w-[50ch]">
+                  <Trans>
+                    You have not yet created any templates. To create a template please upload one.
+                  </Trans>
+                </p>
+              </div>
+            </div>
+          ) : (
+            <TemplatesTable
+              data={data}
+              isLoading={isLoading}
+              isLoadingError={isLoadingError}
+              documentRootPath={documentRootPath}
+              templateRootPath={templateRootPath}
+            />
+          )}
+        </div>
+      </div>
+
+      <FolderMoveDialog
+        foldersData={foldersData?.folders}
+        folder={folderToMove}
+        isOpen={isMovingFolder}
+        onOpenChange={(open) => {
+          setIsMovingFolder(open);
+
+          if (!open) {
+            setFolderToMove(null);
+          }
+        }}
+      />
+
+      <FolderSettingsDialog
+        folder={folderToSettings}
+        isOpen={isSettingsFolderOpen}
+        onOpenChange={(open) => {
+          setIsSettingsFolderOpen(open);
+
+          if (!open) {
+            setFolderToSettings(null);
+          }
+        }}
+      />
+
+      <FolderDeleteDialog
+        folder={folderToDelete}
+        isOpen={isDeletingFolder}
+        onOpenChange={(open) => {
+          setIsDeletingFolder(open);
+
+          if (!open) {
+            setFolderToDelete(null);
+          }
+        }}
+      />
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.folders._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.folders._index.tsx
index 55c8ef207..0b1c311bf 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.folders._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.folders._index.tsx
@@ -1,5 +1,184 @@
-import TemplatesFoldersPage, { meta } from '~/routes/_authenticated+/templates.folders._index';
+import { useState } from 'react';
 
-export { meta };
+import { Trans } from '@lingui/react/macro';
+import { HomeIcon, Loader2 } from 'lucide-react';
+import { useNavigate } from 'react-router';
 
-export default TemplatesFoldersPage;
+import { FolderType } from '@documenso/lib/types/folder-type';
+import { formatTemplatesPath } from '@documenso/lib/utils/teams';
+import { trpc } from '@documenso/trpc/react';
+import { type TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';
+import { Button } from '@documenso/ui/primitives/button';
+
+import { TemplateFolderCreateDialog } from '~/components/dialogs/template-folder-create-dialog';
+import { TemplateFolderDeleteDialog } from '~/components/dialogs/template-folder-delete-dialog';
+import { TemplateFolderMoveDialog } from '~/components/dialogs/template-folder-move-dialog';
+import { TemplateFolderSettingsDialog } from '~/components/dialogs/template-folder-settings-dialog';
+import { FolderCard } from '~/components/general/folder/folder-card';
+import { useCurrentTeam } from '~/providers/team';
+import { appMetaTags } from '~/utils/meta';
+
+export function meta() {
+  return appMetaTags('Templates');
+}
+
+export default function TemplatesFoldersPage() {
+  const navigate = useNavigate();
+  const team = useCurrentTeam();
+
+  const [isMovingFolder, setIsMovingFolder] = useState(false);
+  const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);
+  const [isDeletingFolder, setIsDeletingFolder] = useState(false);
+  const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);
+  const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);
+  const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);
+
+  const { data: foldersData, isLoading: isFoldersLoading } = trpc.folder.getFolders.useQuery({
+    type: FolderType.TEMPLATE,
+    parentId: null,
+  });
+
+  const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();
+  const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();
+
+  const navigateToFolder = (folderId?: string | null) => {
+    const templatesPath = formatTemplatesPath(team.url);
+
+    if (folderId) {
+      void navigate(`${templatesPath}/f/${folderId}`);
+    } else {
+      void navigate(templatesPath);
+    }
+  };
+
+  return (
+    <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">
+      <div className="flex w-full items-center justify-between">
+        <div className="flex flex-1 items-center">
+          <Button
+            variant="ghost"
+            size="sm"
+            className="flex items-center space-x-2 pl-0 hover:bg-transparent"
+            onClick={() => navigateToFolder(null)}
+          >
+            <HomeIcon className="h-4 w-4" />
+            <span>Home</span>
+          </Button>
+        </div>
+
+        <div className="flex flex-col gap-y-4 sm:flex-row sm:justify-end sm:gap-x-4">
+          <TemplateFolderCreateDialog />
+        </div>
+      </div>
+
+      <div className="mt-6">
+        {isFoldersLoading ? (
+          <div className="mt- flex justify-center">
+            <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />
+          </div>
+        ) : (
+          <>
+            {foldersData?.folders?.some((folder) => folder.pinned) && (
+              <div className="mt-6">
+                <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
+                  {foldersData.folders
+                    .filter((folder) => folder.pinned)
+                    .map((folder) => (
+                      <FolderCard
+                        key={folder.id}
+                        folder={folder}
+                        onNavigate={navigateToFolder}
+                        onMove={(folder) => {
+                          setFolderToMove(folder);
+                          setIsMovingFolder(true);
+                        }}
+                        onPin={(folderId) => void pinFolder({ folderId })}
+                        onUnpin={(folderId) => void unpinFolder({ folderId })}
+                        onSettings={(folder) => {
+                          setFolderToSettings(folder);
+                          setIsSettingsFolderOpen(true);
+                        }}
+                        onDelete={(folder) => {
+                          setFolderToDelete(folder);
+                          setIsDeletingFolder(true);
+                        }}
+                      />
+                    ))}
+                </div>
+              </div>
+            )}
+
+            <div className="mt-12">
+              <h1 className="truncate text-2xl font-semibold md:text-3xl">
+                <Trans>All Folders</Trans>
+              </h1>
+
+              <div className="mt-6 grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
+                {foldersData?.folders
+                  .filter((folder) => !folder.pinned)
+                  .map((folder) => (
+                    <FolderCard
+                      key={folder.id}
+                      folder={folder}
+                      onNavigate={navigateToFolder}
+                      onMove={(folder) => {
+                        setFolderToMove(folder);
+                        setIsMovingFolder(true);
+                      }}
+                      onPin={(folderId) => void pinFolder({ folderId })}
+                      onUnpin={(folderId) => void unpinFolder({ folderId })}
+                      onSettings={(folder) => {
+                        setFolderToSettings(folder);
+                        setIsSettingsFolderOpen(true);
+                      }}
+                      onDelete={(folder) => {
+                        setFolderToDelete(folder);
+                        setIsDeletingFolder(true);
+                      }}
+                    />
+                  ))}
+              </div>
+            </div>
+          </>
+        )}
+      </div>
+
+      <TemplateFolderMoveDialog
+        foldersData={foldersData?.folders}
+        folder={folderToMove}
+        isOpen={isMovingFolder}
+        onOpenChange={(open: boolean) => {
+          setIsMovingFolder(open);
+
+          if (!open) {
+            setFolderToMove(null);
+          }
+        }}
+      />
+
+      <TemplateFolderSettingsDialog
+        folder={folderToSettings}
+        isOpen={isSettingsFolderOpen}
+        onOpenChange={(open: boolean) => {
+          setIsSettingsFolderOpen(open);
+
+          if (!open) {
+            setFolderToSettings(null);
+          }
+        }}
+      />
+
+      <TemplateFolderDeleteDialog
+        folder={folderToDelete}
+        isOpen={isDeletingFolder}
+        onOpenChange={(open: boolean) => {
+          setIsDeletingFolder(open);
+
+          if (!open) {
+            setFolderToDelete(null);
+          }
+        }}
+      />
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_authenticated+/templates.$id._index.tsx b/apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
deleted file mode 100644
index 9000938cf..000000000
--- a/apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+++ /dev/null
@@ -1,228 +0,0 @@
-import { Trans } from '@lingui/react/macro';
-import { DocumentSigningOrder, SigningStatus } from '@prisma/client';
-import { ChevronLeft, LucideEdit } from 'lucide-react';
-import { Link, redirect, useNavigate } from 'react-router';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
-import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
-import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';
-import { DocumentReadOnlyFields } from '@documenso/ui/components/document/document-read-only-fields';
-import { Button } from '@documenso/ui/primitives/button';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
-import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
-
-import { TemplateBulkSendDialog } from '~/components/dialogs/template-bulk-send-dialog';
-import { TemplateDirectLinkDialogWrapper } from '~/components/dialogs/template-direct-link-dialog-wrapper';
-import { TemplateUseDialog } from '~/components/dialogs/template-use-dialog';
-import { TemplateDirectLinkBadge } from '~/components/general/template/template-direct-link-badge';
-import { TemplatePageViewDocumentsTable } from '~/components/general/template/template-page-view-documents-table';
-import { TemplatePageViewInformation } from '~/components/general/template/template-page-view-information';
-import { TemplatePageViewRecentActivity } from '~/components/general/template/template-page-view-recent-activity';
-import { TemplatePageViewRecipients } from '~/components/general/template/template-page-view-recipients';
-import { TemplateType } from '~/components/general/template/template-type';
-import { TemplatesTableActionDropdown } from '~/components/tables/templates-table-action-dropdown';
-import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
-
-import type { Route } from './+types/templates.$id._index';
-
-export async function loader({ params, request }: Route.LoaderArgs) {
-  const { user } = await getSession(request);
-
-  let team: TGetTeamByUrlResponse | null = null;
-
-  if (params.teamUrl) {
-    team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });
-  }
-
-  const { id } = params;
-
-  const templateId = Number(id);
-  const templateRootPath = formatTemplatesPath(team?.url);
-  const documentRootPath = formatDocumentsPath(team?.url);
-
-  if (!templateId || Number.isNaN(templateId)) {
-    throw redirect(templateRootPath);
-  }
-
-  const template = await getTemplateById({
-    id: templateId,
-    userId: user.id,
-    teamId: team?.id,
-  }).catch(() => null);
-
-  if (!template || !template.templateDocumentData || (template?.teamId && !team?.url)) {
-    throw redirect(templateRootPath);
-  }
-
-  if (template.folderId) {
-    throw redirect(`${templateRootPath}/f/${template.folderId}/${templateId}`);
-  }
-
-  return superLoaderJson({
-    user,
-    team,
-    template,
-    templateRootPath,
-    documentRootPath,
-  });
-}
-
-export default function TemplatePage() {
-  const { user, team, template, templateRootPath, documentRootPath } =
-    useSuperLoaderData<typeof loader>();
-
-  const { templateDocumentData, fields, recipients, templateMeta } = template;
-
-  const navigate = useNavigate();
-
-  // Remap to fit the DocumentReadOnlyFields component.
-  const readOnlyFields = fields.map((field) => {
-    const recipient = recipients.find((recipient) => recipient.id === field.recipientId) || {
-      name: '',
-      email: '',
-      signingStatus: SigningStatus.NOT_SIGNED,
-    };
-
-    return {
-      ...field,
-      recipient,
-      signature: null,
-    };
-  });
-
-  const mockedDocumentMeta = templateMeta
-    ? {
-        ...templateMeta,
-        signingOrder: templateMeta.signingOrder || DocumentSigningOrder.SEQUENTIAL,
-        documentId: 0,
-      }
-    : undefined;
-
-  return (
-    <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
-      <Link to={templateRootPath} className="flex items-center text-[#7AC455] hover:opacity-80">
-        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
-        <Trans>Templates</Trans>
-      </Link>
-
-      <div className="flex flex-row justify-between truncate">
-        <div>
-          <h1
-            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-            title={template.title}
-          >
-            {template.title}
-          </h1>
-
-          <div className="mt-2.5 flex items-center">
-            <TemplateType inheritColor className="text-muted-foreground" type={template.type} />
-
-            {template.directLink?.token && (
-              <TemplateDirectLinkBadge
-                className="ml-4"
-                token={template.directLink.token}
-                enabled={template.directLink.enabled}
-              />
-            )}
-          </div>
-        </div>
-
-        <div className="mt-2 flex flex-row space-x-4 sm:mt-0 sm:self-end">
-          <TemplateDirectLinkDialogWrapper template={template} />
-
-          <TemplateBulkSendDialog templateId={template.id} recipients={template.recipients} />
-
-          <Button className="w-full" asChild>
-            <Link to={`${templateRootPath}/${template.id}/edit`}>
-              <LucideEdit className="mr-1.5 h-3.5 w-3.5" />
-              <Trans>Edit Template</Trans>
-            </Link>
-          </Button>
-        </div>
-      </div>
-
-      <div className="mt-6 grid w-full grid-cols-12 gap-8">
-        <Card
-          className="relative col-span-12 rounded-xl before:rounded-xl lg:col-span-6 xl:col-span-7"
-          gradient
-        >
-          <CardContent className="p-2">
-            <PDFViewer document={template} key={template.id} documentData={templateDocumentData} />
-          </CardContent>
-        </Card>
-
-        <DocumentReadOnlyFields
-          fields={readOnlyFields}
-          showFieldStatus={false}
-          showRecipientTooltip={true}
-          showRecipientColors={true}
-          recipientIds={recipients.map((recipient) => recipient.id)}
-          documentMeta={mockedDocumentMeta}
-        />
-
-        <div className="col-span-12 lg:col-span-6 xl:col-span-5">
-          <div className="space-y-6">
-            <section className="border-border bg-widget flex flex-col rounded-xl border pb-4 pt-6">
-              <div className="flex flex-row items-center justify-between px-4">
-                <h3 className="text-foreground text-2xl font-semibold">
-                  <Trans>Template</Trans>
-                </h3>
-
-                <div>
-                  <TemplatesTableActionDropdown
-                    row={template}
-                    teamId={team?.id}
-                    templateRootPath={templateRootPath}
-                    onDelete={async () => navigate(templateRootPath)}
-                    onMove={async ({ teamUrl, templateId }) =>
-                      navigate(`${formatTemplatesPath(teamUrl)}/${templateId}`)
-                    }
-                  />
-                </div>
-              </div>
-
-              <p className="text-muted-foreground mt-2 px-4 text-sm">
-                <Trans>Manage and view template</Trans>
-              </p>
-
-              <div className="mt-4 border-t px-4 pt-4">
-                <TemplateUseDialog
-                  templateId={template.id}
-                  templateSigningOrder={template.templateMeta?.signingOrder}
-                  recipients={template.recipients}
-                  documentRootPath={documentRootPath}
-                  trigger={
-                    <Button className="w-full">
-                      <Trans>Use</Trans>
-                    </Button>
-                  }
-                />
-              </div>
-            </section>
-
-            {/* Template information section. */}
-            <TemplatePageViewInformation template={template} userId={user.id} />
-
-            {/* Recipients section. */}
-            <TemplatePageViewRecipients template={template} templateRootPath={templateRootPath} />
-
-            {/* Recent activity section. */}
-            <TemplatePageViewRecentActivity
-              documentRootPath={documentRootPath}
-              templateId={template.id}
-            />
-          </div>
-        </div>
-      </div>
-
-      <div className="mt-16" id="documents">
-        <h1 className="mb-4 text-2xl font-bold">
-          <Trans>Documents created from template</Trans>
-        </h1>
-
-        <TemplatePageViewDocumentsTable templateId={template.id} />
-      </div>
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/templates.$id.edit.tsx b/apps/remix/app/routes/_authenticated+/templates.$id.edit.tsx
deleted file mode 100644
index b746b6ba5..000000000
--- a/apps/remix/app/routes/_authenticated+/templates.$id.edit.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import { Trans } from '@lingui/react/macro';
-import { ChevronLeft } from 'lucide-react';
-import { Link, redirect } from 'react-router';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
-import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
-import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
-import { formatTemplatesPath } from '@documenso/lib/utils/teams';
-
-import { LegacyFieldWarningPopover } from '~/components/general/legacy-field-warning-popover';
-import { TemplateDirectLinkBadge } from '~/components/general/template/template-direct-link-badge';
-import { TemplateEditForm } from '~/components/general/template/template-edit-form';
-import { TemplateType } from '~/components/general/template/template-type';
-import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
-
-import { TemplateDirectLinkDialogWrapper } from '../../components/dialogs/template-direct-link-dialog-wrapper';
-import type { Route } from './+types/templates.$id.edit';
-
-export async function loader({ params, request }: Route.LoaderArgs) {
-  const { user } = await getSession(request);
-
-  let team: TGetTeamByUrlResponse | null = null;
-
-  if (params.teamUrl) {
-    team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });
-  }
-
-  const { id } = params;
-
-  const templateId = Number(id);
-  const templateRootPath = formatTemplatesPath(team?.url);
-
-  if (!templateId || Number.isNaN(templateId)) {
-    throw redirect(templateRootPath);
-  }
-
-  const template = await getTemplateById({
-    id: templateId,
-    userId: user.id,
-    teamId: team?.id,
-  }).catch(() => null);
-
-  if (!template || !template.templateDocumentData) {
-    throw redirect(templateRootPath);
-  }
-
-  if (template.folderId) {
-    throw redirect(`${templateRootPath}/f/${template.folderId}/${templateId}/edit`);
-  }
-
-  const isTemplateEnterprise = await isUserEnterprise({
-    userId: user.id,
-    teamId: team?.id,
-  });
-
-  return superLoaderJson({
-    template: {
-      ...template,
-      folder: null,
-    },
-    isTemplateEnterprise,
-    templateRootPath,
-  });
-}
-
-export default function TemplateEditPage() {
-  const { template, isTemplateEnterprise, templateRootPath } = useSuperLoaderData<typeof loader>();
-
-  return (
-    <div className="mx-auto -mt-4 max-w-screen-xl px-4 md:px-8">
-      <div className="flex flex-col justify-between sm:flex-row">
-        <div>
-          <Link
-            to={
-              template.folderId
-                ? `${templateRootPath}/f/${template.folderId}/${template.id}`
-                : `${templateRootPath}/${template.id}`
-            }
-            className="flex items-center text-[#7AC455] hover:opacity-80"
-          >
-            <ChevronLeft className="mr-2 inline-block h-5 w-5" />
-            <Trans>Template</Trans>
-          </Link>
-
-          <h1
-            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-            title={template.title}
-          >
-            {template.title}
-          </h1>
-
-          <div className="mt-2.5 flex items-center">
-            <TemplateType inheritColor className="text-muted-foreground" type={template.type} />
-
-            {template.directLink?.token && (
-              <TemplateDirectLinkBadge
-                className="ml-4"
-                token={template.directLink.token}
-                enabled={template.directLink.enabled}
-              />
-            )}
-          </div>
-        </div>
-
-        <div className="mt-2 flex items-center gap-2 sm:mt-0 sm:self-end">
-          <TemplateDirectLinkDialogWrapper template={template} />
-
-          {template.useLegacyFieldInsertion && (
-            <div>
-              <LegacyFieldWarningPopover type="template" templateId={template.id} />
-            </div>
-          )}
-        </div>
-      </div>
-
-      <TemplateEditForm
-        className="mt-6"
-        initialTemplate={template}
-        templateRootPath={templateRootPath}
-        isEnterprise={isTemplateEnterprise}
-      />
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/templates._index.tsx b/apps/remix/app/routes/_authenticated+/templates._index.tsx
deleted file mode 100644
index 649620173..000000000
--- a/apps/remix/app/routes/_authenticated+/templates._index.tsx
+++ /dev/null
@@ -1,292 +0,0 @@
-import { useEffect, useState } from 'react';
-
-import { Trans } from '@lingui/react/macro';
-import { Bird, FolderIcon, HomeIcon, Loader2 } from 'lucide-react';
-import { useNavigate, useSearchParams } from 'react-router';
-
-import { FolderType } from '@documenso/lib/types/folder-type';
-import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
-import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';
-import { trpc } from '@documenso/trpc/react';
-import type { TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';
-import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
-import { Button } from '@documenso/ui/primitives/button';
-
-import { TemplateCreateDialog } from '~/components/dialogs/template-create-dialog';
-import { TemplateFolderCreateDialog } from '~/components/dialogs/template-folder-create-dialog';
-import { TemplateFolderDeleteDialog } from '~/components/dialogs/template-folder-delete-dialog';
-import { TemplateFolderMoveDialog } from '~/components/dialogs/template-folder-move-dialog';
-import { TemplateFolderSettingsDialog } from '~/components/dialogs/template-folder-settings-dialog';
-import { FolderCard } from '~/components/general/folder/folder-card';
-import { TemplatesTable } from '~/components/tables/templates-table';
-import { useOptionalCurrentTeam } from '~/providers/team';
-import { appMetaTags } from '~/utils/meta';
-
-export function meta() {
-  return appMetaTags('Templates');
-}
-
-export default function TemplatesPage() {
-  const navigate = useNavigate();
-  const [searchParams] = useSearchParams();
-
-  const [isMovingFolder, setIsMovingFolder] = useState(false);
-  const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);
-  const [isDeletingFolder, setIsDeletingFolder] = useState(false);
-  const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);
-  const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);
-  const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);
-
-  const team = useOptionalCurrentTeam();
-
-  const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();
-  const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();
-
-  const page = Number(searchParams.get('page')) || 1;
-  const perPage = Number(searchParams.get('perPage')) || 10;
-
-  const documentRootPath = formatDocumentsPath(team?.url);
-  const templateRootPath = formatTemplatesPath(team?.url);
-
-  const { data, isLoading, isLoadingError, refetch } = trpc.template.findTemplates.useQuery({
-    page: page,
-    perPage: perPage,
-  });
-
-  const {
-    data: foldersData,
-    isLoading: isFoldersLoading,
-    refetch: refetchFolders,
-  } = trpc.folder.getFolders.useQuery({
-    type: FolderType.TEMPLATE,
-    parentId: null,
-  });
-
-  useEffect(() => {
-    void refetch();
-    void refetchFolders();
-  }, [team?.url]);
-
-  const navigateToFolder = (folderId?: string | null) => {
-    const templatesPath = formatTemplatesPath(team?.url);
-
-    if (folderId) {
-      void navigate(`${templatesPath}/f/${folderId}`);
-    } else {
-      void navigate(templatesPath);
-    }
-  };
-
-  const handleNavigate = (folderId: string) => {
-    navigateToFolder(folderId);
-  };
-
-  const handleMove = (folder: TFolderWithSubfolders) => {
-    setFolderToMove(folder);
-    setIsMovingFolder(true);
-  };
-
-  const handlePin = (folderId: string) => {
-    void pinFolder({ folderId });
-  };
-
-  const handleUnpin = (folderId: string) => {
-    void unpinFolder({ folderId });
-  };
-
-  const handleSettings = (folder: TFolderWithSubfolders) => {
-    setFolderToSettings(folder);
-    setIsSettingsFolderOpen(true);
-  };
-
-  const handleDelete = (folder: TFolderWithSubfolders) => {
-    setFolderToDelete(folder);
-    setIsDeletingFolder(true);
-  };
-
-  const handleViewAllFolders = () => {
-    void navigate(`${formatTemplatesPath(team?.url)}/folders`);
-  };
-
-  return (
-    <div className="mx-auto max-w-screen-xl px-4 md:px-8">
-      <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
-        <div className="flex flex-1 items-center">
-          <Button
-            variant="ghost"
-            size="sm"
-            className="flex items-center space-x-2 pl-0 hover:bg-transparent"
-            onClick={() => navigateToFolder(null)}
-          >
-            <HomeIcon className="h-4 w-4" />
-            <span>Home</span>
-          </Button>
-
-          {foldersData?.breadcrumbs.map((folder) => (
-            <div key={folder.id} className="flex items-center space-x-2">
-              <span>/</span>
-              <Button
-                variant="ghost"
-                size="sm"
-                className="flex items-center space-x-2 pl-1 hover:bg-transparent"
-                onClick={() => navigateToFolder(folder.id)}
-              >
-                <FolderIcon className="h-4 w-4" />
-                <span>{folder.name}</span>
-              </Button>
-            </div>
-          ))}
-        </div>
-
-        <div className="flex gap-4 sm:flex-row sm:justify-end">
-          <TemplateCreateDialog templateRootPath={templateRootPath} />
-          <TemplateFolderCreateDialog />
-        </div>
-      </div>
-
-      {isFoldersLoading ? (
-        <div className="mt-6 flex justify-center">
-          <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />
-        </div>
-      ) : (
-        <>
-          {foldersData?.folders && foldersData.folders.some((folder) => folder.pinned) && (
-            <div className="mt-6">
-              <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
-                {foldersData.folders
-                  .filter((folder) => folder.pinned)
-                  .map((folder) => (
-                    <FolderCard
-                      key={folder.id}
-                      folder={folder}
-                      onNavigate={handleNavigate}
-                      onMove={handleMove}
-                      onPin={handlePin}
-                      onUnpin={handleUnpin}
-                      onSettings={handleSettings}
-                      onDelete={handleDelete}
-                    />
-                  ))}
-              </div>
-            </div>
-          )}
-
-          <div className="mt-6">
-            <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
-              {foldersData?.folders
-                ?.filter((folder) => !folder.pinned)
-                .slice(0, 12)
-                .map((folder) => (
-                  <FolderCard
-                    key={folder.id}
-                    folder={folder}
-                    onNavigate={handleNavigate}
-                    onMove={handleMove}
-                    onPin={handlePin}
-                    onUnpin={handleUnpin}
-                    onSettings={handleSettings}
-                    onDelete={handleDelete}
-                  />
-                ))}
-            </div>
-
-            <div className="mt-6 flex items-center justify-center">
-              {foldersData && foldersData.folders?.length > 12 && (
-                <Button
-                  variant="link"
-                  size="sm"
-                  className="text-muted-foreground hover:text-foreground"
-                  onClick={() => void handleViewAllFolders()}
-                >
-                  View all folders
-                </Button>
-              )}
-            </div>
-          </div>
-        </>
-      )}
-
-      <div className="mt-12">
-        <div className="flex flex-row items-center">
-          {team && (
-            <Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">
-              {team.avatarImageId && <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />}
-              <AvatarFallback className="text-muted-foreground text-xs">
-                {team.name.slice(0, 1)}
-              </AvatarFallback>
-            </Avatar>
-          )}
-
-          <h1 className="truncate text-2xl font-semibold md:text-3xl">
-            <Trans>Templates</Trans>
-          </h1>
-        </div>
-
-        <div className="mt-8">
-          {data && data.count === 0 ? (
-            <div className="text-muted-foreground/60 flex h-96 flex-col items-center justify-center gap-y-4">
-              <Bird className="h-12 w-12" strokeWidth={1.5} />
-
-              <div className="text-center">
-                <h3 className="text-lg font-semibold">
-                  <Trans>We're all empty</Trans>
-                </h3>
-
-                <p className="mt-2 max-w-[50ch]">
-                  <Trans>
-                    You have not yet created any templates. To create a template please upload one.
-                  </Trans>
-                </p>
-              </div>
-            </div>
-          ) : (
-            <TemplatesTable
-              data={data}
-              isLoading={isLoading}
-              isLoadingError={isLoadingError}
-              documentRootPath={documentRootPath}
-              templateRootPath={templateRootPath}
-            />
-          )}
-        </div>
-      </div>
-
-      <TemplateFolderMoveDialog
-        foldersData={foldersData?.folders}
-        folder={folderToMove}
-        isOpen={isMovingFolder}
-        onOpenChange={(open) => {
-          setIsMovingFolder(open);
-
-          if (!open) {
-            setFolderToMove(null);
-          }
-        }}
-      />
-
-      <TemplateFolderSettingsDialog
-        folder={folderToSettings}
-        isOpen={isSettingsFolderOpen}
-        onOpenChange={(open) => {
-          setIsSettingsFolderOpen(open);
-
-          if (!open) {
-            setFolderToSettings(null);
-          }
-        }}
-      />
-
-      <TemplateFolderDeleteDialog
-        folder={folderToDelete}
-        isOpen={isDeletingFolder}
-        onOpenChange={(open) => {
-          setIsDeletingFolder(open);
-
-          if (!open) {
-            setFolderToDelete(null);
-          }
-        }}
-      />
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx b/apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
deleted file mode 100644
index 9aa257824..000000000
--- a/apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import { Trans } from '@lingui/react/macro';
-import { DocumentSigningOrder, SigningStatus } from '@prisma/client';
-import { ChevronLeft, LucideEdit } from 'lucide-react';
-import { Link, redirect, useNavigate } from 'react-router';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
-import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
-import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';
-import { DocumentReadOnlyFields } from '@documenso/ui/components/document/document-read-only-fields';
-import { Button } from '@documenso/ui/primitives/button';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
-import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
-
-import { TemplateBulkSendDialog } from '~/components/dialogs/template-bulk-send-dialog';
-import { TemplateDirectLinkDialogWrapper } from '~/components/dialogs/template-direct-link-dialog-wrapper';
-import { TemplateUseDialog } from '~/components/dialogs/template-use-dialog';
-import { TemplateDirectLinkBadge } from '~/components/general/template/template-direct-link-badge';
-import { TemplatePageViewDocumentsTable } from '~/components/general/template/template-page-view-documents-table';
-import { TemplatePageViewInformation } from '~/components/general/template/template-page-view-information';
-import { TemplatePageViewRecentActivity } from '~/components/general/template/template-page-view-recent-activity';
-import { TemplatePageViewRecipients } from '~/components/general/template/template-page-view-recipients';
-import { TemplateType } from '~/components/general/template/template-type';
-import { TemplatesTableActionDropdown } from '~/components/tables/templates-table-action-dropdown';
-import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
-
-import type { Route } from './+types/templates.$id._index';
-
-export async function loader({ params, request }: Route.LoaderArgs) {
-  const { user } = await getSession(request);
-
-  let team: TGetTeamByUrlResponse | null = null;
-
-  if (params.teamUrl) {
-    team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });
-  }
-
-  const { id, folderId } = params;
-
-  const templateId = Number(id);
-  const templateRootPath = formatTemplatesPath(team?.url);
-  const documentRootPath = formatDocumentsPath(team?.url);
-
-  if (!templateId || Number.isNaN(templateId)) {
-    throw redirect(folderId ? `${documentRootPath}/f/${folderId}` : documentRootPath);
-  }
-
-  const template = await getTemplateById({
-    id: templateId,
-    userId: user.id,
-    teamId: team?.id,
-    folderId,
-  }).catch(() => null);
-
-  if (!template || !template.templateDocumentData || (template?.teamId && !team?.url)) {
-    throw redirect(folderId ? `${templateRootPath}/f/${folderId}` : templateRootPath);
-  }
-
-  if (!template.folderId) {
-    throw redirect(`${templateRootPath}/${templateId}`);
-  }
-
-  if (template.folderId !== folderId) {
-    throw redirect(`${templateRootPath}/f/${template.folderId}/${templateId}`);
-  }
-
-  return superLoaderJson({
-    user,
-    team,
-    template,
-    templateRootPath,
-    documentRootPath,
-  });
-}
-
-export default function TemplatePage() {
-  const { user, team, template, templateRootPath, documentRootPath } =
-    useSuperLoaderData<typeof loader>();
-
-  const { templateDocumentData, fields, recipients, templateMeta } = template;
-
-  const navigate = useNavigate();
-
-  // Remap to fit the DocumentReadOnlyFields component.
-  const readOnlyFields = fields.map((field) => {
-    const recipient = recipients.find((recipient) => recipient.id === field.recipientId) || {
-      name: '',
-      email: '',
-      signingStatus: SigningStatus.NOT_SIGNED,
-    };
-
-    return {
-      ...field,
-      recipient,
-      signature: null,
-    };
-  });
-
-  const mockedDocumentMeta = templateMeta
-    ? {
-        ...templateMeta,
-        signingOrder: templateMeta.signingOrder || DocumentSigningOrder.SEQUENTIAL,
-        documentId: 0,
-      }
-    : undefined;
-
-  return (
-    <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
-      <Link to={templateRootPath} className="flex items-center text-[#7AC455] hover:opacity-80">
-        <ChevronLeft className="mr-2 inline-block h-5 w-5" />
-        <Trans>Templates</Trans>
-      </Link>
-
-      <div className="flex flex-row justify-between truncate">
-        <div>
-          <h1
-            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-            title={template.title}
-          >
-            {template.title}
-          </h1>
-
-          <div className="mt-2.5 flex items-center">
-            <TemplateType inheritColor className="text-muted-foreground" type={template.type} />
-
-            {template.directLink?.token && (
-              <TemplateDirectLinkBadge
-                className="ml-4"
-                token={template.directLink.token}
-                enabled={template.directLink.enabled}
-              />
-            )}
-          </div>
-        </div>
-
-        <div className="mt-2 flex flex-row space-x-4 sm:mt-0 sm:self-end">
-          <TemplateDirectLinkDialogWrapper template={template} />
-
-          <TemplateBulkSendDialog templateId={template.id} recipients={template.recipients} />
-
-          <Button className="w-full" asChild>
-            <Link to={`${templateRootPath}/${template.id}/edit`}>
-              <LucideEdit className="mr-1.5 h-3.5 w-3.5" />
-              <Trans>Edit Template</Trans>
-            </Link>
-          </Button>
-        </div>
-      </div>
-
-      <div className="mt-6 grid w-full grid-cols-12 gap-8">
-        <Card
-          className="relative col-span-12 rounded-xl before:rounded-xl lg:col-span-6 xl:col-span-7"
-          gradient
-        >
-          <CardContent className="p-2">
-            <PDFViewer document={template} key={template.id} documentData={templateDocumentData} />
-          </CardContent>
-        </Card>
-
-        <DocumentReadOnlyFields
-          fields={readOnlyFields}
-          showFieldStatus={false}
-          documentMeta={mockedDocumentMeta}
-        />
-
-        <div className="col-span-12 lg:col-span-6 xl:col-span-5">
-          <div className="space-y-6">
-            <section className="border-border bg-widget flex flex-col rounded-xl border pb-4 pt-6">
-              <div className="flex flex-row items-center justify-between px-4">
-                <h3 className="text-foreground text-2xl font-semibold">
-                  <Trans>Template</Trans>
-                </h3>
-
-                <div>
-                  <TemplatesTableActionDropdown
-                    row={template}
-                    teamId={team?.id}
-                    templateRootPath={templateRootPath}
-                    onDelete={async () => navigate(templateRootPath)}
-                    onMove={async ({ teamUrl, templateId }) =>
-                      navigate(`${formatTemplatesPath(teamUrl)}/${templateId}`)
-                    }
-                  />
-                </div>
-              </div>
-
-              <p className="text-muted-foreground mt-2 px-4 text-sm">
-                <Trans>Manage and view template</Trans>
-              </p>
-
-              <div className="mt-4 border-t px-4 pt-4">
-                <TemplateUseDialog
-                  templateId={template.id}
-                  templateSigningOrder={template.templateMeta?.signingOrder}
-                  recipients={template.recipients}
-                  documentRootPath={documentRootPath}
-                  trigger={
-                    <Button className="w-full">
-                      <Trans>Use</Trans>
-                    </Button>
-                  }
-                />
-              </div>
-            </section>
-
-            {/* Template information section. */}
-            <TemplatePageViewInformation template={template} userId={user.id} />
-
-            {/* Recipients section. */}
-            <TemplatePageViewRecipients template={template} templateRootPath={templateRootPath} />
-
-            {/* Recent activity section. */}
-            <TemplatePageViewRecentActivity
-              documentRootPath={documentRootPath}
-              templateId={template.id}
-            />
-          </div>
-        </div>
-      </div>
-
-      <div className="mt-16" id="documents">
-        <h1 className="mb-4 text-2xl font-bold">
-          <Trans>Documents created from template</Trans>
-        </h1>
-
-        <TemplatePageViewDocumentsTable templateId={template.id} />
-      </div>
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id.edit.tsx b/apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id.edit.tsx
deleted file mode 100644
index 2c24f0df7..000000000
--- a/apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id.edit.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import { Trans } from '@lingui/react/macro';
-import { ChevronLeft } from 'lucide-react';
-import { Link, redirect } from 'react-router';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
-import { type TGetTeamByUrlResponse, getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
-import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
-import { formatTemplatesPath } from '@documenso/lib/utils/teams';
-
-import { TemplateDirectLinkBadge } from '~/components/general/template/template-direct-link-badge';
-import { TemplateEditForm } from '~/components/general/template/template-edit-form';
-import { TemplateType } from '~/components/general/template/template-type';
-import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';
-
-import { TemplateDirectLinkDialogWrapper } from '../../components/dialogs/template-direct-link-dialog-wrapper';
-import type { Route } from './+types/templates.$id.edit';
-
-export async function loader({ params, request }: Route.LoaderArgs) {
-  const { user } = await getSession(request);
-
-  let team: TGetTeamByUrlResponse | null = null;
-
-  if (params.teamUrl) {
-    team = await getTeamByUrl({ userId: user.id, teamUrl: params.teamUrl });
-  }
-
-  const { id } = params;
-
-  const templateId = Number(id);
-  const templateRootPath = formatTemplatesPath(team?.url);
-
-  if (!templateId || Number.isNaN(templateId)) {
-    throw redirect(templateRootPath);
-  }
-
-  const template = await getTemplateById({
-    id: templateId,
-    userId: user.id,
-    teamId: team?.id,
-  }).catch(() => null);
-
-  if (!template || !template.templateDocumentData) {
-    throw redirect(templateRootPath);
-  }
-
-  if (!template.folderId) {
-    throw redirect(`${templateRootPath}/${templateId}/edit`);
-  }
-
-  if (template.folderId !== params.folderId) {
-    throw redirect(`${templateRootPath}/f/${template.folderId}/${templateId}/edit`);
-  }
-
-  const isTemplateEnterprise = await isUserEnterprise({
-    userId: user.id,
-    teamId: team?.id,
-  });
-
-  return superLoaderJson({
-    template: {
-      ...template,
-      folder: null,
-    },
-    isTemplateEnterprise,
-    templateRootPath,
-  });
-}
-
-export default function TemplateEditPage() {
-  const { template, isTemplateEnterprise, templateRootPath } = useSuperLoaderData<typeof loader>();
-
-  return (
-    <div className="mx-auto -mt-4 max-w-screen-xl px-4 md:px-8">
-      <div className="flex flex-col justify-between sm:flex-row">
-        <div>
-          <Link
-            to={
-              template.folderId
-                ? `${templateRootPath}/f/${template.folderId}/${template.id}`
-                : `${templateRootPath}/${template.id}`
-            }
-            className="flex items-center text-[#7AC455] hover:opacity-80"
-          >
-            <ChevronLeft className="mr-2 inline-block h-5 w-5" />
-            <Trans>Template</Trans>
-          </Link>
-
-          <h1
-            className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
-            title={template.title}
-          >
-            {template.title}
-          </h1>
-
-          <div className="mt-2.5 flex items-center">
-            <TemplateType inheritColor className="text-muted-foreground" type={template.type} />
-
-            {template.directLink?.token && (
-              <TemplateDirectLinkBadge
-                className="ml-4"
-                token={template.directLink.token}
-                enabled={template.directLink.enabled}
-              />
-            )}
-          </div>
-        </div>
-
-        <div className="mt-2 sm:mt-0 sm:self-end">
-          <TemplateDirectLinkDialogWrapper template={template} />
-        </div>
-      </div>
-
-      <TemplateEditForm
-        className="mt-6"
-        initialTemplate={template}
-        templateRootPath={templateRootPath}
-        isEnterprise={isTemplateEnterprise}
-      />
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx b/apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
deleted file mode 100644
index f341e7a83..000000000
--- a/apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
+++ /dev/null
@@ -1,369 +0,0 @@
-import { useEffect, useState } from 'react';
-
-import { Trans } from '@lingui/react/macro';
-import { Bird, FolderIcon, HomeIcon, Loader2, PinIcon } from 'lucide-react';
-import { useNavigate, useParams, useSearchParams } from 'react-router';
-
-import { FolderType } from '@documenso/lib/types/folder-type';
-import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
-import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';
-import { trpc } from '@documenso/trpc/react';
-import type { TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';
-import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from '@documenso/ui/primitives/dropdown-menu';
-
-import { FolderDeleteDialog } from '~/components/dialogs/folder-delete-dialog';
-import { FolderMoveDialog } from '~/components/dialogs/folder-move-dialog';
-import { FolderSettingsDialog } from '~/components/dialogs/folder-settings-dialog';
-import { TemplateCreateDialog } from '~/components/dialogs/template-create-dialog';
-import { TemplateFolderCreateDialog } from '~/components/dialogs/template-folder-create-dialog';
-import { TemplatesTable } from '~/components/tables/templates-table';
-import { useOptionalCurrentTeam } from '~/providers/team';
-import { appMetaTags } from '~/utils/meta';
-
-export function meta() {
-  return appMetaTags('Templates');
-}
-
-export default function TemplatesPage() {
-  const [searchParams] = useSearchParams();
-  const { folderId } = useParams();
-  const navigate = useNavigate();
-
-  const team = useOptionalCurrentTeam();
-
-  const page = Number(searchParams.get('page')) || 1;
-  const perPage = Number(searchParams.get('perPage')) || 10;
-
-  const documentRootPath = formatDocumentsPath(team?.url);
-  const templateRootPath = formatTemplatesPath(team?.url);
-
-  const { data, isLoading, isLoadingError, refetch } = trpc.template.findTemplates.useQuery({
-    page: page,
-    perPage: perPage,
-    folderId: folderId,
-  });
-
-  const {
-    data: foldersData,
-    isLoading: isFoldersLoading,
-    refetch: refetchFolders,
-  } = trpc.folder.getFolders.useQuery({
-    parentId: folderId,
-    type: FolderType.TEMPLATE,
-  });
-
-  const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();
-  const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();
-
-  const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);
-  const [isMovingFolder, setIsMovingFolder] = useState(false);
-  const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);
-  const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);
-  const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);
-  const [isDeletingFolder, setIsDeletingFolder] = useState(false);
-
-  useEffect(() => {
-    void refetch();
-    void refetchFolders();
-  }, [team?.url]);
-
-  const navigateToFolder = (folderId?: string) => {
-    const templatesPath = formatTemplatesPath(team?.url);
-
-    if (folderId) {
-      void navigate(`${templatesPath}/f/${folderId}`);
-    } else {
-      void navigate(templatesPath);
-    }
-  };
-
-  return (
-    <div className="mx-auto max-w-screen-xl px-4 md:px-8">
-      <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
-        <div className="flex flex-1 items-center">
-          <Button
-            variant="ghost"
-            size="sm"
-            className="flex items-center space-x-2 pl-0 hover:bg-transparent"
-            onClick={() => navigateToFolder()}
-          >
-            <HomeIcon className="h-4 w-4" />
-            <span>Home</span>
-          </Button>
-
-          {foldersData?.breadcrumbs.map((folder) => (
-            <div key={folder.id} className="flex items-center space-x-2">
-              <span>/</span>
-              <Button
-                variant="ghost"
-                size="sm"
-                className="flex items-center space-x-2 pl-1 hover:bg-transparent"
-                onClick={() => navigateToFolder(folder.id)}
-              >
-                <FolderIcon className="h-4 w-4" />
-                <span>{folder.name}</span>
-              </Button>
-            </div>
-          ))}
-        </div>
-
-        <div className="flex gap-4 sm:flex-row sm:justify-end">
-          <TemplateFolderCreateDialog />
-          <TemplateCreateDialog templateRootPath={templateRootPath} folderId={folderId} />
-        </div>
-      </div>
-
-      {isFoldersLoading ? (
-        <div className="mt-6 flex justify-center">
-          <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />
-        </div>
-      ) : (
-        <>
-          {foldersData?.folders.some((folder) => folder.pinned) && (
-            <div className="mt-6">
-              <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
-                {foldersData?.folders
-                  .filter((folder) => folder.pinned)
-                  .map((folder) => (
-                    <div
-                      key={folder.id}
-                      className="border-border hover:border-muted-foreground/40 group relative flex flex-col rounded-lg border p-4 transition-all hover:shadow-sm"
-                    >
-                      <div className="flex items-start justify-between">
-                        <button
-                          className="flex items-center space-x-2 text-left"
-                          onClick={() => navigateToFolder(folder.id)}
-                        >
-                          <FolderIcon className="text-documenso h-6 w-6" />
-                          <div>
-                            <div className="flex items-center gap-2">
-                              <h3 className="font-medium">{folder.name}</h3>
-                              <PinIcon className="text-documenso h-3 w-3" />
-                            </div>
-                            <div className="mt-1 flex space-x-2 text-xs text-gray-500">
-                              <span>{folder._count.templates || 0} templates</span>
-                              <span>•</span>
-                              <span>{folder._count.subfolders} folders</span>
-                            </div>
-                          </div>
-                        </button>
-
-                        <DropdownMenu>
-                          <DropdownMenuTrigger asChild>
-                            <Button
-                              variant="ghost"
-                              size="sm"
-                              className="opacity-0 group-hover:opacity-100"
-                            >
-                              •••
-                            </Button>
-                          </DropdownMenuTrigger>
-                          <DropdownMenuContent align="end">
-                            <DropdownMenuItem
-                              onClick={() => {
-                                setFolderToMove(folder);
-                                setIsMovingFolder(true);
-                              }}
-                            >
-                              Move
-                            </DropdownMenuItem>
-                            <DropdownMenuItem
-                              onClick={() => {
-                                void unpinFolder({ folderId: folder.id });
-                              }}
-                            >
-                              Unpin
-                            </DropdownMenuItem>
-                            <DropdownMenuItem
-                              onClick={() => {
-                                setFolderToSettings(folder);
-                                setIsSettingsFolderOpen(true);
-                              }}
-                            >
-                              Settings
-                            </DropdownMenuItem>
-                            <DropdownMenuItem
-                              className="text-red-500"
-                              onClick={() => {
-                                setFolderToDelete(folder);
-                                setIsDeletingFolder(true);
-                              }}
-                            >
-                              Delete
-                            </DropdownMenuItem>
-                          </DropdownMenuContent>
-                        </DropdownMenu>
-                      </div>
-                    </div>
-                  ))}
-              </div>
-            </div>
-          )}
-
-          <div className="mt-6 grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
-            {foldersData?.folders
-              .filter((folder) => !folder.pinned)
-              .map((folder) => (
-                <div
-                  key={folder.id}
-                  className="border-border hover:border-muted-foreground/40 group relative flex flex-col rounded-lg border p-4 transition-all hover:shadow-sm"
-                >
-                  <div className="flex items-start justify-between">
-                    <button
-                      className="flex items-center space-x-2 text-left"
-                      onClick={() => navigateToFolder(folder.id)}
-                    >
-                      <FolderIcon className="text-documenso h-6 w-6" />
-                      <div>
-                        <h3 className="font-medium">{folder.name}</h3>
-                        <div className="mt-1 flex space-x-2 text-xs text-gray-500">
-                          <span>{folder._count.templates || 0} templates</span>
-                          <span>•</span>
-                          <span>{folder._count.subfolders} folders</span>
-                        </div>
-                      </div>
-                    </button>
-
-                    <DropdownMenu>
-                      <DropdownMenuTrigger asChild>
-                        <Button
-                          variant="ghost"
-                          size="sm"
-                          className="opacity-0 group-hover:opacity-100"
-                        >
-                          •••
-                        </Button>
-                      </DropdownMenuTrigger>
-                      <DropdownMenuContent align="end">
-                        <DropdownMenuItem
-                          onClick={() => {
-                            setFolderToMove(folder);
-                            setIsMovingFolder(true);
-                          }}
-                        >
-                          Move
-                        </DropdownMenuItem>
-                        <DropdownMenuItem
-                          onClick={() => {
-                            void pinFolder({ folderId: folder.id });
-                          }}
-                        >
-                          Pin
-                        </DropdownMenuItem>
-                        <DropdownMenuItem
-                          onClick={() => {
-                            setFolderToSettings(folder);
-                            setIsSettingsFolderOpen(true);
-                          }}
-                        >
-                          Settings
-                        </DropdownMenuItem>
-                        <DropdownMenuItem
-                          className="text-red-500"
-                          onClick={() => {
-                            setFolderToDelete(folder);
-                            setIsDeletingFolder(true);
-                          }}
-                        >
-                          Delete
-                        </DropdownMenuItem>
-                      </DropdownMenuContent>
-                    </DropdownMenu>
-                  </div>
-                </div>
-              ))}
-          </div>
-        </>
-      )}
-
-      <div className="relative mt-12">
-        <div className="flex flex-row items-center">
-          {team && (
-            <Avatar className="dark:border-border mr-3 h-12 w-12 border-2 border-solid border-white">
-              {team.avatarImageId && <AvatarImage src={formatAvatarUrl(team.avatarImageId)} />}
-              <AvatarFallback className="text-muted-foreground text-xs">
-                {team.name.slice(0, 1)}
-              </AvatarFallback>
-            </Avatar>
-          )}
-
-          <h1 className="truncate text-2xl font-semibold md:text-3xl">
-            <Trans>Templates</Trans>
-          </h1>
-        </div>
-
-        <div className="mt-8">
-          {data && data.count === 0 ? (
-            <div className="text-muted-foreground/60 flex h-96 flex-col items-center justify-center gap-y-4">
-              <Bird className="h-12 w-12" strokeWidth={1.5} />
-
-              <div className="text-center">
-                <h3 className="text-lg font-semibold">
-                  <Trans>We're all empty</Trans>
-                </h3>
-
-                <p className="mt-2 max-w-[50ch]">
-                  <Trans>
-                    You have not yet created any templates. To create a template please upload one.
-                  </Trans>
-                </p>
-              </div>
-            </div>
-          ) : (
-            <TemplatesTable
-              data={data}
-              isLoading={isLoading}
-              isLoadingError={isLoadingError}
-              documentRootPath={documentRootPath}
-              templateRootPath={templateRootPath}
-            />
-          )}
-        </div>
-      </div>
-
-      <FolderMoveDialog
-        foldersData={foldersData?.folders}
-        folder={folderToMove}
-        isOpen={isMovingFolder}
-        onOpenChange={(open) => {
-          setIsMovingFolder(open);
-
-          if (!open) {
-            setFolderToMove(null);
-          }
-        }}
-      />
-
-      <FolderSettingsDialog
-        folder={folderToSettings}
-        isOpen={isSettingsFolderOpen}
-        onOpenChange={(open) => {
-          setIsSettingsFolderOpen(open);
-
-          if (!open) {
-            setFolderToSettings(null);
-          }
-        }}
-      />
-
-      <FolderDeleteDialog
-        folder={folderToDelete}
-        isOpen={isDeletingFolder}
-        onOpenChange={(open) => {
-          setIsDeletingFolder(open);
-
-          if (!open) {
-            setFolderToDelete(null);
-          }
-        }}
-      />
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_authenticated+/templates.folders._index.tsx b/apps/remix/app/routes/_authenticated+/templates.folders._index.tsx
deleted file mode 100644
index b58194098..000000000
--- a/apps/remix/app/routes/_authenticated+/templates.folders._index.tsx
+++ /dev/null
@@ -1,181 +0,0 @@
-import { useState } from 'react';
-
-import { Trans } from '@lingui/react/macro';
-import { HomeIcon, Loader2 } from 'lucide-react';
-import { useNavigate } from 'react-router';
-
-import { FolderType } from '@documenso/lib/types/folder-type';
-import { formatTemplatesPath } from '@documenso/lib/utils/teams';
-import { trpc } from '@documenso/trpc/react';
-import { type TFolderWithSubfolders } from '@documenso/trpc/server/folder-router/schema';
-import { Button } from '@documenso/ui/primitives/button';
-
-import { TemplateFolderCreateDialog } from '~/components/dialogs/template-folder-create-dialog';
-import { TemplateFolderDeleteDialog } from '~/components/dialogs/template-folder-delete-dialog';
-import { TemplateFolderMoveDialog } from '~/components/dialogs/template-folder-move-dialog';
-import { TemplateFolderSettingsDialog } from '~/components/dialogs/template-folder-settings-dialog';
-import { FolderCard } from '~/components/general/folder/folder-card';
-import { appMetaTags } from '~/utils/meta';
-
-export function meta() {
-  return appMetaTags('Templates');
-}
-
-export default function TemplatesFoldersPage() {
-  const navigate = useNavigate();
-  const [isMovingFolder, setIsMovingFolder] = useState(false);
-  const [folderToMove, setFolderToMove] = useState<TFolderWithSubfolders | null>(null);
-  const [isDeletingFolder, setIsDeletingFolder] = useState(false);
-  const [folderToDelete, setFolderToDelete] = useState<TFolderWithSubfolders | null>(null);
-  const [isSettingsFolderOpen, setIsSettingsFolderOpen] = useState(false);
-  const [folderToSettings, setFolderToSettings] = useState<TFolderWithSubfolders | null>(null);
-
-  const { data: foldersData, isLoading: isFoldersLoading } = trpc.folder.getFolders.useQuery({
-    type: FolderType.TEMPLATE,
-    parentId: null,
-  });
-
-  const { mutateAsync: pinFolder } = trpc.folder.pinFolder.useMutation();
-  const { mutateAsync: unpinFolder } = trpc.folder.unpinFolder.useMutation();
-
-  const navigateToFolder = (folderId?: string | null) => {
-    const templatesPath = formatTemplatesPath();
-
-    if (folderId) {
-      void navigate(`${templatesPath}/f/${folderId}`);
-    } else {
-      void navigate(templatesPath);
-    }
-  };
-
-  return (
-    <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">
-      <div className="flex w-full items-center justify-between">
-        <div className="flex flex-1 items-center">
-          <Button
-            variant="ghost"
-            size="sm"
-            className="flex items-center space-x-2 pl-0 hover:bg-transparent"
-            onClick={() => navigateToFolder(null)}
-          >
-            <HomeIcon className="h-4 w-4" />
-            <span>Home</span>
-          </Button>
-        </div>
-
-        <div className="flex flex-col gap-y-4 sm:flex-row sm:justify-end sm:gap-x-4">
-          <TemplateFolderCreateDialog />
-        </div>
-      </div>
-
-      <div className="mt-6">
-        {isFoldersLoading ? (
-          <div className="mt- flex justify-center">
-            <Loader2 className="text-muted-foreground h-8 w-8 animate-spin" />
-          </div>
-        ) : (
-          <>
-            {foldersData?.folders?.some((folder) => folder.pinned) && (
-              <div className="mt-6">
-                <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
-                  {foldersData.folders
-                    .filter((folder) => folder.pinned)
-                    .map((folder) => (
-                      <FolderCard
-                        key={folder.id}
-                        folder={folder}
-                        onNavigate={navigateToFolder}
-                        onMove={(folder) => {
-                          setFolderToMove(folder);
-                          setIsMovingFolder(true);
-                        }}
-                        onPin={(folderId) => void pinFolder({ folderId })}
-                        onUnpin={(folderId) => void unpinFolder({ folderId })}
-                        onSettings={(folder) => {
-                          setFolderToSettings(folder);
-                          setIsSettingsFolderOpen(true);
-                        }}
-                        onDelete={(folder) => {
-                          setFolderToDelete(folder);
-                          setIsDeletingFolder(true);
-                        }}
-                      />
-                    ))}
-                </div>
-              </div>
-            )}
-
-            <div className="mt-12">
-              <h1 className="truncate text-2xl font-semibold md:text-3xl">
-                <Trans>All Folders</Trans>
-              </h1>
-
-              <div className="mt-6 grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
-                {foldersData?.folders
-                  .filter((folder) => !folder.pinned)
-                  .map((folder) => (
-                    <FolderCard
-                      key={folder.id}
-                      folder={folder}
-                      onNavigate={navigateToFolder}
-                      onMove={(folder) => {
-                        setFolderToMove(folder);
-                        setIsMovingFolder(true);
-                      }}
-                      onPin={(folderId) => void pinFolder({ folderId })}
-                      onUnpin={(folderId) => void unpinFolder({ folderId })}
-                      onSettings={(folder) => {
-                        setFolderToSettings(folder);
-                        setIsSettingsFolderOpen(true);
-                      }}
-                      onDelete={(folder) => {
-                        setFolderToDelete(folder);
-                        setIsDeletingFolder(true);
-                      }}
-                    />
-                  ))}
-              </div>
-            </div>
-          </>
-        )}
-      </div>
-
-      <TemplateFolderMoveDialog
-        foldersData={foldersData?.folders}
-        folder={folderToMove}
-        isOpen={isMovingFolder}
-        onOpenChange={(open: boolean) => {
-          setIsMovingFolder(open);
-
-          if (!open) {
-            setFolderToMove(null);
-          }
-        }}
-      />
-
-      <TemplateFolderSettingsDialog
-        folder={folderToSettings}
-        isOpen={isSettingsFolderOpen}
-        onOpenChange={(open: boolean) => {
-          setIsSettingsFolderOpen(open);
-
-          if (!open) {
-            setFolderToSettings(null);
-          }
-        }}
-      />
-
-      <TemplateFolderDeleteDialog
-        folder={folderToDelete}
-        isOpen={isDeletingFolder}
-        onOpenChange={(open: boolean) => {
-          setIsDeletingFolder(open);
-
-          if (!open) {
-            setFolderToDelete(null);
-          }
-        }}
-      />
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_index.tsx b/apps/remix/app/routes/_index.tsx
index 0dc3af459..21c98f768 100644
--- a/apps/remix/app/routes/_index.tsx
+++ b/apps/remix/app/routes/_index.tsx
@@ -14,31 +14,35 @@ export async function loader({ request }: Route.LoaderArgs) {
   if (session.isAuthenticated) {
     const teamUrlCookie = extractCookieFromHeaders('preferred-team-url', request.headers);
 
-    const referrer = request.headers.get('referer');
-    let isReferrerFromTeamUrl = false;
+    // const referrer = request.headers.get('referer');
+    // let isReferrerFromTeamUrl = false;
 
-    if (referrer) {
-      const referrerUrl = new URL(referrer);
+    // if (referrer) {
+    //   const referrerUrl = new URL(referrer);
 
-      if (referrerUrl.pathname.startsWith('/t/')) {
-        isReferrerFromTeamUrl = true;
-      }
-    }
+    //   if (referrerUrl.pathname.startsWith('/t/')) {
+    //     isReferrerFromTeamUrl = true;
+    //   }
+    // }
 
     const preferredTeamUrl =
       teamUrlCookie && ZTeamUrlSchema.safeParse(teamUrlCookie).success ? teamUrlCookie : undefined;
 
-    // Early return for no preferred team.
-    if (!preferredTeamUrl || isReferrerFromTeamUrl) {
-      throw redirect('/documents');
-    }
+    // // Early return for no preferred team.
+    // if (!preferredTeamUrl || isReferrerFromTeamUrl) {
+    //   throw redirect('/inbox');
+    // }
 
     const teams = await getTeams({ userId: session.user.id });
 
-    const currentTeam = teams.find((team) => team.url === preferredTeamUrl);
+    let currentTeam = teams.find((team) => team.url === preferredTeamUrl);
+
+    if (!currentTeam && teams.length === 1) {
+      currentTeam = teams[0];
+    }
 
     if (!currentTeam) {
-      throw redirect('/documents');
+      throw redirect('/inbox');
     }
 
     throw redirect(formatDocumentsPath(currentTeam.url));
diff --git a/apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx b/apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
index 2dd5fbe5e..bb9d62c9a 100644
--- a/apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
+++ b/apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
@@ -45,7 +45,7 @@ export async function loader({ request }: Route.LoaderArgs) {
   const { data: auditLogs } = await findDocumentAuditLogs({
     documentId: documentId,
     userId: document.userId,
-    teamId: document.teamId || undefined,
+    teamId: document.teamId,
     perPage: 100_000,
   });
 
diff --git a/apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx b/apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
index 2c9bbd80b..c415a0e13 100644
--- a/apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
+++ b/apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
@@ -8,7 +8,6 @@ import { match } from 'ts-pattern';
 import { UAParser } from 'ua-parser-js';
 import { renderSVG } from 'uqr';
 
-import { isDocumentPlatform } from '@documenso/ee/server-only/util/is-document-platform';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { APP_I18N_OPTIONS, ZSupportedLanguageCodeSchema } from '@documenso/lib/constants/i18n';
 import {
@@ -18,7 +17,7 @@ import {
 import { getEntireDocument } from '@documenso/lib/server-only/admin/get-entire-document';
 import { decryptSecondaryData } from '@documenso/lib/server-only/crypto/decrypt';
 import { getDocumentCertificateAuditLogs } from '@documenso/lib/server-only/document/get-document-certificate-audit-logs';
-import { getTeamById } from '@documenso/lib/server-only/team/get-team';
+import { getOrganisationClaimByTeamId } from '@documenso/lib/server-only/organisation/get-organisation-claims';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
 import { getTranslations } from '@documenso/lib/utils/i18n';
@@ -64,11 +63,7 @@ export async function loader({ request }: Route.LoaderArgs) {
     throw redirect('/');
   }
 
-  const team = document.teamId
-    ? await getTeamById({ teamId: document.teamId, userId: document.userId })
-    : null;
-
-  const isPlatformDocument = await isDocumentPlatform(document);
+  const organisationClaim = await getOrganisationClaimByTeamId({ teamId: document.teamId });
 
   const documentLanguage = ZSupportedLanguageCodeSchema.parse(document.documentMeta?.language);
 
@@ -80,9 +75,8 @@ export async function loader({ request }: Route.LoaderArgs) {
 
   return {
     document,
-    team,
+    hidePoweredBy: organisationClaim.flags.hidePoweredBy,
     documentLanguage,
-    isPlatformDocument,
     auditLogs,
     messages,
   };
@@ -98,7 +92,7 @@ export async function loader({ request }: Route.LoaderArgs) {
  * Update: Maybe <Trans> tags work now after RR7 migration.
  */
 export default function SigningCertificate({ loaderData }: Route.ComponentProps) {
-  const { document, team, documentLanguage, isPlatformDocument, auditLogs, messages } = loaderData;
+  const { document, documentLanguage, hidePoweredBy, auditLogs, messages } = loaderData;
 
   const { i18n, _ } = useLingui();
 
@@ -362,7 +356,7 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)
         </CardContent>
       </Card>
 
-      {!isPlatformDocument && !team?.teamGlobalSettings?.brandingHidePoweredBy && (
+      {!hidePoweredBy && (
         <div className="my-8 flex-row-reverse space-y-4">
           <div className="flex items-end justify-end gap-x-4">
             <div
@@ -379,7 +373,6 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)
             <p className="flex-shrink-0 text-sm font-medium print:text-xs">
               {_(msg`Signing certificate provided by`)}:
             </p>
-
             <BrandingLogo className="max-h-6 print:max-h-4" />
           </div>
         </div>
diff --git a/apps/remix/app/routes/_profile+/_layout.tsx b/apps/remix/app/routes/_profile+/_layout.tsx
index 7025fefec..ef026df5a 100644
--- a/apps/remix/app/routes/_profile+/_layout.tsx
+++ b/apps/remix/app/routes/_profile+/_layout.tsx
@@ -40,7 +40,7 @@ export default function PublicProfileLayout() {
   return (
     <div className="min-h-screen">
       {sessionData ? (
-        <AuthenticatedHeader user={sessionData.user} teams={sessionData.teams} />
+        <AuthenticatedHeader />
       ) : (
         <header
           className={cn(
diff --git a/apps/remix/app/routes/_recipient+/_layout.tsx b/apps/remix/app/routes/_recipient+/_layout.tsx
index b0e3ff849..cc4c589c6 100644
--- a/apps/remix/app/routes/_recipient+/_layout.tsx
+++ b/apps/remix/app/routes/_recipient+/_layout.tsx
@@ -21,9 +21,7 @@ export default function RecipientLayout() {
 
   return (
     <div className="min-h-screen">
-      {sessionData?.user && (
-        <AuthenticatedHeader user={sessionData.user} teams={sessionData.teams} />
-      )}
+      {sessionData?.user && <AuthenticatedHeader />}
 
       <main className="mb-8 mt-8 px-4 md:mb-12 md:mt-12 md:px-8">
         <Outlet />
diff --git a/apps/remix/app/routes/_recipient+/sign.$token+/_index.tsx b/apps/remix/app/routes/_recipient+/sign.$token+/_index.tsx
index 33ecc05df..d9c8b9c4c 100644
--- a/apps/remix/app/routes/_recipient+/sign.$token+/_index.tsx
+++ b/apps/remix/app/routes/_recipient+/sign.$token+/_index.tsx
@@ -17,6 +17,7 @@ import { getNextPendingRecipient } from '@documenso/lib/server-only/recipient/ge
 import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
 import { getRecipientSignatures } from '@documenso/lib/server-only/recipient/get-recipient-signatures';
 import { getRecipientsForAssistant } from '@documenso/lib/server-only/recipient/get-recipients-for-assistant';
+import { getTeamSettings } from '@documenso/lib/server-only/team/get-team-settings';
 import { getUserByEmail } from '@documenso/lib/server-only/user/get-user-by-email';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
 import { SigningCard3D } from '@documenso/ui/components/signing-card';
@@ -139,6 +140,8 @@ export async function loader({ params, request }: Route.LoaderArgs) {
 
   const [recipientSignature] = await getRecipientSignatures({ recipientId: recipient.id });
 
+  const settings = await getTeamSettings({ teamId: document.teamId });
+
   return superLoaderJson({
     isDocumentAccessValid: true,
     document,
@@ -149,6 +152,7 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     completedFields,
     recipientSignature,
     isRecipientsTurn,
+    includeSenderDetails: settings.includeSenderDetails,
   } as const);
 }
 
@@ -175,6 +179,7 @@ export default function SigningPage() {
     recipientSignature,
     isRecipientsTurn,
     allRecipients,
+    includeSenderDetails,
     recipientWithFields,
   } = data;
 
@@ -207,7 +212,7 @@ export default function SigningPage() {
           </p>
 
           {user ? (
-            <Link to="/documents" className="text-documenso-700 hover:text-documenso-600 mt-36">
+            <Link to="/" className="text-documenso-700 hover:text-documenso-600 mt-36">
               <Trans>Go Back Home</Trans>
             </Link>
           ) : (
@@ -249,6 +254,7 @@ export default function SigningPage() {
           completedFields={completedFields}
           isRecipientsTurn={isRecipientsTurn}
           allRecipients={allRecipients}
+          includeSenderDetails={includeSenderDetails}
         />
       </DocumentSigningAuthProvider>
     </DocumentSigningProvider>
diff --git a/apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx b/apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
index d39b64c9d..5376f2af6 100644
--- a/apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
+++ b/apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
@@ -249,7 +249,7 @@ export default function CompletedSigningPage({ loaderData }: Route.ComponentProp
           )}
 
           {user && (
-            <Link to="/documents" className="text-documenso-700 hover:text-documenso-600 mt-2">
+            <Link to="/" className="text-documenso-700 hover:text-documenso-600 mt-2">
               <Trans>Go Back Home</Trans>
             </Link>
           )}
diff --git a/apps/remix/app/routes/_recipient+/sign.$token+/waiting.tsx b/apps/remix/app/routes/_recipient+/sign.$token+/waiting.tsx
index c43f32840..fbbc02ce6 100644
--- a/apps/remix/app/routes/_recipient+/sign.$token+/waiting.tsx
+++ b/apps/remix/app/routes/_recipient+/sign.$token+/waiting.tsx
@@ -56,9 +56,8 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     }
   }
 
-  const documentPathForEditing = isOwnerOrTeamMember
-    ? formatDocumentsPath(team?.url) + '/' + document.id
-    : null;
+  const documentPathForEditing =
+    isOwnerOrTeamMember && team ? formatDocumentsPath(team.url) + '/' + document.id : null;
 
   return {
     documentPathForEditing,
@@ -95,7 +94,7 @@ export default function WaitingForTurnToSignPage({ loaderData }: Route.Component
             </Button>
           ) : (
             <Button variant="link" asChild>
-              <Link to="/documents">Return Home</Link>
+              <Link to="/">Return Home</Link>
             </Button>
           )}
         </div>
diff --git a/apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx b/apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
index 51c419151..f3e6fb229 100644
--- a/apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
+++ b/apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
@@ -156,8 +156,8 @@ export default function SignatureDisclosure() {
 
       <div className="mt-8">
         <Button asChild>
-          <Link to="/documents">
-            <Trans>Back to Documents</Trans>
+          <Link to="/">
+            <Trans>Back home</Trans>
           </Link>
         </Button>
       </div>
diff --git a/apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx b/apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
new file mode 100644
index 000000000..d4743a459
--- /dev/null
+++ b/apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
@@ -0,0 +1,100 @@
+import { Trans } from '@lingui/react/macro';
+import { OrganisationMemberInviteStatus } from '@prisma/client';
+import { Link } from 'react-router';
+
+import { prisma } from '@documenso/prisma';
+import { Button } from '@documenso/ui/primitives/button';
+
+import type { Route } from './+types/organisation.decline.$token';
+
+export async function loader({ params }: Route.LoaderArgs) {
+  const { token } = params;
+
+  if (!token) {
+    return {
+      state: 'InvalidLink',
+    } as const;
+  }
+
+  const organisationMemberInvite = await prisma.organisationMemberInvite.findUnique({
+    where: {
+      token,
+    },
+    include: {
+      organisation: {
+        select: {
+          name: true,
+        },
+      },
+    },
+  });
+
+  if (!organisationMemberInvite) {
+    return {
+      state: 'InvalidLink',
+    } as const;
+  }
+
+  if (organisationMemberInvite.status !== OrganisationMemberInviteStatus.DECLINED) {
+    await prisma.organisationMemberInvite.update({
+      where: {
+        id: organisationMemberInvite.id,
+      },
+      data: {
+        status: OrganisationMemberInviteStatus.DECLINED,
+      },
+    });
+  }
+
+  return {
+    state: 'Success',
+    organisationName: organisationMemberInvite.organisation.name,
+  } as const;
+}
+
+export default function DeclineInvitationPage({ loaderData }: Route.ComponentProps) {
+  const data = loaderData;
+
+  if (data.state === 'InvalidLink') {
+    return (
+      <div className="w-screen max-w-lg px-4">
+        <div className="w-full">
+          <h1 className="text-4xl font-semibold">
+            <Trans>Invalid token</Trans>
+          </h1>
+
+          <p className="text-muted-foreground mb-4 mt-2 text-sm">
+            <Trans>This token is invalid or has expired. No action is needed.</Trans>
+          </p>
+
+          <Button asChild>
+            <Link to="/">
+              <Trans>Return</Trans>
+            </Link>
+          </Button>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="w-screen max-w-lg px-4">
+      <h1 className="text-4xl font-semibold">
+        <Trans>Invitation declined</Trans>
+      </h1>
+
+      <p className="text-muted-foreground mb-4 mt-2 text-sm">
+        <Trans>
+          You have declined the invitation from <strong>{data.organisationName}</strong> to join
+          their organisation.
+        </Trans>
+      </p>
+
+      <Button asChild>
+        <Link to="/">
+          <Trans>Return to Home</Trans>
+        </Link>
+      </Button>
+    </div>
+  );
+}
diff --git a/apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx b/apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
similarity index 63%
rename from apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
rename to apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
index 38c6f16f4..5fa253ca3 100644
--- a/apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+++ b/apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
@@ -1,16 +1,12 @@
 import { Trans } from '@lingui/react/macro';
-import { TeamMemberInviteStatus } from '@prisma/client';
-import { DateTime } from 'luxon';
 import { Link } from 'react-router';
 
 import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
-import { encryptSecondaryData } from '@documenso/lib/server-only/crypto/encrypt';
-import { acceptTeamInvitation } from '@documenso/lib/server-only/team/accept-team-invitation';
-import { getTeamById } from '@documenso/lib/server-only/team/get-team';
+import { acceptOrganisationInvitation } from '@documenso/lib/server-only/organisation/accept-organisation-invitation';
 import { prisma } from '@documenso/prisma';
 import { Button } from '@documenso/ui/primitives/button';
 
-import type { Route } from './+types/team.invite.$token';
+import type { Route } from './+types/organisation.invite.$token';
 
 export async function loader({ params, request }: Route.LoaderArgs) {
   const session = await getOptionalSession(request);
@@ -23,24 +19,29 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     } as const;
   }
 
-  const teamMemberInvite = await prisma.teamMemberInvite.findUnique({
+  const organisationMemberInvite = await prisma.organisationMemberInvite.findUnique({
     where: {
       token,
     },
+    include: {
+      organisation: {
+        select: {
+          name: true,
+        },
+      },
+    },
   });
 
-  if (!teamMemberInvite) {
+  if (!organisationMemberInvite) {
     return {
       state: 'InvalidLink',
     } as const;
   }
 
-  const team = await getTeamById({ teamId: teamMemberInvite.teamId });
-
   const user = await prisma.user.findFirst({
     where: {
       email: {
-        equals: teamMemberInvite.email,
+        equals: organisationMemberInvite.email,
         mode: 'insensitive',
       },
     },
@@ -48,32 +49,14 @@ export async function loader({ params, request }: Route.LoaderArgs) {
 
   // Directly convert the team member invite to a team member if they already have an account.
   if (user) {
-    await acceptTeamInvitation({ userId: user.id, teamId: team.id });
+    await acceptOrganisationInvitation({ token: organisationMemberInvite.token });
   }
 
-  // For users who do not exist yet, set the team invite status to accepted, which is checked during
-  // user creation to determine if we should add the user to the team at that time.
-  if (!user && teamMemberInvite.status !== TeamMemberInviteStatus.ACCEPTED) {
-    await prisma.teamMemberInvite.update({
-      where: {
-        id: teamMemberInvite.id,
-      },
-      data: {
-        status: TeamMemberInviteStatus.ACCEPTED,
-      },
-    });
-  }
-
-  const email = encryptSecondaryData({
-    data: teamMemberInvite.email,
-    expiresAt: DateTime.now().plus({ days: 1 }).toMillis(),
-  });
-
   if (!user) {
     return {
       state: 'LoginRequired',
-      email,
-      teamName: team.name,
+      email: organisationMemberInvite.email,
+      organisationName: organisationMemberInvite.organisation.name,
     } as const;
   }
 
@@ -81,8 +64,8 @@ export async function loader({ params, request }: Route.LoaderArgs) {
 
   return {
     state: 'Success',
-    email,
-    teamName: team.name,
+    email: organisationMemberInvite.email,
+    organisationName: organisationMemberInvite.organisation.name,
     isSessionUserTheInvitedUser,
   } as const;
 }
@@ -118,12 +101,13 @@ export default function AcceptInvitationPage({ loaderData }: Route.ComponentProp
     return (
       <div>
         <h1 className="text-4xl font-semibold">
-          <Trans>Team invitation</Trans>
+          <Trans>Organisation invitation</Trans>
         </h1>
 
         <p className="text-muted-foreground mt-2 text-sm">
           <Trans>
-            You have been invited by <strong>{data.teamName}</strong> to join their team.
+            You have been invited by <strong>{data.organisationName}</strong> to join their
+            organisation.
           </Trans>
         </p>
 
@@ -132,7 +116,7 @@ export default function AcceptInvitationPage({ loaderData }: Route.ComponentProp
         </p>
 
         <Button asChild>
-          <Link to={`/signup?email=${encodeURIComponent(data.email)}`}>
+          <Link to={`/signup#email=${encodeURIComponent(data.email)}`}>
             <Trans>Create account</Trans>
           </Link>
         </Button>
@@ -148,7 +132,8 @@ export default function AcceptInvitationPage({ loaderData }: Route.ComponentProp
 
       <p className="text-muted-foreground mb-4 mt-2 text-sm">
         <Trans>
-          You have accepted an invitation from <strong>{data.teamName}</strong> to join their team.
+          You have accepted an invitation from <strong>{data.organisationName}</strong> to join
+          their organisation.
         </Trans>
       </p>
 
@@ -160,7 +145,7 @@ export default function AcceptInvitationPage({ loaderData }: Route.ComponentProp
         </Button>
       ) : (
         <Button asChild>
-          <Link to={`/signin?email=${encodeURIComponent(data.email)}`}>
+          <Link to={`/signin#email=${encodeURIComponent(data.email)}`}>
             <Trans>Continue to login</Trans>
           </Link>
         </Button>
diff --git a/apps/remix/app/routes/_unauthenticated+/signin.tsx b/apps/remix/app/routes/_unauthenticated+/signin.tsx
index 58bbdbc57..99bad06e6 100644
--- a/apps/remix/app/routes/_unauthenticated+/signin.tsx
+++ b/apps/remix/app/routes/_unauthenticated+/signin.tsx
@@ -27,7 +27,7 @@ export async function loader({ request }: Route.LoaderArgs) {
   const oidcProviderLabel = OIDC_PROVIDER_LABEL;
 
   if (isAuthenticated) {
-    throw redirect('/documents');
+    throw redirect('/');
   }
 
   return {
diff --git a/apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx b/apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
deleted file mode 100644
index b2060288e..000000000
--- a/apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+++ /dev/null
@@ -1,165 +0,0 @@
-import { Trans } from '@lingui/react/macro';
-import { TeamMemberInviteStatus } from '@prisma/client';
-import { DateTime } from 'luxon';
-import { Link } from 'react-router';
-
-import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
-import { encryptSecondaryData } from '@documenso/lib/server-only/crypto/encrypt';
-import { declineTeamInvitation } from '@documenso/lib/server-only/team/decline-team-invitation';
-import { getTeamById } from '@documenso/lib/server-only/team/get-team';
-import { prisma } from '@documenso/prisma';
-import { Button } from '@documenso/ui/primitives/button';
-
-import type { Route } from './+types/team.decline.$token';
-
-export async function loader({ params, request }: Route.LoaderArgs) {
-  const session = await getOptionalSession(request);
-
-  const { token } = params;
-
-  if (!token) {
-    return {
-      state: 'InvalidLink',
-    } as const;
-  }
-
-  const teamMemberInvite = await prisma.teamMemberInvite.findUnique({
-    where: {
-      token,
-    },
-  });
-
-  if (!teamMemberInvite) {
-    return {
-      state: 'InvalidLink',
-    } as const;
-  }
-
-  const team = await getTeamById({ teamId: teamMemberInvite.teamId });
-
-  const user = await prisma.user.findFirst({
-    where: {
-      email: {
-        equals: teamMemberInvite.email,
-        mode: 'insensitive',
-      },
-    },
-  });
-
-  if (user) {
-    await declineTeamInvitation({ userId: user.id, teamId: team.id });
-  }
-
-  if (!user && teamMemberInvite.status !== TeamMemberInviteStatus.DECLINED) {
-    await prisma.teamMemberInvite.update({
-      where: {
-        id: teamMemberInvite.id,
-      },
-      data: {
-        status: TeamMemberInviteStatus.DECLINED,
-      },
-    });
-  }
-
-  const email = encryptSecondaryData({
-    data: teamMemberInvite.email,
-    expiresAt: DateTime.now().plus({ days: 1 }).toMillis(),
-  });
-
-  if (!user) {
-    return {
-      state: 'LoginRequired',
-      email,
-      teamName: team.name,
-    } as const;
-  }
-
-  const isSessionUserTheInvitedUser = user.id === session?.user?.id;
-
-  return {
-    state: 'Success',
-    email,
-    teamName: team.name,
-    isSessionUserTheInvitedUser,
-  } as const;
-}
-
-export default function DeclineInvitationPage({ loaderData }: Route.ComponentProps) {
-  const data = loaderData;
-
-  if (data.state === 'InvalidLink') {
-    return (
-      <div className="w-screen max-w-lg px-4">
-        <div className="w-full">
-          <h1 className="text-4xl font-semibold">
-            <Trans>Invalid token</Trans>
-          </h1>
-
-          <p className="text-muted-foreground mb-4 mt-2 text-sm">
-            <Trans>This token is invalid or has expired. No action is needed.</Trans>
-          </p>
-
-          <Button asChild>
-            <Link to="/">
-              <Trans>Return</Trans>
-            </Link>
-          </Button>
-        </div>
-      </div>
-    );
-  }
-
-  if (data.state === 'LoginRequired') {
-    return (
-      <div>
-        <h1 className="text-4xl font-semibold">
-          <Trans>Team invitation</Trans>
-        </h1>
-
-        <p className="text-muted-foreground mt-2 text-sm">
-          <Trans>
-            You have been invited by <strong>{data.teamName}</strong> to join their team.
-          </Trans>
-        </p>
-
-        <p className="text-muted-foreground mb-4 mt-1 text-sm">
-          <Trans>To decline this invitation you must create an account.</Trans>
-        </p>
-
-        <Button asChild>
-          <Link to={`/signup?email=${encodeURIComponent(data.email)}`}>
-            <Trans>Create account</Trans>
-          </Link>
-        </Button>
-      </div>
-    );
-  }
-
-  return (
-    <div className="w-screen max-w-lg px-4">
-      <h1 className="text-4xl font-semibold">
-        <Trans>Invitation declined</Trans>
-      </h1>
-
-      <p className="text-muted-foreground mb-4 mt-2 text-sm">
-        <Trans>
-          You have declined the invitation from <strong>{data.teamName}</strong> to join their team.
-        </Trans>
-      </p>
-
-      {data.isSessionUserTheInvitedUser ? (
-        <Button asChild>
-          <Link to="/">
-            <Trans>Return to Dashboard</Trans>
-          </Link>
-        </Button>
-      ) : (
-        <Button asChild>
-          <Link to="/">
-            <Trans>Return to Home</Trans>
-          </Link>
-        </Button>
-      )}
-    </div>
-  );
-}
diff --git a/apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx b/apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
index 50d79587e..7fae26893 100644
--- a/apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
+++ b/apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
@@ -1,154 +1,28 @@
 import { Trans } from '@lingui/react/macro';
 import { Link } from 'react-router';
 
-import { transferTeamOwnership } from '@documenso/lib/server-only/team/transfer-team-ownership';
-import { isTokenExpired } from '@documenso/lib/utils/token-verification';
-import { prisma } from '@documenso/prisma';
 import { Button } from '@documenso/ui/primitives/button';
 
 import type { Route } from './+types/team.verify.transfer.$token';
 
-export async function loader({ params }: Route.LoaderArgs) {
-  const { token } = params;
-
-  if (!token) {
-    return {
-      state: 'InvalidLink',
-    } as const;
-  }
-
-  const teamTransferVerification = await prisma.teamTransferVerification.findUnique({
-    where: {
-      token,
-    },
-    include: {
-      team: true,
-    },
-  });
-
-  if (!teamTransferVerification || isTokenExpired(teamTransferVerification.expiresAt)) {
-    return {
-      state: 'InvalidLink',
-    } as const;
-  }
-
-  if (teamTransferVerification.completed) {
-    return {
-      state: 'AlreadyCompleted',
-      teamName: teamTransferVerification.team.name,
-    } as const;
-  }
-
-  const { team } = teamTransferVerification;
-
-  let isTransferError = false;
-
-  try {
-    await transferTeamOwnership({ token });
-  } catch (e) {
-    console.error(e);
-    isTransferError = true;
-  }
-
-  if (isTransferError) {
-    return {
-      state: 'TransferError',
-      teamName: team.name,
-    } as const;
-  }
-
-  return {
-    state: 'Success',
-    teamName: team.name,
-    teamUrl: team.url,
-  } as const;
-}
-
 export default function VerifyTeamTransferPage({ loaderData }: Route.ComponentProps) {
-  const data = loaderData;
-
-  if (data.state === 'InvalidLink') {
-    return (
-      <div className="w-screen max-w-lg px-4">
-        <div className="w-full">
-          <h1 className="text-4xl font-semibold">
-            <Trans>Invalid link</Trans>
-          </h1>
-
-          <p className="text-muted-foreground mb-4 mt-2 text-sm">
-            <Trans>
-              This link is invalid or has expired. Please contact your team to resend a transfer
-              request.
-            </Trans>
-          </p>
-
-          <Button asChild>
-            <Link to="/">
-              <Trans>Return</Trans>
-            </Link>
-          </Button>
-        </div>
-      </div>
-    );
-  }
-
-  if (data.state === 'AlreadyCompleted') {
-    return (
-      <div>
+  return (
+    <div className="w-screen max-w-lg px-4">
+      <div className="w-full">
         <h1 className="text-4xl font-semibold">
-          <Trans>Team ownership transfer already completed!</Trans>
+          <Trans>Invalid link</Trans>
         </h1>
 
         <p className="text-muted-foreground mb-4 mt-2 text-sm">
-          <Trans>
-            You have already completed the ownership transfer for <strong>{data.teamName}</strong>.
-          </Trans>
+          <Trans>This link is invalid or has expired.</Trans>
         </p>
 
         <Button asChild>
           <Link to="/">
-            <Trans>Continue</Trans>
+            <Trans>Return</Trans>
           </Link>
         </Button>
       </div>
-    );
-  }
-
-  if (data.state === 'TransferError') {
-    return (
-      <div>
-        <h1 className="text-4xl font-semibold">
-          <Trans>Team ownership transfer</Trans>
-        </h1>
-
-        <p className="text-muted-foreground mt-2 text-sm">
-          <Trans>
-            Something went wrong while attempting to transfer the ownership of team{' '}
-            <strong>{data.teamName}</strong> to your. Please try again later or contact support.
-          </Trans>
-        </p>
-      </div>
-    );
-  }
-
-  return (
-    <div>
-      <h1 className="text-4xl font-semibold">
-        <Trans>Team ownership transferred!</Trans>
-      </h1>
-
-      <p className="text-muted-foreground mb-4 mt-2 text-sm">
-        <Trans>
-          The ownership of team <strong>{data.teamName}</strong> has been successfully transferred
-          to you.
-        </Trans>
-      </p>
-
-      <Button asChild>
-        <Link to={`/t/${data.teamUrl}/settings`}>
-          <Trans>Continue</Trans>
-        </Link>
-      </Button>
     </div>
   );
 }
diff --git a/apps/remix/app/routes/api+/branding.logo.organisation.$orgId.ts b/apps/remix/app/routes/api+/branding.logo.organisation.$orgId.ts
new file mode 100644
index 000000000..c41940cd1
--- /dev/null
+++ b/apps/remix/app/routes/api+/branding.logo.organisation.$orgId.ts
@@ -0,0 +1,80 @@
+import sharp from 'sharp';
+
+import { getFileServerSide } from '@documenso/lib/universal/upload/get-file.server';
+import { prisma } from '@documenso/prisma';
+
+import type { Route } from './+types/branding.logo.team.$teamId';
+
+export async function loader({ params }: Route.LoaderArgs) {
+  const organisationId = params.orgId;
+
+  if (!organisationId) {
+    return Response.json(
+      {
+        status: 'error',
+        message: 'Invalid organisation ID',
+      },
+      { status: 400 },
+    );
+  }
+
+  const organisation = await prisma.organisation.findUnique({
+    where: {
+      id: organisationId,
+    },
+    include: {
+      organisationGlobalSettings: true,
+    },
+  });
+
+  const settings = organisation?.organisationGlobalSettings;
+
+  if (!settings || !settings.brandingLogo) {
+    return Response.json(
+      {
+        status: 'error',
+        message: 'Logo not found',
+      },
+      { status: 404 },
+    );
+  }
+
+  if (!settings.brandingEnabled) {
+    return Response.json(
+      {
+        status: 'error',
+        message: 'Branding is not enabled',
+      },
+      { status: 400 },
+    );
+  }
+
+  const file = await getFileServerSide(JSON.parse(settings.brandingLogo)).catch((e) => {
+    console.error(e);
+  });
+
+  if (!file) {
+    return Response.json(
+      {
+        status: 'error',
+        message: 'Not found',
+      },
+      { status: 404 },
+    );
+  }
+
+  const img = await sharp(file)
+    .toFormat('png', {
+      quality: 80,
+    })
+    .toBuffer();
+
+  return new Response(img, {
+    headers: {
+      'Content-Type': 'image/png',
+      'Content-Length': img.length.toString(),
+      // Stale while revalidate for 1 hours to 24 hours
+      'Cache-Control': 'public, s-maxage=3600, stale-while-revalidate=86400',
+    },
+  });
+}
diff --git a/apps/remix/app/routes/api+/branding.logo.team.$teamId.ts b/apps/remix/app/routes/api+/branding.logo.team.$teamId.ts
index 4aab1b588..096c0b19f 100644
--- a/apps/remix/app/routes/api+/branding.logo.team.$teamId.ts
+++ b/apps/remix/app/routes/api+/branding.logo.team.$teamId.ts
@@ -1,7 +1,7 @@
 import sharp from 'sharp';
 
+import { getTeamSettings } from '@documenso/lib/server-only/team/get-team-settings';
 import { getFileServerSide } from '@documenso/lib/universal/upload/get-file.server';
-import { prisma } from '@documenso/prisma';
 
 import type { Route } from './+types/branding.logo.team.$teamId';
 
@@ -18,10 +18,8 @@ export async function loader({ params }: Route.LoaderArgs) {
     );
   }
 
-  const settings = await prisma.teamGlobalSettings.findFirst({
-    where: {
-      teamId,
-    },
+  const settings = await getTeamSettings({
+    teamId,
   });
 
   if (!settings || !settings.brandingLogo) {
diff --git a/apps/remix/app/routes/embed+/_v0+/direct.$url.tsx b/apps/remix/app/routes/embed+/_v0+/direct.$url.tsx
index 45df8a8a8..5c3d1d916 100644
--- a/apps/remix/app/routes/embed+/_v0+/direct.$url.tsx
+++ b/apps/remix/app/routes/embed+/_v0+/direct.$url.tsx
@@ -2,11 +2,8 @@ import { data } from 'react-router';
 import { match } from 'ts-pattern';
 
 import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
-import { isCommunityPlan as isUserCommunityPlan } from '@documenso/ee/server-only/util/is-community-plan';
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
-import { isDocumentPlatform } from '@documenso/ee/server-only/util/is-document-platform';
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
-import { getTeamById } from '@documenso/lib/server-only/team/get-team';
+import { getOrganisationClaimByTeamId } from '@documenso/lib/server-only/organisation/get-organisation-claims';
 import { getTemplateByDirectLinkToken } from '@documenso/lib/server-only/template/get-template-by-direct-link-token';
 import { DocumentAccessAuth } from '@documenso/lib/types/document-auth';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
@@ -36,10 +33,15 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     throw new Response('Not found', { status: 404 });
   }
 
+  const organisationClaim = await getOrganisationClaimByTeamId({ teamId: template.teamId });
+
+  const allowEmbedSigningWhitelabel = organisationClaim.flags.embedSigningWhiteLabel;
+  const hidePoweredBy = organisationClaim.flags.hidePoweredBy;
+
   // TODO: Make this more robust, we need to ensure the owner is either
   // TODO: the member of a team that has an active subscription, is an early
   // TODO: adopter or is an enterprise user.
-  if (IS_BILLING_ENABLED() && !template.teamId) {
+  if (IS_BILLING_ENABLED() && !organisationClaim.flags.embedSigning) {
     throw data(
       {
         type: 'embed-paywall',
@@ -56,18 +58,6 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     documentAuth: template.authOptions,
   });
 
-  const [isPlatformDocument, isEnterpriseDocument, isCommunityPlan] = await Promise.all([
-    isDocumentPlatform(template),
-    isUserEnterprise({
-      userId: template.userId,
-      teamId: template.teamId ?? undefined,
-    }),
-    isUserCommunityPlan({
-      userId: template.userId,
-      teamId: template.teamId ?? undefined,
-    }),
-  ]);
-
   const isAccessAuthValid = match(derivedRecipientAccessAuth.at(0))
     .with(DocumentAccessAuth.ACCOUNT, () => !!user)
     .with(undefined, () => true)
@@ -98,12 +88,6 @@ export async function loader({ params, request }: Route.LoaderArgs) {
 
   const fields = template.fields.filter((field) => field.recipientId === directTemplateRecipientId);
 
-  const team = template.teamId
-    ? await getTeamById({ teamId: template.teamId, userId: template.userId }).catch(() => null)
-    : null;
-
-  const hidePoweredBy = team?.teamGlobalSettings?.brandingHidePoweredBy ?? false;
-
   return superLoaderJson({
     token,
     user,
@@ -111,24 +95,13 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     recipient,
     fields,
     hidePoweredBy,
-    isPlatformDocument,
-    isEnterpriseDocument,
-    isCommunityPlan,
+    allowEmbedSigningWhitelabel,
   });
 }
 
 export default function EmbedDirectTemplatePage() {
-  const {
-    token,
-    user,
-    template,
-    recipient,
-    fields,
-    hidePoweredBy,
-    isPlatformDocument,
-    isEnterpriseDocument,
-    isCommunityPlan,
-  } = useSuperLoaderData<typeof loader>();
+  const { token, user, template, recipient, fields, hidePoweredBy, allowEmbedSigningWhitelabel } =
+    useSuperLoaderData<typeof loader>();
 
   return (
     <DocumentSigningProvider
@@ -152,10 +125,8 @@ export default function EmbedDirectTemplatePage() {
             recipient={recipient}
             fields={fields}
             metadata={template.templateMeta}
-            hidePoweredBy={
-              isCommunityPlan || isPlatformDocument || isEnterpriseDocument || hidePoweredBy
-            }
-            allowWhiteLabelling={isCommunityPlan || isPlatformDocument || isEnterpriseDocument}
+            hidePoweredBy={hidePoweredBy}
+            allowWhiteLabelling={allowEmbedSigningWhitelabel}
           />
         </DocumentSigningRecipientProvider>
       </DocumentSigningAuthProvider>
diff --git a/apps/remix/app/routes/embed+/_v0+/sign.$url.tsx b/apps/remix/app/routes/embed+/_v0+/sign.$url.tsx
index 5f51c1686..88c3b7745 100644
--- a/apps/remix/app/routes/embed+/_v0+/sign.$url.tsx
+++ b/apps/remix/app/routes/embed+/_v0+/sign.$url.tsx
@@ -3,17 +3,14 @@ import { data } from 'react-router';
 import { match } from 'ts-pattern';
 
 import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
-import { isCommunityPlan as isUserCommunityPlan } from '@documenso/ee/server-only/util/is-community-plan';
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
-import { isDocumentPlatform } from '@documenso/ee/server-only/util/is-document-platform';
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token';
 import { getCompletedFieldsForToken } from '@documenso/lib/server-only/field/get-completed-fields-for-token';
 import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-for-token';
+import { getOrganisationClaimByTeamId } from '@documenso/lib/server-only/organisation/get-organisation-claims';
 import { getIsRecipientsTurnToSign } from '@documenso/lib/server-only/recipient/get-is-recipient-turn';
 import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
 import { getRecipientsForAssistant } from '@documenso/lib/server-only/recipient/get-recipients-for-assistant';
-import { getTeamById } from '@documenso/lib/server-only/team/get-team';
 import { DocumentAccessAuth } from '@documenso/lib/types/document-auth';
 import { isDocumentCompleted } from '@documenso/lib/utils/document';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
@@ -51,10 +48,15 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     throw new Response('Not found', { status: 404 });
   }
 
+  const organisationClaim = await getOrganisationClaimByTeamId({ teamId: document.teamId });
+
+  const allowEmbedSigningWhitelabel = organisationClaim.flags.embedSigningWhiteLabel;
+  const hidePoweredBy = organisationClaim.flags.hidePoweredBy;
+
   // TODO: Make this more robust, we need to ensure the owner is either
   // TODO: the member of a team that has an active subscription, is an early
   // TODO: adopter or is an enterprise user.
-  if (IS_BILLING_ENABLED() && !document.teamId) {
+  if (IS_BILLING_ENABLED() && !organisationClaim.flags.embedSigning) {
     throw data(
       {
         type: 'embed-paywall',
@@ -65,18 +67,6 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     );
   }
 
-  const [isPlatformDocument, isEnterpriseDocument, isCommunityPlan] = await Promise.all([
-    isDocumentPlatform(document),
-    isUserEnterprise({
-      userId: document.userId,
-      teamId: document.teamId ?? undefined,
-    }),
-    isUserCommunityPlan({
-      userId: document.userId,
-      teamId: document.teamId ?? undefined,
-    }),
-  ]);
-
   const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({
     documentAuth: document.authOptions,
   });
@@ -119,12 +109,6 @@ export async function loader({ params, request }: Route.LoaderArgs) {
         })
       : [];
 
-  const team = document.teamId
-    ? await getTeamById({ teamId: document.teamId, userId: document.userId }).catch(() => null)
-    : null;
-
-  const hidePoweredBy = team?.teamGlobalSettings?.brandingHidePoweredBy ?? false;
-
   return superLoaderJson({
     token,
     user,
@@ -134,9 +118,7 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     fields,
     completedFields,
     hidePoweredBy,
-    isPlatformDocument,
-    isEnterpriseDocument,
-    isCommunityPlan,
+    allowEmbedSigningWhitelabel,
   });
 }
 
@@ -150,9 +132,7 @@ export default function EmbedSignDocumentPage() {
     fields,
     completedFields,
     hidePoweredBy,
-    isPlatformDocument,
-    isEnterpriseDocument,
-    isCommunityPlan,
+    allowEmbedSigningWhitelabel,
   } = useSuperLoaderData<typeof loader>();
 
   return (
@@ -178,10 +158,8 @@ export default function EmbedSignDocumentPage() {
           completedFields={completedFields}
           metadata={document.documentMeta}
           isCompleted={isDocumentCompleted(document.status)}
-          hidePoweredBy={
-            isCommunityPlan || isPlatformDocument || isEnterpriseDocument || hidePoweredBy
-          }
-          allowWhitelabelling={isCommunityPlan || isPlatformDocument || isEnterpriseDocument}
+          hidePoweredBy={hidePoweredBy}
+          allowWhitelabelling={allowEmbedSigningWhitelabel}
           allRecipients={allRecipients}
         />
       </DocumentSigningAuthProvider>
diff --git a/apps/remix/app/routes/embed+/v1+/authoring+/_layout.tsx b/apps/remix/app/routes/embed+/v1+/authoring+/_layout.tsx
index 4d6b7e729..f8a9b4b36 100644
--- a/apps/remix/app/routes/embed+/v1+/authoring+/_layout.tsx
+++ b/apps/remix/app/routes/embed+/v1+/authoring+/_layout.tsx
@@ -2,10 +2,8 @@ import { useLayoutEffect } from 'react';
 
 import { Outlet, useLoaderData } from 'react-router';
 
-import { isCommunityPlan } from '@documenso/ee/server-only/util/is-community-plan';
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
-import { isDocumentPlatform } from '@documenso/ee/server-only/util/is-document-platform';
 import { verifyEmbeddingPresignToken } from '@documenso/lib/server-only/embedding-presign/verify-embedding-presign-token';
+import { getOrganisationClaimByTeamId } from '@documenso/lib/server-only/organisation/get-organisation-claims';
 import { TrpcProvider } from '@documenso/trpc/react';
 
 import { ZBaseEmbedAuthoringSchema } from '~/types/embed-authoring-base-schema';
@@ -27,39 +25,25 @@ export const loader = async ({ request }: Route.LoaderArgs) => {
 
   const result = await verifyEmbeddingPresignToken({ token }).catch(() => null);
 
-  let hasPlatformPlan = false;
-  let hasEnterprisePlan = false;
-  let hasCommunityPlan = false;
+  let allowEmbedAuthoringWhiteLabel = false;
 
   if (result) {
-    [hasCommunityPlan, hasPlatformPlan, hasEnterprisePlan] = await Promise.all([
-      isCommunityPlan({
-        userId: result.userId,
-        teamId: result.teamId ?? undefined,
-      }),
-      isDocumentPlatform({
-        userId: result.userId,
-        teamId: result.teamId,
-      }),
-      isUserEnterprise({
-        userId: result.userId,
-        teamId: result.teamId ?? undefined,
-      }),
-    ]);
+    const organisationClaim = await getOrganisationClaimByTeamId({
+      teamId: result.teamId,
+    });
+
+    allowEmbedAuthoringWhiteLabel = organisationClaim.flags.embedAuthoringWhiteLabel ?? false;
   }
 
   return {
     hasValidToken: !!result,
     token,
-    hasCommunityPlan,
-    hasPlatformPlan,
-    hasEnterprisePlan,
+    allowEmbedAuthoringWhiteLabel,
   };
 };
 
 export default function AuthoringLayout() {
-  const { hasValidToken, token, hasCommunityPlan, hasPlatformPlan, hasEnterprisePlan } =
-    useLoaderData<typeof loader>();
+  const { hasValidToken, token, allowEmbedAuthoringWhiteLabel } = useLoaderData<typeof loader>();
 
   useLayoutEffect(() => {
     try {
@@ -79,7 +63,7 @@ export default function AuthoringLayout() {
         document.documentElement.classList.add('dark-mode-disabled');
       }
 
-      if (hasCommunityPlan || hasPlatformPlan || hasEnterprisePlan) {
+      if (allowEmbedAuthoringWhiteLabel) {
         injectCss({
           css,
           cssVars,
diff --git a/apps/remix/app/routes/embed+/v1+/multisign+/_index.tsx b/apps/remix/app/routes/embed+/v1+/multisign+/_index.tsx
index ac2a9c7e1..c84e931ea 100644
--- a/apps/remix/app/routes/embed+/v1+/multisign+/_index.tsx
+++ b/apps/remix/app/routes/embed+/v1+/multisign+/_index.tsx
@@ -4,12 +4,9 @@ import { SigningStatus } from '@prisma/client';
 import { useRevalidator } from 'react-router';
 
 import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
-import { isCommunityPlan as isUserCommunityPlan } from '@documenso/ee/server-only/util/is-community-plan';
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
-import { isDocumentPlatform } from '@documenso/ee/server-only/util/is-document-platform';
 import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token';
+import { getOrganisationClaimByTeamId } from '@documenso/lib/server-only/organisation/get-organisation-claims';
 import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
-import { getTeamById } from '@documenso/lib/server-only/team/get-team';
 
 import { BrandingLogo } from '~/components/general/branding-logo';
 import { DocumentSigningAuthProvider } from '~/components/general/document-signing/document-signing-auth-provider';
@@ -54,26 +51,10 @@ export async function loader({ request }: Route.LoaderArgs) {
     });
   }
 
-  const team = firstDocument.teamId
-    ? await getTeamById({ teamId: firstDocument.teamId, userId: firstDocument.userId }).catch(
-        () => null,
-      )
-    : null;
+  const organisationClaim = await getOrganisationClaimByTeamId({ teamId: firstDocument.teamId });
 
-  const [isPlatformDocument, isEnterpriseDocument, isCommunityPlan] = await Promise.all([
-    isDocumentPlatform(firstDocument),
-    isUserEnterprise({
-      userId: firstDocument.userId,
-      teamId: firstDocument.teamId ?? undefined,
-    }),
-    isUserCommunityPlan({
-      userId: firstDocument.userId,
-      teamId: firstDocument.teamId ?? undefined,
-    }),
-  ]);
-
-  const hidePoweredBy = team?.teamGlobalSettings?.brandingHidePoweredBy ?? false;
-  const allowWhitelabelling = isCommunityPlan || isPlatformDocument || isEnterpriseDocument;
+  const allowWhitelabelling = organisationClaim.flags.embedSigningWhiteLabel;
+  const hidePoweredBy = organisationClaim.flags.hidePoweredBy;
 
   return superLoaderJson({
     envelopes,
diff --git a/apps/remix/server/middleware.ts b/apps/remix/server/middleware.ts
index 5fb194ec1..4f67eeecd 100644
--- a/apps/remix/server/middleware.ts
+++ b/apps/remix/server/middleware.ts
@@ -1,8 +1,10 @@
 import type { Context, Next } from 'hono';
-import { deleteCookie, setCookie } from 'hono/cookie';
+import { setCookie } from 'hono/cookie';
 
 import { AppDebugger } from '@documenso/lib/utils/debugger';
 
+import { handleRedirects } from './redirects';
+
 const debug = new AppDebugger('Middleware');
 
 /**
@@ -24,6 +26,14 @@ export const appMiddleware = async (c: Context, next: Next) => {
   }
 
   // PRE-HANDLER CODE: Place code here to execute BEFORE the route handler runs.
+  const redirectPath = await handleRedirects(c);
+
+  if (redirectPath) {
+    debug.log('Redirecting from', path);
+    debug.log('Redirecting to', redirectPath);
+
+    return c.redirect(redirectPath);
+  }
 
   await next();
 
@@ -35,15 +45,6 @@ export const appMiddleware = async (c: Context, next: Next) => {
   debug.log('Path', path);
 
   const pathname = path.replace('.data', '');
-  const referrer = c.req.header('referer');
-  const referrerUrl = referrer ? new URL(referrer) : null;
-  const referrerPathname = referrerUrl ? referrerUrl.pathname : null;
-
-  // Whether to reset the preferred team url cookie if the user accesses a non team page from a team page.
-  const resetPreferredTeamUrl =
-    referrerPathname &&
-    referrerPathname.startsWith('/t/') &&
-    (!pathname.startsWith('/t/') || pathname === '/');
 
   // Set the preferred team url cookie if user accesses a team page.
   if (pathname.startsWith('/t/')) {
@@ -55,15 +56,6 @@ export const appMiddleware = async (c: Context, next: Next) => {
 
     return;
   }
-
-  // Clear preferred team url cookie if user accesses a non team page from a team page.
-  if (resetPreferredTeamUrl || pathname === '/documents') {
-    debug.log('Deleting preferred team url cookie');
-
-    deleteCookie(c, 'preferred-team-url');
-
-    return;
-  }
 };
 
 // This regex matches any path that:
diff --git a/apps/remix/server/redirects.ts b/apps/remix/server/redirects.ts
new file mode 100644
index 000000000..45570bcc4
--- /dev/null
+++ b/apps/remix/server/redirects.ts
@@ -0,0 +1,175 @@
+import type { Context } from 'hono';
+
+import { getSession } from '@documenso/auth/server/lib/utils/get-session';
+import { buildTeamWhereQuery } from '@documenso/lib/utils/teams';
+import { prisma } from '@documenso/prisma';
+
+function extractIdFromPath(path: string, prefix: string): string | null {
+  const regex = new RegExp(`^${prefix}/([^/]+)`);
+  const match = path.match(regex);
+  return match ? match[1] : null;
+}
+
+export const handleRedirects = async (c: Context): Promise<string | null> => {
+  const { req } = c;
+  const path = req.path;
+
+  // Direct rewrites
+  if (
+    path === '/documents' ||
+    path === '/documents/folders' ||
+    path === '/templates' ||
+    path === '/templates/folders'
+  ) {
+    return '/';
+  }
+
+  // Document folder routes.
+  if (path.startsWith('/documents/f/')) {
+    const folderId = extractIdFromPath(path, '/documents/f');
+
+    if (!folderId) {
+      return '/';
+    }
+
+    const teamUrl = await hasAccessToFolder(c, folderId);
+
+    if (folderId && teamUrl) {
+      return `/t/${teamUrl}/documents/f/${folderId}`;
+    }
+  }
+
+  // Document routes.
+  if (path.startsWith('/documents/')) {
+    const rawDocumentId = extractIdFromPath(path, '/documents');
+
+    const documentId = Number(rawDocumentId);
+
+    if (!documentId || isNaN(documentId)) {
+      return '/';
+    }
+
+    const teamUrl = await hasAccessToDocument(c, documentId);
+
+    if (!teamUrl) {
+      return '/';
+    }
+
+    const queryString = req.url.split('?')[1];
+    const redirectPath = `/t/${teamUrl}${path}${queryString ? `?${queryString}` : ''}`;
+
+    return redirectPath;
+  }
+
+  // Template folder routes.
+  if (path.startsWith('/templates/f/')) {
+    const folderId = extractIdFromPath(path, '/templates/f');
+
+    if (!folderId) {
+      return '/';
+    }
+
+    const teamUrl = await hasAccessToFolder(c, folderId);
+
+    if (folderId && teamUrl) {
+      return `/t/${teamUrl}/templates/f/${folderId}`;
+    }
+  }
+
+  if (path.startsWith('/templates/')) {
+    const rawTemplateId = extractIdFromPath(path, '/templates');
+    const templateId = Number(rawTemplateId);
+
+    if (!templateId || isNaN(templateId)) {
+      return '/';
+    }
+
+    const teamUrl = await hasAccessToTemplate(c, templateId);
+
+    if (!teamUrl) {
+      return '/';
+    }
+
+    const queryString = req.url.split('?')[1];
+    const redirectPath = `/t/${teamUrl}${path}${queryString ? `?${queryString}` : ''}`;
+
+    return redirectPath;
+  }
+
+  return null;
+};
+
+async function hasAccessToDocument(c: Context, documentId: number): Promise<string | null> {
+  const session = await getSession(c);
+
+  const userId = session.user.id;
+
+  const document = await prisma.document.findUnique({
+    where: {
+      id: documentId,
+      team: buildTeamWhereQuery({
+        userId,
+        teamId: undefined,
+      }),
+    },
+    select: {
+      team: {
+        select: {
+          url: true,
+        },
+      },
+    },
+  });
+
+  return document ? document.team.url : null;
+}
+
+async function hasAccessToFolder(c: Context, folderId: string): Promise<string | null> {
+  const session = await getSession(c);
+
+  const userId = session.user.id;
+
+  const folder = await prisma.folder.findUnique({
+    where: {
+      id: folderId,
+      team: buildTeamWhereQuery({
+        userId,
+        teamId: undefined,
+      }),
+    },
+    select: {
+      team: {
+        select: {
+          url: true,
+        },
+      },
+    },
+  });
+
+  return folder ? folder.team.url : null;
+}
+
+async function hasAccessToTemplate(c: Context, templateId: number): Promise<string | null> {
+  const session = await getSession(c);
+
+  const userId = session.user.id;
+
+  const template = await prisma.template.findUnique({
+    where: {
+      id: templateId,
+      team: buildTeamWhereQuery({
+        userId,
+        teamId: undefined,
+      }),
+    },
+    select: {
+      team: {
+        select: {
+          url: true,
+        },
+      },
+    },
+  });
+
+  return template ? template.team.url : null;
+}
diff --git a/packages/api/v1/contract.ts b/packages/api/v1/contract.ts
index 370a3b9a0..dcd0f13b1 100644
--- a/packages/api/v1/contract.ts
+++ b/packages/api/v1/contract.ts
@@ -13,12 +13,10 @@ import {
   ZDeleteRecipientMutationSchema,
   ZDownloadDocumentQuerySchema,
   ZDownloadDocumentSuccessfulSchema,
-  ZFindTeamMembersResponseSchema,
   ZGenerateDocumentFromTemplateMutationResponseSchema,
   ZGenerateDocumentFromTemplateMutationSchema,
   ZGetDocumentsQuerySchema,
   ZGetTemplatesQuerySchema,
-  ZInviteTeamMemberMutationSchema,
   ZNoBodyMutationSchema,
   ZResendDocumentForSigningMutationSchema,
   ZSendDocumentForSigningMutationSchema,
@@ -29,17 +27,13 @@ import {
   ZSuccessfulGetDocumentResponseSchema,
   ZSuccessfulGetTemplateResponseSchema,
   ZSuccessfulGetTemplatesResponseSchema,
-  ZSuccessfulInviteTeamMemberResponseSchema,
   ZSuccessfulRecipientResponseSchema,
-  ZSuccessfulRemoveTeamMemberResponseSchema,
   ZSuccessfulResendDocumentResponseSchema,
   ZSuccessfulResponseSchema,
   ZSuccessfulSigningResponseSchema,
-  ZSuccessfulUpdateTeamMemberResponseSchema,
   ZUnsuccessfulResponseSchema,
   ZUpdateFieldMutationSchema,
   ZUpdateRecipientMutationSchema,
-  ZUpdateTeamMemberMutationSchema,
 } from './schema';
 
 const c = initContract();
@@ -284,61 +278,6 @@ export const ApiContractV1 = c.router(
       },
       summary: 'Delete a field from a document',
     },
-
-    findTeamMembers: {
-      method: 'GET',
-      path: '/api/v1/team/:id/members',
-      responses: {
-        200: ZFindTeamMembersResponseSchema,
-        400: ZUnsuccessfulResponseSchema,
-        401: ZUnsuccessfulResponseSchema,
-        404: ZUnsuccessfulResponseSchema,
-        500: ZUnsuccessfulResponseSchema,
-      },
-      summary: 'List team members',
-    },
-
-    inviteTeamMember: {
-      method: 'POST',
-      path: '/api/v1/team/:id/members/invite',
-      body: ZInviteTeamMemberMutationSchema,
-      responses: {
-        200: ZSuccessfulInviteTeamMemberResponseSchema,
-        400: ZUnsuccessfulResponseSchema,
-        401: ZUnsuccessfulResponseSchema,
-        404: ZUnsuccessfulResponseSchema,
-        500: ZUnsuccessfulResponseSchema,
-      },
-      summary: 'Invite a member to a team',
-    },
-
-    updateTeamMember: {
-      method: 'PUT',
-      path: '/api/v1/team/:id/members/:memberId',
-      body: ZUpdateTeamMemberMutationSchema,
-      responses: {
-        200: ZSuccessfulUpdateTeamMemberResponseSchema,
-        400: ZUnsuccessfulResponseSchema,
-        401: ZUnsuccessfulResponseSchema,
-        404: ZUnsuccessfulResponseSchema,
-        500: ZUnsuccessfulResponseSchema,
-      },
-      summary: 'Update a team member',
-    },
-
-    removeTeamMember: {
-      method: 'DELETE',
-      path: '/api/v1/team/:id/members/:memberId',
-      body: null,
-      responses: {
-        200: ZSuccessfulRemoveTeamMemberResponseSchema,
-        400: ZUnsuccessfulResponseSchema,
-        401: ZUnsuccessfulResponseSchema,
-        404: ZUnsuccessfulResponseSchema,
-        500: ZUnsuccessfulResponseSchema,
-      },
-      summary: 'Remove a member from a team',
-    },
   },
   {
     baseHeaders: ZAuthorizationHeadersSchema,
diff --git a/packages/api/v1/implementation.ts b/packages/api/v1/implementation.ts
index 63058a043..819dc64b9 100644
--- a/packages/api/v1/implementation.ts
+++ b/packages/api/v1/implementation.ts
@@ -1,5 +1,5 @@
 import type { Prisma } from '@prisma/client';
-import { DocumentDataType, SigningStatus, TeamMemberRole } from '@prisma/client';
+import { DocumentDataType, SigningStatus } from '@prisma/client';
 import { tsr } from '@ts-rest/serverless/fetch';
 import { match } from 'ts-pattern';
 
@@ -27,9 +27,7 @@ import { deleteRecipient } from '@documenso/lib/server-only/recipient/delete-rec
 import { getRecipientByIdV1Api } from '@documenso/lib/server-only/recipient/get-recipient-by-id-v1-api';
 import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
 import { setDocumentRecipients } from '@documenso/lib/server-only/recipient/set-document-recipients';
-import { updateRecipient } from '@documenso/lib/server-only/recipient/update-recipient';
-import { createTeamMemberInvites } from '@documenso/lib/server-only/team/create-team-member-invites';
-import { deleteTeamMembers } from '@documenso/lib/server-only/team/delete-team-members';
+import { updateDocumentRecipients } from '@documenso/lib/server-only/recipient/update-document-recipients';
 import { createDocumentFromTemplate } from '@documenso/lib/server-only/template/create-document-from-template';
 import { createDocumentFromTemplateLegacy } from '@documenso/lib/server-only/template/create-document-from-template-legacy';
 import { deleteTemplate } from '@documenso/lib/server-only/template/delete-template';
@@ -52,6 +50,7 @@ import {
 } from '@documenso/lib/universal/upload/server-actions';
 import { isDocumentCompleted } from '@documenso/lib/utils/document';
 import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
+import { buildTeamWhereQuery } from '@documenso/lib/utils/teams';
 import { prisma } from '@documenso/prisma';
 
 import { ApiContractV1 } from './contract';
@@ -258,7 +257,7 @@ export const ApiContractV1Implementation = tsr.router(ApiContractV1, {
         };
       }
 
-      const { remaining } = await getServerLimits({ email: user.email, teamId: team?.id });
+      const { remaining } = await getServerLimits({ userId: user.id, teamId: team.id });
 
       if (remaining.documents <= 0) {
         return {
@@ -467,7 +466,7 @@ export const ApiContractV1Implementation = tsr.router(ApiContractV1, {
   createDocumentFromTemplate: authenticatedMiddleware(async (args, user, team, { metadata }) => {
     const { body, params } = args;
 
-    const { remaining } = await getServerLimits({ email: user.email, teamId: team?.id });
+    const { remaining } = await getServerLimits({ userId: user.id, teamId: team?.id });
 
     if (remaining.documents <= 0) {
       return {
@@ -565,7 +564,7 @@ export const ApiContractV1Implementation = tsr.router(ApiContractV1, {
   generateDocumentFromTemplate: authenticatedMiddleware(async (args, user, team, { metadata }) => {
     const { body, params } = args;
 
-    const { remaining } = await getServerLimits({ email: user.email, teamId: team?.id });
+    const { remaining } = await getServerLimits({ userId: user.id, teamId: team?.id });
 
     if (remaining.documents <= 0) {
       return {
@@ -879,18 +878,24 @@ export const ApiContractV1Implementation = tsr.router(ApiContractV1, {
       };
     }
 
-    const updatedRecipient = await updateRecipient({
-      documentId: Number(documentId),
-      recipientId: Number(recipientId),
+    const updatedRecipient = await updateDocumentRecipients({
       userId: user.id,
-      teamId: team?.id,
-      email,
-      name,
-      role,
-      signingOrder,
-      actionAuth: authOptions?.actionAuth ?? [],
-      requestMetadata: metadata.requestMetadata,
-    }).catch(() => null);
+      teamId: team.id,
+      documentId: Number(documentId),
+      recipients: [
+        {
+          id: Number(recipientId),
+          email,
+          name,
+          role,
+          signingOrder,
+          actionAuth: authOptions?.actionAuth ?? [],
+        },
+      ],
+      requestMetadata: metadata,
+    })
+      .then(({ recipients }) => recipients[0])
+      .catch(null);
 
     if (!updatedRecipient) {
       return {
@@ -973,17 +978,7 @@ export const ApiContractV1Implementation = tsr.router(ApiContractV1, {
       select: { id: true, status: true },
       where: {
         id: Number(documentId),
-        ...(team?.id
-          ? {
-              team: {
-                id: team.id,
-                members: { some: { userId: user.id } },
-              },
-            }
-          : {
-              userId: user.id,
-              teamId: null,
-            }),
+        team: buildTeamWhereQuery({ teamId: team.id, userId: user.id }),
       },
     });
 
@@ -1233,6 +1228,7 @@ export const ApiContractV1Implementation = tsr.router(ApiContractV1, {
     const document = await getDocumentById({
       documentId: Number(documentId),
       userId: user.id,
+      teamId: team.id,
     });
 
     if (!document) {
@@ -1257,7 +1253,6 @@ export const ApiContractV1Implementation = tsr.router(ApiContractV1, {
       userId: user.id,
       teamId: team?.id,
       fieldId: Number(fieldId),
-      documentId: Number(documentId),
     }).catch(() => null);
 
     if (!field) {
@@ -1322,272 +1317,6 @@ export const ApiContractV1Implementation = tsr.router(ApiContractV1, {
       },
     };
   }),
-
-  findTeamMembers: authenticatedMiddleware(async (args, user, team) => {
-    const { id: teamId } = args.params;
-
-    if (team?.id !== Number(teamId)) {
-      return {
-        status: 403,
-        body: {
-          message: 'You are not authorized to perform actions against this team.',
-        },
-      };
-    }
-
-    const self = await prisma.teamMember.findFirst({
-      where: {
-        userId: user.id,
-        teamId: team.id,
-      },
-    });
-
-    if (self?.role !== TeamMemberRole.ADMIN) {
-      return {
-        status: 403,
-        body: {
-          message: 'You are not authorized to perform actions against this team.',
-        },
-      };
-    }
-
-    const members = await prisma.teamMember.findMany({
-      where: {
-        teamId: team.id,
-      },
-      include: {
-        user: true,
-      },
-    });
-
-    return {
-      status: 200,
-      body: {
-        members: members.map((member) => ({
-          id: member.id,
-          email: member.user.email,
-          role: member.role,
-        })),
-      },
-    };
-  }),
-
-  inviteTeamMember: authenticatedMiddleware(async (args, user, team) => {
-    const { id: teamId } = args.params;
-
-    const { email, role } = args.body;
-
-    if (team?.id !== Number(teamId)) {
-      return {
-        status: 403,
-        body: {
-          message: 'You are not authorized to perform actions against this team.',
-        },
-      };
-    }
-
-    const self = await prisma.teamMember.findFirst({
-      where: {
-        userId: user.id,
-        teamId: team.id,
-      },
-    });
-
-    if (self?.role !== TeamMemberRole.ADMIN) {
-      return {
-        status: 403,
-        body: {
-          message: 'You are not authorized to perform actions against this team.',
-        },
-      };
-    }
-
-    const hasAlreadyBeenInvited = await prisma.teamMember.findFirst({
-      where: {
-        teamId: team.id,
-        user: {
-          email,
-        },
-      },
-    });
-
-    if (hasAlreadyBeenInvited) {
-      return {
-        status: 400,
-        body: {
-          message: 'This user has already been invited to the team',
-        },
-      };
-    }
-
-    await createTeamMemberInvites({
-      userId: user.id,
-      userName: user.name ?? '',
-      teamId: team.id,
-      invitations: [
-        {
-          email,
-          role,
-        },
-      ],
-    });
-
-    return {
-      status: 200,
-      body: {
-        message: 'An invite has been sent to the member',
-      },
-    };
-  }),
-
-  updateTeamMember: authenticatedMiddleware(async (args, user, team) => {
-    const { id: teamId, memberId } = args.params;
-
-    const { role } = args.body;
-
-    if (team?.id !== Number(teamId)) {
-      return {
-        status: 403,
-        body: {
-          message: 'You are not authorized to perform actions against this team.',
-        },
-      };
-    }
-
-    const self = await prisma.teamMember.findFirst({
-      where: {
-        userId: user.id,
-        teamId: team.id,
-      },
-    });
-
-    if (self?.role !== TeamMemberRole.ADMIN) {
-      return {
-        status: 403,
-        body: {
-          message: 'You are not authorized to perform actions against this team.',
-        },
-      };
-    }
-
-    const member = await prisma.teamMember.findFirst({
-      where: {
-        id: Number(memberId),
-        teamId: team.id,
-      },
-    });
-
-    if (!member) {
-      return {
-        status: 404,
-        body: {
-          message: 'The provided member id does not exist.',
-        },
-      };
-    }
-
-    const updatedMember = await prisma.teamMember.update({
-      where: {
-        id: member.id,
-      },
-      data: {
-        role,
-      },
-      include: {
-        user: true,
-      },
-    });
-
-    return {
-      status: 200,
-      body: {
-        id: updatedMember.id,
-        email: updatedMember.user.email,
-        role: updatedMember.role,
-      },
-    };
-  }),
-
-  removeTeamMember: authenticatedMiddleware(async (args, user, team) => {
-    const { id: teamId, memberId } = args.params;
-
-    if (team?.id !== Number(teamId)) {
-      return {
-        status: 403,
-        body: {
-          message: 'You are not authorized to perform actions against this team.',
-        },
-      };
-    }
-
-    const self = await prisma.teamMember.findFirst({
-      where: {
-        userId: user.id,
-        teamId: team.id,
-      },
-    });
-
-    if (self?.role !== TeamMemberRole.ADMIN) {
-      return {
-        status: 403,
-        body: {
-          message: 'You are not authorized to perform actions against this team.',
-        },
-      };
-    }
-
-    const member = await prisma.teamMember.findFirst({
-      where: {
-        id: Number(memberId),
-        teamId: Number(teamId),
-      },
-      include: {
-        user: true,
-      },
-    });
-
-    if (!member) {
-      return {
-        status: 404,
-        body: {
-          message: 'Member not found',
-        },
-      };
-    }
-
-    if (team.ownerUserId === member.userId) {
-      return {
-        status: 403,
-        body: {
-          message: 'You cannot remove the owner of the team',
-        },
-      };
-    }
-
-    if (member.userId === user.id) {
-      return {
-        status: 403,
-        body: {
-          message: 'You cannot remove yourself from the team',
-        },
-      };
-    }
-
-    await deleteTeamMembers({
-      userId: user.id,
-      teamId: team.id,
-      teamMemberIds: [member.id],
-    });
-
-    return {
-      status: 200,
-      body: {
-        id: member.id,
-        email: member.user.email,
-        role: member.role,
-      },
-    };
-  }),
 });
 
 const updateDocument = async ({
@@ -1599,26 +1328,13 @@ const updateDocument = async ({
   documentId: number;
   data: Prisma.DocumentUpdateInput;
   userId: number;
-  teamId?: number;
+  teamId: number;
 }) => {
   return await prisma.document.update({
     where: {
       id: documentId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      userId,
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
     data: {
       ...data,
diff --git a/packages/api/v1/middleware/authenticated.ts b/packages/api/v1/middleware/authenticated.ts
index abf1ebd3c..0249f2ebc 100644
--- a/packages/api/v1/middleware/authenticated.ts
+++ b/packages/api/v1/middleware/authenticated.ts
@@ -25,8 +25,8 @@ export const authenticatedMiddleware = <
 >(
   handler: (
     args: T & { req: TsRestRequest },
-    user: User,
-    team: Team | null | undefined,
+    user: Pick<User, 'id' | 'email' | 'name' | 'disabled'>,
+    team: Team,
     options: { metadata: ApiRequestMetadata },
   ) => Promise<R>,
 ) => {
diff --git a/packages/api/v1/schema.ts b/packages/api/v1/schema.ts
index 0b96c55ef..994f0fa49 100644
--- a/packages/api/v1/schema.ts
+++ b/packages/api/v1/schema.ts
@@ -8,7 +8,6 @@ import {
   RecipientRole,
   SendStatus,
   SigningStatus,
-  TeamMemberRole,
   TemplateType,
 } from '@prisma/client';
 import { z } from 'zod';
@@ -600,41 +599,3 @@ export const ZGetTemplatesQuerySchema = z.object({
   page: z.coerce.number().min(1).optional().default(1),
   perPage: z.coerce.number().min(1).optional().default(1),
 });
-
-export const ZFindTeamMembersResponseSchema = z.object({
-  members: z.array(
-    z.object({
-      id: z.number(),
-      email: z.string().email(),
-      role: z.nativeEnum(TeamMemberRole),
-    }),
-  ),
-});
-
-export const ZInviteTeamMemberMutationSchema = z.object({
-  email: z
-    .string()
-    .email()
-    .transform((email) => email.toLowerCase()),
-  role: z.nativeEnum(TeamMemberRole).optional().default(TeamMemberRole.MEMBER),
-});
-
-export const ZSuccessfulInviteTeamMemberResponseSchema = z.object({
-  message: z.string(),
-});
-
-export const ZUpdateTeamMemberMutationSchema = z.object({
-  role: z.nativeEnum(TeamMemberRole),
-});
-
-export const ZSuccessfulUpdateTeamMemberResponseSchema = z.object({
-  id: z.number(),
-  email: z.string().email(),
-  role: z.nativeEnum(TeamMemberRole),
-});
-
-export const ZSuccessfulRemoveTeamMemberResponseSchema = z.object({
-  id: z.number(),
-  email: z.string().email(),
-  role: z.nativeEnum(TeamMemberRole),
-});
diff --git a/packages/app-tests/e2e/api/v1/document-sending.spec.ts b/packages/app-tests/e2e/api/v1/document-sending.spec.ts
index 3b76dff3e..503c7335a 100644
--- a/packages/app-tests/e2e/api/v1/document-sending.spec.ts
+++ b/packages/app-tests/e2e/api/v1/document-sending.spec.ts
@@ -8,15 +8,17 @@ import { seedUser } from '@documenso/prisma/seed/users';
 
 test.describe('Document API', () => {
   test('sendDocument: should respect sendCompletionEmails setting', async ({ request }) => {
-    const user = await seedUser();
+    const { user, team } = await seedUser();
 
     const { document } = await seedPendingDocumentWithFullFields({
       owner: user,
       recipients: ['signer@example.com'],
+      teamId: team.id,
     });
 
     const { token } = await createApiToken({
       userId: user.id,
+      teamId: team.id,
       tokenName: 'test',
       expiresIn: null,
     });
@@ -81,11 +83,12 @@ test.describe('Document API', () => {
   test('sendDocument: should not modify email settings when sendCompletionEmails is not provided', async ({
     request,
   }) => {
-    const user = await seedUser();
+    const { user, team } = await seedUser();
 
     const { document } = await seedPendingDocumentWithFullFields({
       owner: user,
       recipients: ['signer@example.com'],
+      teamId: team.id,
     });
 
     // Set initial email settings
@@ -109,6 +112,7 @@ test.describe('Document API', () => {
 
     const { token } = await createApiToken({
       userId: user.id,
+      teamId: team.id,
       tokenName: 'test',
       expiresIn: null,
     });
diff --git a/packages/app-tests/e2e/api/v1/team-user-management.spec.ts b/packages/app-tests/e2e/api/v1/team-user-management.spec.ts
deleted file mode 100644
index 616add54b..000000000
--- a/packages/app-tests/e2e/api/v1/team-user-management.spec.ts
+++ /dev/null
@@ -1,281 +0,0 @@
-import { expect, test } from '@playwright/test';
-import { TeamMemberRole } from '@prisma/client';
-
-import {
-  ZFindTeamMembersResponseSchema,
-  ZSuccessfulInviteTeamMemberResponseSchema,
-  ZSuccessfulRemoveTeamMemberResponseSchema,
-  ZSuccessfulUpdateTeamMemberResponseSchema,
-  ZUnsuccessfulResponseSchema,
-} from '@documenso/api/v1/schema';
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { createApiToken } from '@documenso/lib/server-only/public-api/create-api-token';
-import { prisma } from '@documenso/prisma';
-import { seedTeam } from '@documenso/prisma/seed/teams';
-import { seedUser } from '@documenso/prisma/seed/users';
-
-test.describe('Team API', () => {
-  test('findTeamMembers: should list team members', async ({ request }) => {
-    const team = await seedTeam({
-      createTeamMembers: 3,
-    });
-
-    const ownerMember = team.members.find((member) => member.userId === team.owner.id)!;
-
-    // Should not be undefined
-    expect(ownerMember).toBeTruthy();
-
-    const { token } = await createApiToken({
-      userId: team.owner.id,
-      teamId: team.id,
-      tokenName: 'test',
-      expiresIn: null,
-    });
-
-    const response = await request.get(
-      `${NEXT_PUBLIC_WEBAPP_URL()}/api/v1/team/${team.id}/members`,
-      {
-        headers: {
-          Authorization: `Bearer ${token}`,
-        },
-      },
-    );
-
-    expect(response.ok()).toBeTruthy();
-    expect(response.status()).toBe(200);
-
-    const data = await response.json();
-
-    const parsed = ZFindTeamMembersResponseSchema.safeParse(data);
-
-    const safeData = parsed.success ? parsed.data : null;
-
-    expect(parsed.success).toBeTruthy();
-
-    expect(safeData!.members).toHaveLength(4); // Owner + 3 members
-    expect(safeData!.members[0]).toHaveProperty('id');
-    expect(safeData!.members[0]).toHaveProperty('email');
-    expect(safeData!.members[0]).toHaveProperty('role');
-
-    expect(safeData!.members).toContainEqual({
-      id: ownerMember.id,
-      email: ownerMember.user.email,
-      role: ownerMember.role,
-    });
-  });
-
-  test('inviteTeamMember: should invite a new team member', async ({ request }) => {
-    const team = await seedTeam();
-
-    const { token } = await createApiToken({
-      userId: team.owner.id,
-      teamId: team.id,
-      tokenName: 'test',
-      expiresIn: null,
-    });
-
-    const newUser = await seedUser();
-
-    const response = await request.post(
-      `${NEXT_PUBLIC_WEBAPP_URL()}/api/v1/team/${team.id}/members/invite`,
-      {
-        headers: {
-          Authorization: `Bearer ${token}`,
-          'Content-Type': 'application/json',
-        },
-        data: {
-          email: newUser.email,
-          role: TeamMemberRole.MEMBER,
-        },
-      },
-    );
-
-    expect(response.ok()).toBeTruthy();
-
-    const data = await response.json();
-
-    const parsed = ZSuccessfulInviteTeamMemberResponseSchema.safeParse(data);
-
-    const safeData = parsed.success ? parsed.data : null;
-
-    expect(parsed.success).toBeTruthy();
-    expect(safeData!.message).toBe('An invite has been sent to the member');
-
-    const invite = await prisma.teamMemberInvite.findFirst({
-      where: {
-        email: newUser.email,
-        teamId: team.id,
-      },
-    });
-
-    expect(invite).toBeTruthy();
-  });
-
-  test('updateTeamMember: should update a team member role', async ({ request }) => {
-    const team = await seedTeam({
-      createTeamMembers: 3,
-    });
-
-    const { token } = await createApiToken({
-      userId: team.owner.id,
-      teamId: team.id,
-      tokenName: 'test',
-      expiresIn: null,
-    });
-
-    const member = team.members.find((member) => member.role === TeamMemberRole.MEMBER)!;
-
-    // Should not be undefined
-    expect(member).toBeTruthy();
-
-    const response = await request.put(
-      `${NEXT_PUBLIC_WEBAPP_URL()}/api/v1/team/${team.id}/members/${member.id}`,
-      {
-        headers: {
-          Authorization: `Bearer ${token}`,
-          'Content-Type': 'application/json',
-        },
-        data: {
-          role: TeamMemberRole.ADMIN,
-        },
-      },
-    );
-
-    expect(response.ok()).toBeTruthy();
-
-    const data = await response.json();
-
-    const parsed = ZSuccessfulUpdateTeamMemberResponseSchema.safeParse(data);
-
-    const safeData = parsed.success ? parsed.data : null;
-
-    expect(parsed.success).toBeTruthy();
-
-    expect(safeData!.id).toBe(member.id);
-    expect(safeData!.email).toBe(member.user.email);
-    expect(safeData!.role).toBe(TeamMemberRole.ADMIN);
-  });
-
-  test('removeTeamMember: should remove a team member', async ({ request }) => {
-    const team = await seedTeam({
-      createTeamMembers: 3,
-    });
-
-    const { token } = await createApiToken({
-      userId: team.owner.id,
-      teamId: team.id,
-      tokenName: 'test',
-      expiresIn: null,
-    });
-
-    const member = team.members.find((member) => member.role === TeamMemberRole.MEMBER)!;
-
-    // Should not be undefined
-    expect(member).toBeTruthy();
-
-    const response = await request.delete(
-      `${NEXT_PUBLIC_WEBAPP_URL()}/api/v1/team/${team.id}/members/${member.id}`,
-      {
-        headers: {
-          Authorization: `Bearer ${token}`,
-        },
-      },
-    );
-
-    expect(response.status()).toBe(200);
-
-    const data = await response.json();
-
-    const parsed = ZSuccessfulRemoveTeamMemberResponseSchema.safeParse(data);
-
-    const safeData = parsed.success ? parsed.data : null;
-
-    expect(parsed.success).toBeTruthy();
-
-    expect(safeData!.id).toBe(member.id);
-    expect(safeData!.email).toBe(member.user.email);
-    expect(safeData!.role).toBe(member.role);
-
-    const removedMemberCount = await prisma.teamMember.count({
-      where: {
-        id: member.id,
-        teamId: team.id,
-      },
-    });
-
-    expect(removedMemberCount).toBe(0);
-  });
-
-  test('removeTeamMember: should not remove team owner', async ({ request }) => {
-    const team = await seedTeam({
-      createTeamMembers: 3,
-    });
-
-    const { token } = await createApiToken({
-      userId: team.owner.id,
-      teamId: team.id,
-      tokenName: 'test',
-      expiresIn: null,
-    });
-
-    const ownerMember = team.members.find((member) => member.userId === team.owner.id)!;
-
-    // Should not be undefined
-    expect(ownerMember).toBeTruthy();
-
-    const response = await request.delete(
-      `${NEXT_PUBLIC_WEBAPP_URL()}/api/v1/team/${team.id}/members/${ownerMember.id}`,
-      {
-        headers: {
-          Authorization: `Bearer ${token}`,
-        },
-      },
-    );
-
-    expect(response.status()).toBe(403);
-
-    const parsed = ZUnsuccessfulResponseSchema.safeParse(await response.json());
-
-    expect(parsed.success).toBeTruthy();
-  });
-
-  test('removeTeamMember: should not remove self', async ({ request }) => {
-    const team = await seedTeam({
-      createTeamMembers: 3,
-    });
-
-    const member = team.members.find((member) => member.role === TeamMemberRole.MEMBER)!;
-
-    // Make our non-owner member an admin
-    await prisma.teamMember.update({
-      where: {
-        id: member.id,
-      },
-      data: {
-        role: TeamMemberRole.ADMIN,
-      },
-    });
-
-    const { token } = await createApiToken({
-      userId: member.userId,
-      teamId: team.id,
-      tokenName: 'test',
-      expiresIn: null,
-    });
-
-    const response = await request.delete(
-      `${NEXT_PUBLIC_WEBAPP_URL()}/api/v1/team/${team.id}/members/${member.id}`,
-      {
-        headers: {
-          Authorization: `Bearer ${token}`,
-        },
-      },
-    );
-
-    expect(response.status()).toBe(403);
-
-    const parsed = ZUnsuccessfulResponseSchema.safeParse(await response.json());
-
-    expect(parsed.success).toBeTruthy();
-  });
-});
diff --git a/packages/app-tests/e2e/api/v1/template-field-prefill.spec.ts b/packages/app-tests/e2e/api/v1/template-field-prefill.spec.ts
index e95bb1556..c40605fa9 100644
--- a/packages/app-tests/e2e/api/v1/template-field-prefill.spec.ts
+++ b/packages/app-tests/e2e/api/v1/template-field-prefill.spec.ts
@@ -18,17 +18,18 @@ test.describe('Template Field Prefill API v1', () => {
     request,
   }) => {
     // 1. Create a user
-    const user = await seedUser();
+    const { user, team } = await seedUser();
 
     // 2. Create an API token for the user
     const { token } = await createApiToken({
       userId: user.id,
+      teamId: team.id,
       tokenName: 'test-token',
       expiresIn: null,
     });
 
     // 3. Create a template with seedBlankTemplate
-    const template = await seedBlankTemplate(user, {
+    const template = await seedBlankTemplate(user, team.id, {
       createTemplateOptions: {
         title: 'Template with Advanced Fields',
       },
@@ -349,17 +350,18 @@ test.describe('Template Field Prefill API v1', () => {
     request,
   }) => {
     // 1. Create a user
-    const user = await seedUser();
+    const { user, team } = await seedUser();
 
     // 2. Create an API token for the user
     const { token } = await createApiToken({
       userId: user.id,
+      teamId: team.id,
       tokenName: 'test-token',
       expiresIn: null,
     });
 
     // 3. Create a template with seedBlankTemplate
-    const template = await seedBlankTemplate(user, {
+    const template = await seedBlankTemplate(user, team.id, {
       createTemplateOptions: {
         title: 'Template with Default Fields',
       },
@@ -519,17 +521,18 @@ test.describe('Template Field Prefill API v1', () => {
 
   test('should handle invalid field prefill values', async ({ request }) => {
     // 1. Create a user
-    const user = await seedUser();
+    const { user, team } = await seedUser();
 
     // 2. Create an API token for the user
     const { token } = await createApiToken({
       userId: user.id,
+      teamId: team.id,
       tokenName: 'test-token',
       expiresIn: null,
     });
 
     // 3. Create a template using seedBlankTemplate
-    const template = await seedBlankTemplate(user, {
+    const template = await seedBlankTemplate(user, team.id, {
       createTemplateOptions: {
         title: 'Template for Invalid Test',
         visibility: 'EVERYONE',
diff --git a/packages/app-tests/e2e/api/v2/embedding-presign.spec.ts b/packages/app-tests/e2e/api/v2/embedding-presign.spec.ts
index ded3be7e1..e5f67ebdb 100644
--- a/packages/app-tests/e2e/api/v2/embedding-presign.spec.ts
+++ b/packages/app-tests/e2e/api/v2/embedding-presign.spec.ts
@@ -8,10 +8,11 @@ test.describe('Embedding Presign API', () => {
   test('createEmbeddingPresignToken: should create a token with default expiration', async ({
     request,
   }) => {
-    const user = await seedUser();
+    const { user, team } = await seedUser();
 
     const { token } = await createApiToken({
       userId: user.id,
+      teamId: team.id,
       tokenName: 'test',
       expiresIn: null,
     });
@@ -44,10 +45,11 @@ test.describe('Embedding Presign API', () => {
   test('createEmbeddingPresignToken: should create a token with custom expiration', async ({
     request,
   }) => {
-    const user = await seedUser();
+    const { user, team } = await seedUser();
 
     const { token } = await createApiToken({
       userId: user.id,
+      teamId: team.id,
       tokenName: 'test',
       expiresIn: null,
     });
@@ -81,10 +83,11 @@ test.describe('Embedding Presign API', () => {
   test.skip('createEmbeddingPresignToken: should create a token with immediate expiration in dev mode', async ({
     request,
   }) => {
-    const user = await seedUser();
+    const { user, team } = await seedUser();
 
     const { token } = await createApiToken({
       userId: user.id,
+      teamId: team.id,
       tokenName: 'test',
       expiresIn: null,
     });
@@ -116,10 +119,11 @@ test.describe('Embedding Presign API', () => {
   });
 
   test('verifyEmbeddingPresignToken: should verify a valid token', async ({ request }) => {
-    const user = await seedUser();
+    const { user, team } = await seedUser();
 
     const { token } = await createApiToken({
       userId: user.id,
+      teamId: team.id,
       tokenName: 'test',
       expiresIn: null,
     });
@@ -170,10 +174,11 @@ test.describe('Embedding Presign API', () => {
   });
 
   test('verifyEmbeddingPresignToken: should reject an invalid token', async ({ request }) => {
-    const user = await seedUser();
+    const { user, team } = await seedUser();
 
     const { token } = await createApiToken({
       userId: user.id,
+      teamId: team.id,
       tokenName: 'test',
       expiresIn: null,
     });
diff --git a/packages/app-tests/e2e/api/v2/template-field-prefill.spec.ts b/packages/app-tests/e2e/api/v2/template-field-prefill.spec.ts
index ee0053c01..6288ae5cf 100644
--- a/packages/app-tests/e2e/api/v2/template-field-prefill.spec.ts
+++ b/packages/app-tests/e2e/api/v2/template-field-prefill.spec.ts
@@ -18,17 +18,18 @@ test.describe('Template Field Prefill API v2', () => {
     request,
   }) => {
     // 1. Create a user
-    const user = await seedUser();
+    const { user, team } = await seedUser();
 
     // 2. Create an API token for the user
     const { token } = await createApiToken({
       userId: user.id,
+      teamId: team.id,
       tokenName: 'test-token',
       expiresIn: null,
     });
 
     // 3. Create a template with seedBlankTemplate
-    const template = await seedBlankTemplate(user, {
+    const template = await seedBlankTemplate(user, team.id, {
       createTemplateOptions: {
         title: 'Template with Advanced Fields V2',
       },
@@ -346,17 +347,18 @@ test.describe('Template Field Prefill API v2', () => {
     request,
   }) => {
     // 1. Create a user
-    const user = await seedUser();
+    const { user, team } = await seedUser();
 
     // 2. Create an API token for the user
     const { token } = await createApiToken({
       userId: user.id,
+      teamId: team.id,
       tokenName: 'test-token',
       expiresIn: null,
     });
 
     // 3. Create a template with seedBlankTemplate
-    const template = await seedBlankTemplate(user, {
+    const template = await seedBlankTemplate(user, team.id, {
       createTemplateOptions: {
         title: 'Template with Default Fields V2',
       },
@@ -511,17 +513,18 @@ test.describe('Template Field Prefill API v2', () => {
 
   test('should handle invalid field prefill values', async ({ request }) => {
     // 1. Create a user
-    const user = await seedUser();
+    const { user, team } = await seedUser();
 
     // 2. Create an API token for the user
     const { token } = await createApiToken({
       userId: user.id,
+      teamId: team.id,
       tokenName: 'test-token',
       expiresIn: null,
     });
 
     // 3. Create a template using seedBlankTemplate
-    const template = await seedBlankTemplate(user, {
+    const template = await seedBlankTemplate(user, team.id, {
       createTemplateOptions: {
         title: 'Template for Invalid Test V2',
         visibility: 'EVERYONE',
diff --git a/packages/app-tests/e2e/command-menu/document-search.spec.ts b/packages/app-tests/e2e/command-menu/document-search.spec.ts
index bc1a934d0..0c20b6090 100644
--- a/packages/app-tests/e2e/command-menu/document-search.spec.ts
+++ b/packages/app-tests/e2e/command-menu/document-search.spec.ts
@@ -6,9 +6,9 @@ import { seedUser } from '@documenso/prisma/seed/users';
 import { apiSignin } from '../fixtures/authentication';
 
 test('[COMMAND_MENU]: should see sent documents', async ({ page }) => {
-  const user = await seedUser();
-  const recipient = await seedUser();
-  const document = await seedPendingDocument(user, [recipient]);
+  const { user, team } = await seedUser();
+  const { user: recipient } = await seedUser();
+  const document = await seedPendingDocument(user, team.id, [recipient]);
 
   await apiSignin({
     page,
@@ -22,9 +22,9 @@ test('[COMMAND_MENU]: should see sent documents', async ({ page }) => {
 });
 
 test('[COMMAND_MENU]: should see received documents', async ({ page }) => {
-  const user = await seedUser();
-  const recipient = await seedUser();
-  const document = await seedPendingDocument(user, [recipient]);
+  const { user, team } = await seedUser();
+  const { user: recipient } = await seedUser();
+  const document = await seedPendingDocument(user, team.id, [recipient]);
 
   await apiSignin({
     page,
@@ -38,9 +38,9 @@ test('[COMMAND_MENU]: should see received documents', async ({ page }) => {
 });
 
 test('[COMMAND_MENU]: should be able to search by recipient', async ({ page }) => {
-  const user = await seedUser();
-  const recipient = await seedUser();
-  const document = await seedPendingDocument(user, [recipient]);
+  const { user, team } = await seedUser();
+  const { user: recipient } = await seedUser();
+  const document = await seedPendingDocument(user, team.id, [recipient]);
 
   await apiSignin({
     page,
diff --git a/packages/app-tests/e2e/document-auth/access-auth.spec.ts b/packages/app-tests/e2e/document-auth/access-auth.spec.ts
index 8c96a9c4b..87783a1cf 100644
--- a/packages/app-tests/e2e/document-auth/access-auth.spec.ts
+++ b/packages/app-tests/e2e/document-auth/access-auth.spec.ts
@@ -8,11 +8,11 @@ import { seedUser } from '@documenso/prisma/seed/users';
 import { apiSignin } from '../fixtures/authentication';
 
 test('[DOCUMENT_AUTH]: should grant access when not required', async ({ page }) => {
-  const user = await seedUser();
+  const { user, team } = await seedUser();
 
-  const recipientWithAccount = await seedUser();
+  const { user: recipientWithAccount } = await seedUser();
 
-  const document = await seedPendingDocument(user, [
+  const document = await seedPendingDocument(user, team.id, [
     recipientWithAccount,
     'recipientwithoutaccount@documenso.com',
   ]);
@@ -32,12 +32,13 @@ test('[DOCUMENT_AUTH]: should grant access when not required', async ({ page })
 });
 
 test('[DOCUMENT_AUTH]: should allow or deny access when required', async ({ page }) => {
-  const user = await seedUser();
+  const { user, team } = await seedUser();
 
-  const recipientWithAccount = await seedUser();
+  const { user: recipientWithAccount } = await seedUser();
 
   const document = await seedPendingDocument(
     user,
+    team.id,
     [recipientWithAccount, 'recipientwithoutaccount@documenso.com'],
     {
       createDocumentOptions: {
diff --git a/packages/app-tests/e2e/document-auth/action-auth.spec.ts b/packages/app-tests/e2e/document-auth/action-auth.spec.ts
index c93c3f88e..bc1cb5747 100644
--- a/packages/app-tests/e2e/document-auth/action-auth.spec.ts
+++ b/packages/app-tests/e2e/document-auth/action-auth.spec.ts
@@ -18,12 +18,13 @@ import { signSignaturePad } from '../fixtures/signature';
 test.describe.configure({ mode: 'parallel', timeout: 60000 });
 
 test('[DOCUMENT_AUTH]: should allow signing when no auth setup', async ({ page }) => {
-  const user = await seedUser();
+  const { user, team } = await seedUser();
 
-  const recipientWithAccount = await seedUser();
+  const { user: recipientWithAccount } = await seedUser();
 
   const { recipients } = await seedPendingDocumentWithFullFields({
     owner: user,
+    teamId: team.id,
     recipients: [recipientWithAccount, seedTestEmail()],
   });
 
@@ -56,12 +57,13 @@ test('[DOCUMENT_AUTH]: should allow signing when no auth setup', async ({ page }
 });
 
 test('[DOCUMENT_AUTH]: should allow signing with valid global auth', async ({ page }) => {
-  const user = await seedUser();
+  const { user, team } = await seedUser();
 
-  const recipientWithAccount = await seedUser();
+  const { user: recipientWithAccount } = await seedUser();
 
   const { recipients } = await seedPendingDocumentWithFullFields({
     owner: user,
+    teamId: team.id,
     recipients: [recipientWithAccount],
     updateDocumentOptions: {
       authOptions: createDocumentAuthOptions({
@@ -107,12 +109,13 @@ test('[DOCUMENT_AUTH]: should allow signing with valid global auth', async ({ pa
 test.skip('[DOCUMENT_AUTH]: should deny signing document when required for global auth', async ({
   page,
 }) => {
-  const user = await seedUser();
+  const { user, team } = await seedUser();
 
-  const recipientWithAccount = await seedUser();
+  const { user: recipientWithAccount } = await seedUser();
 
   const { recipients } = await seedPendingDocumentNoFields({
     owner: user,
+    teamId: team.id,
     recipients: [recipientWithAccount],
     updateDocumentOptions: {
       authOptions: createDocumentAuthOptions({
@@ -138,12 +141,13 @@ test.skip('[DOCUMENT_AUTH]: should deny signing document when required for globa
 test('[DOCUMENT_AUTH]: should deny signing fields when required for global auth', async ({
   page,
 }) => {
-  const user = await seedUser();
+  const { user, team } = await seedUser();
 
-  const recipientWithAccount = await seedUser();
+  const { user: recipientWithAccount } = await seedUser();
 
   const { recipients } = await seedPendingDocumentWithFullFields({
     owner: user,
+    teamId: team.id,
     recipients: [recipientWithAccount, seedTestEmail()],
     updateDocumentOptions: {
       authOptions: createDocumentAuthOptions({
@@ -177,14 +181,15 @@ test('[DOCUMENT_AUTH]: should deny signing fields when required for global auth'
 test('[DOCUMENT_AUTH]: should allow field signing when required for recipient auth', async ({
   page,
 }) => {
-  const user = await seedUser();
+  const { user, team } = await seedUser();
 
-  const recipientWithInheritAuth = await seedUser();
-  const recipientWithExplicitNoneAuth = await seedUser();
-  const recipientWithExplicitAccountAuth = await seedUser();
+  const { user: recipientWithInheritAuth } = await seedUser();
+  const { user: recipientWithExplicitNoneAuth } = await seedUser();
+  const { user: recipientWithExplicitAccountAuth } = await seedUser();
 
   const { recipients } = await seedPendingDocumentWithFullFields({
     owner: user,
+    teamId: team.id,
     recipients: [
       recipientWithInheritAuth,
       recipientWithExplicitNoneAuth,
@@ -276,14 +281,15 @@ test('[DOCUMENT_AUTH]: should allow field signing when required for recipient au
 test('[DOCUMENT_AUTH]: should allow field signing when required for recipient and global auth', async ({
   page,
 }) => {
-  const user = await seedUser();
+  const { user, team } = await seedUser();
 
-  const recipientWithInheritAuth = await seedUser();
-  const recipientWithExplicitNoneAuth = await seedUser();
-  const recipientWithExplicitAccountAuth = await seedUser();
+  const { user: recipientWithInheritAuth } = await seedUser();
+  const { user: recipientWithExplicitNoneAuth } = await seedUser();
+  const { user: recipientWithExplicitAccountAuth } = await seedUser();
 
   const { recipients } = await seedPendingDocumentWithFullFields({
     owner: user,
+    teamId: team.id,
     recipients: [
       recipientWithInheritAuth,
       recipientWithExplicitNoneAuth,
diff --git a/packages/app-tests/e2e/document-auth/next-recipient-dictation.spec.ts b/packages/app-tests/e2e/document-auth/next-recipient-dictation.spec.ts
index 3130404f5..a925388df 100644
--- a/packages/app-tests/e2e/document-auth/next-recipient-dictation.spec.ts
+++ b/packages/app-tests/e2e/document-auth/next-recipient-dictation.spec.ts
@@ -16,13 +16,14 @@ import { signDirectSignaturePad, signSignaturePad } from '../fixtures/signature'
 test('[NEXT_RECIPIENT_DICTATION]: should allow updating next recipient when dictation is enabled', async ({
   page,
 }) => {
-  const user = await seedUser();
-  const firstSigner = await seedUser();
-  const secondSigner = await seedUser();
-  const thirdSigner = await seedUser();
+  const { user, team } = await seedUser();
+  const { user: firstSigner } = await seedUser();
+  const { user: secondSigner } = await seedUser();
+  const { user: thirdSigner } = await seedUser();
 
   const { recipients, document } = await seedPendingDocumentWithFullFields({
     owner: user,
+    teamId: team.id,
     recipients: [firstSigner, secondSigner, thirdSigner],
     recipientsCreateOptions: [{ signingOrder: 1 }, { signingOrder: 2 }, { signingOrder: 3 }],
     updateDocumentOptions: {
@@ -109,12 +110,13 @@ test('[NEXT_RECIPIENT_DICTATION]: should allow updating next recipient when dict
 });
 
 test('[NEXT_RECIPIENT_DICTATION]: should not show dictation UI when disabled', async ({ page }) => {
-  const user = await seedUser();
-  const firstSigner = await seedUser();
-  const secondSigner = await seedUser();
+  const { user, team } = await seedUser();
+  const { user: firstSigner } = await seedUser();
+  const { user: secondSigner } = await seedUser();
 
   const { recipients, document } = await seedPendingDocumentWithFullFields({
     owner: user,
+    teamId: team.id,
     recipients: [firstSigner, secondSigner],
     recipientsCreateOptions: [{ signingOrder: 1 }, { signingOrder: 2 }],
     updateDocumentOptions: {
@@ -194,12 +196,13 @@ test('[NEXT_RECIPIENT_DICTATION]: should not show dictation UI when disabled', a
 });
 
 test('[NEXT_RECIPIENT_DICTATION]: should work with parallel signing flow', async ({ page }) => {
-  const user = await seedUser();
-  const firstSigner = await seedUser();
-  const secondSigner = await seedUser();
+  const { user, team } = await seedUser();
+  const { user: firstSigner } = await seedUser();
+  const { user: secondSigner } = await seedUser();
 
   const { recipients, document } = await seedPendingDocumentWithFullFields({
     owner: user,
+    teamId: team.id,
     recipients: [firstSigner, secondSigner],
     recipientsCreateOptions: [{ signingOrder: 1 }, { signingOrder: 2 }],
     updateDocumentOptions: {
@@ -278,13 +281,14 @@ test('[NEXT_RECIPIENT_DICTATION]: should work with parallel signing flow', async
 test('[NEXT_RECIPIENT_DICTATION]: should allow assistant to dictate next signer', async ({
   page,
 }) => {
-  const user = await seedUser();
-  const assistant = await seedUser();
-  const signer = await seedUser();
-  const thirdSigner = await seedUser();
+  const { user, team } = await seedUser();
+  const { user: assistant } = await seedUser();
+  const { user: signer } = await seedUser();
+  const { user: thirdSigner } = await seedUser();
 
   const { recipients, document } = await seedPendingDocumentWithFullFields({
     owner: user,
+    teamId: team.id,
     recipients: [assistant, signer, thirdSigner],
     recipientsCreateOptions: [
       { signingOrder: 1, role: RecipientRole.ASSISTANT },
diff --git a/packages/app-tests/e2e/document-flow/settings-step.spec.ts b/packages/app-tests/e2e/document-flow/settings-step.spec.ts
index d3115e584..159f00bf1 100644
--- a/packages/app-tests/e2e/document-flow/settings-step.spec.ts
+++ b/packages/app-tests/e2e/document-flow/settings-step.spec.ts
@@ -5,137 +5,18 @@ import {
   seedDraftDocument,
   seedPendingDocument,
 } from '@documenso/prisma/seed/documents';
-import { seedUserSubscription } from '@documenso/prisma/seed/subscriptions';
-import { seedTeam } from '@documenso/prisma/seed/teams';
 import { seedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin } from '../fixtures/authentication';
 
-test.describe('[EE_ONLY]', () => {
-  // eslint-disable-next-line turbo/no-undeclared-env-vars
-  const enterprisePriceId = process.env.NEXT_PUBLIC_STRIPE_ENTERPRISE_PLAN_MONTHLY_PRICE_ID || '';
-
-  test.beforeEach(() => {
-    test.skip(
-      process.env.NEXT_PUBLIC_FEATURE_BILLING_ENABLED !== 'true' || !enterprisePriceId,
-      'Billing required for this test',
-    );
-  });
-
-  test('[DOCUMENT_FLOW] add action auth settings', async ({ page }) => {
-    const user = await seedUser();
-
-    await seedUserSubscription({
-      userId: user.id,
-      priceId: enterprisePriceId,
-    });
-
-    const document = await seedBlankDocument(user);
-
-    await apiSignin({
-      page,
-      email: user.email,
-      redirectPath: `/documents/${document.id}/edit`,
-    });
-
-    // Set EE action auth.
-    await page.getByTestId('documentActionSelectValue').click();
-    await page.getByRole('option').filter({ hasText: 'Require passkey' }).click();
-    await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require passkey');
-
-    // Save the settings by going to the next step.
-    await page.getByRole('button', { name: 'Continue' }).click();
-    await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
-
-    // Return to the settings step to check that the results are saved correctly.
-    await page.getByRole('button', { name: 'Go Back' }).click();
-    await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
-
-    await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require passkey');
-  });
-
-  test('[DOCUMENT_FLOW] enterprise team member can add action auth settings', async ({ page }) => {
-    const team = await seedTeam({
-      createTeamMembers: 1,
-    });
-
-    const owner = team.owner;
-    const teamMemberUser = team.members[1].user;
-
-    // Make the team enterprise by giving the owner the enterprise subscription.
-    await seedUserSubscription({
-      userId: team.ownerUserId,
-      priceId: enterprisePriceId,
-    });
-
-    const document = await seedBlankDocument(owner, {
-      createDocumentOptions: {
-        teamId: team.id,
-      },
-    });
-
-    await apiSignin({
-      page,
-      email: teamMemberUser.email,
-      redirectPath: `/t/${team.url}/documents/${document.id}/edit`,
-    });
-
-    // Set EE action auth.
-    await page.getByTestId('documentActionSelectValue').click();
-    await page.getByRole('option').filter({ hasText: 'Require passkey' }).click();
-    await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require passkey');
-
-    // Save the settings by going to the next step.
-    await page.getByRole('button', { name: 'Continue' }).click();
-    await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
-
-    // Advanced settings should be visible.
-    await expect(page.getByLabel('Show advanced settings')).toBeVisible();
-  });
-
-  test('[DOCUMENT_FLOW] enterprise team member should not have access to enterprise on personal account', async ({
-    page,
-  }) => {
-    const team = await seedTeam({
-      createTeamMembers: 1,
-    });
-
-    const teamMemberUser = team.members[1].user;
-
-    // Make the team enterprise by giving the owner the enterprise subscription.
-    await seedUserSubscription({
-      userId: team.ownerUserId,
-      priceId: enterprisePriceId,
-    });
-
-    const document = await seedBlankDocument(teamMemberUser);
-
-    await apiSignin({
-      page,
-      email: teamMemberUser.email,
-      redirectPath: `/documents/${document.id}/edit`,
-    });
-
-    // Global action auth should not be visible.
-    await expect(page.getByTestId('documentActionSelectValue')).not.toBeVisible();
-
-    // Next step.
-    await page.getByRole('button', { name: 'Continue' }).click();
-    await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
-
-    // Advanced settings should not be visible.
-    await expect(page.getByLabel('Show advanced settings')).not.toBeVisible();
-  });
-});
-
 test('[DOCUMENT_FLOW]: add settings', async ({ page }) => {
-  const user = await seedUser();
-  const document = await seedBlankDocument(user);
+  const { user, team } = await seedUser();
+  const document = await seedBlankDocument(user, team.id);
 
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/documents/${document.id}/edit`,
+    redirectPath: `/t/${team.url}/documents/${document.id}/edit`,
   });
 
   // Set title.
@@ -163,21 +44,21 @@ test('[DOCUMENT_FLOW]: add settings', async ({ page }) => {
 });
 
 test('[DOCUMENT_FLOW]: title should be disabled depending on document status', async ({ page }) => {
-  const user = await seedUser();
+  const { user, team } = await seedUser();
 
-  const pendingDocument = await seedPendingDocument(user, []);
-  const draftDocument = await seedDraftDocument(user, []);
+  const pendingDocument = await seedPendingDocument(user, team.id, []);
+  const draftDocument = await seedDraftDocument(user, team.id, []);
 
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/documents/${pendingDocument.id}/edit`,
+    redirectPath: `/t/${team.url}/documents/${pendingDocument.id}/edit`,
   });
 
   // Should be disabled for pending documents.
   await expect(page.getByLabel('Title')).toBeDisabled();
 
   // Should be enabled for draft documents.
-  await page.goto(`/documents/${draftDocument.id}/edit`);
+  await page.goto(`/t/${team.url}/documents/${draftDocument.id}/edit`);
   await expect(page.getByLabel('Title')).toBeEnabled();
 });
diff --git a/packages/app-tests/e2e/document-flow/signers-step.spec.ts b/packages/app-tests/e2e/document-flow/signers-step.spec.ts
index 22a8b2399..8bde0d0b3 100644
--- a/packages/app-tests/e2e/document-flow/signers-step.spec.ts
+++ b/packages/app-tests/e2e/document-flow/signers-step.spec.ts
@@ -1,71 +1,18 @@
 import { expect, test } from '@playwright/test';
 
 import { seedBlankDocument } from '@documenso/prisma/seed/documents';
-import { seedUserSubscription } from '@documenso/prisma/seed/subscriptions';
 import { seedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin } from '../fixtures/authentication';
 
-test.describe('[EE_ONLY]', () => {
-  // eslint-disable-next-line turbo/no-undeclared-env-vars
-  const enterprisePriceId = process.env.NEXT_PUBLIC_STRIPE_ENTERPRISE_PLAN_MONTHLY_PRICE_ID || '';
-
-  test.beforeEach(() => {
-    test.skip(
-      process.env.NEXT_PUBLIC_FEATURE_BILLING_ENABLED !== 'true' || !enterprisePriceId,
-      'Billing required for this test',
-    );
-  });
-
-  test('[DOCUMENT_FLOW] add EE settings', async ({ page }) => {
-    const user = await seedUser();
-
-    await seedUserSubscription({
-      userId: user.id,
-      priceId: enterprisePriceId,
-    });
-
-    const document = await seedBlankDocument(user);
-
-    await apiSignin({
-      page,
-      email: user.email,
-      redirectPath: `/documents/${document.id}/edit`,
-    });
-
-    // Save the settings by going to the next step.
-    await page.getByRole('button', { name: 'Continue' }).click();
-    await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
-
-    // Add 2 signers.
-    await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
-    await page.getByPlaceholder('Name').fill('Recipient 1');
-
-    await page.getByRole('button', { name: 'Add Signer' }).click();
-    await page.getByLabel('Email').nth(1).fill('recipient2@documenso.com');
-    await page.getByLabel('Name').nth(1).fill('Recipient 2');
-
-    // Display advanced settings.
-    await page.getByLabel('Show advanced settings').check();
-
-    // Navigate to the next step and back.
-    await page.getByRole('button', { name: 'Continue' }).click();
-    await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-    await page.getByRole('button', { name: 'Go Back' }).click();
-    await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
-
-    // Todo: Fix stepper component back issue before finishing test.
-  });
-});
-
 test('[DOCUMENT_FLOW]: add signers', async ({ page }) => {
-  const user = await seedUser();
-  const document = await seedBlankDocument(user);
+  const { user, team } = await seedUser();
+  const document = await seedBlankDocument(user, team.id);
 
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/documents/${document.id}/edit`,
+    redirectPath: `/t/${team.url}/documents/${document.id}/edit`,
   });
 
   // Save the settings by going to the next step.
diff --git a/packages/app-tests/e2e/document-flow/stepper-component.spec.ts b/packages/app-tests/e2e/document-flow/stepper-component.spec.ts
index 169b5abce..26a134185 100644
--- a/packages/app-tests/e2e/document-flow/stepper-component.spec.ts
+++ b/packages/app-tests/e2e/document-flow/stepper-component.spec.ts
@@ -35,11 +35,12 @@ const getDocumentByToken = async (token: string) => {
 };
 
 test('[DOCUMENT_FLOW]: should be able to upload a PDF document', async ({ page }) => {
-  const user = await seedUser();
+  const { user, team } = await seedUser();
 
   await apiSignin({
     page,
     email: user.email,
+    redirectPath: `/t/${team.url}/documents`,
   });
 
   // Upload document.
@@ -58,17 +59,17 @@ test('[DOCUMENT_FLOW]: should be able to upload a PDF document', async ({ page }
   await fileChooser.setFiles(path.join(__dirname, '../../../../assets/example.pdf'));
 
   // Wait to be redirected to the edit page.
-  await page.waitForURL(/\/documents\/\d+/);
+  await page.waitForURL(new RegExp(`/t/${team.url}/documents/\\d+`));
 });
 
 test('[DOCUMENT_FLOW]: should be able to create a document', async ({ page }) => {
-  const user = await seedUser();
-  const document = await seedBlankDocument(user);
+  const { user, team } = await seedUser();
+  const document = await seedBlankDocument(user, team.id);
 
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/documents/${document.id}/edit`,
+    redirectPath: `/t/${team.url}/documents/${document.id}/edit`,
   });
 
   const documentTitle = `example-${Date.now()}.pdf`;
@@ -114,7 +115,7 @@ test('[DOCUMENT_FLOW]: should be able to create a document', async ({ page }) =>
   await page.waitForTimeout(2500);
   await page.getByRole('button', { name: 'Send' }).click();
 
-  await page.waitForURL('/documents');
+  await page.waitForURL(new RegExp(`/t/${team.url}/documents/\\d+`));
 
   // Assert document was created
   await expect(page.getByRole('link', { name: documentTitle })).toBeVisible();
@@ -123,13 +124,13 @@ test('[DOCUMENT_FLOW]: should be able to create a document', async ({ page }) =>
 test('[DOCUMENT_FLOW]: should be able to create a document with multiple recipients', async ({
   page,
 }) => {
-  const user = await seedUser();
-  const document = await seedBlankDocument(user);
+  const { user, team } = await seedUser();
+  const document = await seedBlankDocument(user, team.id);
 
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/documents/${document.id}/edit`,
+    redirectPath: `/t/${team.url}/documents/${document.id}/edit`,
   });
 
   const documentTitle = `example-${Date.now()}.pdf`;
@@ -199,7 +200,7 @@ test('[DOCUMENT_FLOW]: should be able to create a document with multiple recipie
   await page.waitForTimeout(2500);
   await page.getByRole('button', { name: 'Send' }).click();
 
-  await page.waitForURL('/documents');
+  await page.waitForURL(new RegExp(`/t/${team.url}/documents/\\d+`));
 
   // Assert document was created
   await expect(page.getByRole('link', { name: documentTitle })).toBeVisible();
@@ -208,13 +209,13 @@ test('[DOCUMENT_FLOW]: should be able to create a document with multiple recipie
 test('[DOCUMENT_FLOW]: should be able to create a document with multiple recipients with different roles', async ({
   page,
 }) => {
-  const user = await seedUser();
-  const document = await seedBlankDocument(user);
+  const { user, team } = await seedUser();
+  const document = await seedBlankDocument(user, team.id);
 
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/documents/${document.id}/edit`,
+    redirectPath: `/t/${team.url}/documents/${document.id}/edit`,
   });
 
   // Set title
@@ -297,7 +298,7 @@ test('[DOCUMENT_FLOW]: should be able to create a document with multiple recipie
   await page.waitForTimeout(2500);
   await page.getByRole('button', { name: 'Send' }).click();
 
-  await page.waitForURL('/documents');
+  await page.waitForURL(new RegExp(`/t/${team.url}/documents/\\d+`));
 
   // Assert document was created
   await expect(page.getByRole('link', { name: 'Test Title' })).toBeVisible();
@@ -306,13 +307,13 @@ test('[DOCUMENT_FLOW]: should be able to create a document with multiple recipie
 test('[DOCUMENT_FLOW]: should not be able to create a document without signatures', async ({
   page,
 }) => {
-  const user = await seedUser();
-  const document = await seedBlankDocument(user);
+  const { user, team } = await seedUser();
+  const document = await seedBlankDocument(user, team.id);
 
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/documents/${document.id}/edit`,
+    redirectPath: `/t/${team.url}/documents/${document.id}/edit`,
   });
 
   const documentTitle = `example-${Date.now()}.pdf`;
@@ -342,10 +343,11 @@ test('[DOCUMENT_FLOW]: should not be able to create a document without signature
 });
 
 test('[DOCUMENT_FLOW]: should be able to approve a document', async ({ page }) => {
-  const user = await seedUser();
+  const { user, team } = await seedUser();
 
   const { recipients } = await seedPendingDocumentWithFullFields({
     owner: user,
+    teamId: team.id,
     recipients: ['user@documenso.com', 'approver@documenso.com'],
     recipientsCreateOptions: [
       {
@@ -393,13 +395,13 @@ test('[DOCUMENT_FLOW]: should be able to approve a document', async ({ page }) =
 test('[DOCUMENT_FLOW]: should be able to create, send with redirect url, sign a document and redirect to redirect url', async ({
   page,
 }) => {
-  const user = await seedUser();
-  const document = await seedBlankDocument(user);
+  const { user, team } = await seedUser();
+  const document = await seedBlankDocument(user, team.id);
 
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/documents/${document.id}/edit`,
+    redirectPath: `/t/${team.url}/documents/${document.id}/edit`,
   });
 
   const documentTitle = `example-${Date.now()}.pdf`;
@@ -430,12 +432,12 @@ test('[DOCUMENT_FLOW]: should be able to create, send with redirect url, sign a
   await page.waitForTimeout(2500);
   await page.getByRole('button', { name: 'Send' }).click();
 
-  await page.waitForURL('/documents');
+  await page.waitForURL(`/t/${team.url}/documents`);
 
   // Assert document was created
   await expect(page.getByRole('link', { name: documentTitle })).toBeVisible();
   await page.getByRole('link', { name: documentTitle }).click();
-  await page.waitForURL(/\/documents\/\d+/);
+  await page.waitForURL(new RegExp(`/t/${team.url}/documents/\\d+`));
 
   const url = page.url().split('/');
   const documentId = url[url.length - 1];
@@ -467,11 +469,12 @@ test('[DOCUMENT_FLOW]: should be able to create, send with redirect url, sign a
 });
 
 test('[DOCUMENT_FLOW]: should be able to sign a document with custom date', async ({ page }) => {
-  const user = await seedUser();
+  const { user, team } = await seedUser();
 
   const now = DateTime.utc();
 
   const { document, recipients } = await seedPendingDocumentWithFullFields({
+    teamId: team.id,
     owner: user,
     recipients: ['user1@example.com'],
     fields: [FieldType.DATE],
@@ -516,13 +519,13 @@ test('[DOCUMENT_FLOW]: should be able to sign a document with custom date', asyn
 test('[DOCUMENT_FLOW]: should be able to create and sign a document with 3 recipients in sequential order', async ({
   page,
 }) => {
-  const user = await seedUser();
-  const document = await seedBlankDocument(user);
+  const { user, team } = await seedUser();
+  const document = await seedBlankDocument(user, team.id);
 
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/documents/${document.id}/edit`,
+    redirectPath: `/t/${team.url}/documents/${document.id}/edit`,
   });
 
   const documentTitle = `Sequential-Signing-${Date.now()}.pdf`;
@@ -579,7 +582,7 @@ test('[DOCUMENT_FLOW]: should be able to create and sign a document with 3 recip
   await page.waitForTimeout(2500);
   await page.getByRole('button', { name: 'Send' }).click();
 
-  await page.waitForURL('/documents');
+  await page.waitForURL(new RegExp(`/t/${team.url}/documents/\\d+`));
 
   await expect(page.getByRole('link', { name: documentTitle })).toBeVisible();
 
@@ -642,9 +645,10 @@ test('[DOCUMENT_FLOW]: should be able to create and sign a document with 3 recip
 test('[DOCUMENT_FLOW]: should prevent out-of-order signing in sequential mode', async ({
   page,
 }) => {
-  const user = await seedUser();
+  const { user, team } = await seedUser();
 
   const { recipients } = await seedPendingDocumentWithFullFields({
+    teamId: team.id,
     owner: user,
     recipients: ['user1@example.com', 'user2@example.com', 'user3@example.com'],
     fields: [FieldType.SIGNATURE],
diff --git a/packages/app-tests/e2e/documents/delete-documents.spec.ts b/packages/app-tests/e2e/documents/delete-documents.spec.ts
index 96861708f..14d44de42 100644
--- a/packages/app-tests/e2e/documents/delete-documents.spec.ts
+++ b/packages/app-tests/e2e/documents/delete-documents.spec.ts
@@ -13,16 +13,20 @@ import { checkDocumentTabCount } from '../fixtures/documents';
 test.describe.configure({ mode: 'serial' });
 
 const seedDeleteDocumentsTestRequirements = async () => {
-  const [sender, recipientA, recipientB] = await Promise.all([seedUser(), seedUser(), seedUser()]);
+  const [sender, recipientA, recipientB] = await Promise.all([
+    seedUser({ setTeamEmailAsOwner: true }),
+    seedUser({ setTeamEmailAsOwner: true }),
+    seedUser({ setTeamEmailAsOwner: true }),
+  ]);
 
   const [draftDocument, pendingDocument, completedDocument] = await Promise.all([
-    seedDraftDocument(sender, [recipientA, recipientB], {
+    seedDraftDocument(sender.user, sender.team.id, [recipientA.user, recipientB.user], {
       createDocumentOptions: { title: 'Document 1 - Draft' },
     }),
-    seedPendingDocument(sender, [recipientA, recipientB], {
+    seedPendingDocument(sender.user, sender.team.id, [recipientA.user, recipientB.user], {
       createDocumentOptions: { title: 'Document 1 - Pending' },
     }),
-    seedCompletedDocument(sender, [recipientA, recipientB], {
+    seedCompletedDocument(sender.user, sender.team.id, [recipientA.user, recipientB.user], {
       createDocumentOptions: { title: 'Document 1 - Completed' },
     }),
   ]);
@@ -41,7 +45,8 @@ test('[DOCUMENTS]: seeded documents should be visible', async ({ page }) => {
 
   await apiSignin({
     page,
-    email: sender.email,
+    email: sender.user.email,
+    redirectPath: `/t/${sender.team.url}/documents`,
   });
 
   await expect(page.getByRole('link', { name: 'Document 1 - Completed' })).toBeVisible();
@@ -53,7 +58,8 @@ test('[DOCUMENTS]: seeded documents should be visible', async ({ page }) => {
   for (const recipient of recipients) {
     await apiSignin({
       page,
-      email: recipient.email,
+      email: recipient.user.email,
+      redirectPath: `/t/${recipient.team.url}/documents`,
     });
 
     await expect(page.getByRole('link', { name: 'Document 1 - Completed' })).toBeVisible();
@@ -72,7 +78,8 @@ test('[DOCUMENTS]: deleting a completed document should not remove it from recip
 
   await apiSignin({
     page,
-    email: sender.email,
+    email: sender.user.email,
+    redirectPath: `/t/${sender.team.url}/documents`,
   });
 
   // Open document action menu.
@@ -95,7 +102,8 @@ test('[DOCUMENTS]: deleting a completed document should not remove it from recip
   for (const recipient of recipients) {
     await apiSignin({
       page,
-      email: recipient.email,
+      email: recipient.user.email,
+      redirectPath: `/t/${recipient.team.url}/documents`,
     });
 
     await expect(page.getByRole('link', { name: 'Document 1 - Completed' })).toBeVisible();
@@ -113,7 +121,8 @@ test('[DOCUMENTS]: deleting a pending document should remove it from recipients'
 
   await apiSignin({
     page,
-    email: sender.email,
+    email: sender.user.email,
+    redirectPath: `/t/${sender.team.url}/documents`,
   });
 
   // Open document action menu.
@@ -135,6 +144,7 @@ test('[DOCUMENTS]: deleting a pending document should remove it from recipients'
       email: recipient.email,
     });
 
+    // Check dashboard inbox.
     await expect(page.getByRole('link', { name: 'Document 1 - Pending' })).not.toBeVisible();
     await apiSignout({ page });
   }
@@ -145,7 +155,8 @@ test('[DOCUMENTS]: deleting draft documents should permanently remove it', async
 
   await apiSignin({
     page,
-    email: sender.email,
+    email: sender.user.email,
+    redirectPath: `/t/${sender.team.url}/documents`,
   });
 
   // Open document action menu.
@@ -174,7 +185,8 @@ test('[DOCUMENTS]: deleting pending documents should permanently remove it', asy
 
   await apiSignin({
     page,
-    email: sender.email,
+    email: sender.user.email,
+    redirectPath: `/t/${sender.team.url}/documents`,
   });
 
   // Open document action menu.
@@ -205,7 +217,8 @@ test('[DOCUMENTS]: deleting completed documents as an owner should hide it from
 
   await apiSignin({
     page,
-    email: sender.email,
+    email: sender.user.email,
+    redirectPath: `/t/${sender.team.url}/documents`,
   });
 
   // Open document action menu.
@@ -231,7 +244,8 @@ test('[DOCUMENTS]: deleting completed documents as an owner should hide it from
   await apiSignout({ page });
   await apiSignin({
     page,
-    email: recipients[0].email,
+    email: recipients[0].user.email,
+    redirectPath: `/t/${recipients[0].team.url}/documents`,
   });
 
   // Check document counts.
@@ -252,7 +266,8 @@ test('[DOCUMENTS]: deleting documents as a recipient should only hide it for the
 
   await apiSignin({
     page,
-    email: recipientA.email,
+    email: recipientA.user.email,
+    redirectPath: `/t/${recipientA.team.url}/documents`,
   });
 
   // Open document action menu.
@@ -301,7 +316,8 @@ test('[DOCUMENTS]: deleting documents as a recipient should only hide it for the
   await apiSignout({ page });
   await apiSignin({
     page,
-    email: sender.email,
+    email: sender.user.email,
+    redirectPath: `/t/${sender.team.url}/documents`,
   });
 
   // Check document counts for sender.
@@ -315,7 +331,8 @@ test('[DOCUMENTS]: deleting documents as a recipient should only hide it for the
   await apiSignout({ page });
   await apiSignin({
     page,
-    email: recipientB.email,
+    email: recipientB.user.email,
+    redirectPath: `/t/${recipientB.team.url}/documents`,
   });
 
   // Check document counts for other recipient.
diff --git a/packages/app-tests/e2e/features/include-document-certificate.spec.ts b/packages/app-tests/e2e/features/include-document-certificate.spec.ts
index de700a067..8a5a544e6 100644
--- a/packages/app-tests/e2e/features/include-document-certificate.spec.ts
+++ b/packages/app-tests/e2e/features/include-document-certificate.spec.ts
@@ -14,12 +14,15 @@ import { signSignaturePad } from '../fixtures/signature';
 
 test.describe('Signing Certificate Tests', () => {
   test('individual document should always include signing certificate', async ({ page }) => {
-    const user = await seedUser();
+    const { user, team } = await seedUser({
+      isPersonalOrganisation: true,
+    });
 
     const { document, recipients } = await seedPendingDocumentWithFullFields({
       owner: user,
       recipients: ['signer@example.com'],
       fields: [FieldType.SIGNATURE],
+      teamId: team.id,
     });
 
     const documentData = await prisma.documentData
@@ -76,20 +79,28 @@ test.describe('Signing Certificate Tests', () => {
   test('team document with signing certificate enabled should include certificate', async ({
     page,
   }) => {
-    const team = await seedTeam();
+    const { owner, team } = await seedTeam();
 
     const { document, recipients } = await seedPendingDocumentWithFullFields({
-      owner: team.owner,
+      owner: owner,
       recipients: ['signer@example.com'],
       fields: [FieldType.SIGNATURE],
-      updateDocumentOptions: {
-        teamId: team.id,
+      teamId: team.id,
+    });
+
+    const teamSettingsId = await prisma.teamGlobalSettings.findFirstOrThrow({
+      where: {
+        team: {
+          id: team.id,
+        },
       },
     });
 
-    await prisma.teamGlobalSettings.create({
+    await prisma.teamGlobalSettings.update({
+      where: {
+        id: teamSettingsId.id,
+      },
       data: {
-        teamId: team.id,
         includeSigningCertificate: true,
       },
     });
@@ -148,20 +159,28 @@ test.describe('Signing Certificate Tests', () => {
   test('team document with signing certificate disabled should not include certificate', async ({
     page,
   }) => {
-    const team = await seedTeam();
+    const { owner, team } = await seedTeam();
 
     const { document, recipients } = await seedPendingDocumentWithFullFields({
-      owner: team.owner,
+      owner: owner,
       recipients: ['signer@example.com'],
       fields: [FieldType.SIGNATURE],
-      updateDocumentOptions: {
-        teamId: team.id,
+      teamId: team.id,
+    });
+
+    const teamSettingsId = await prisma.teamGlobalSettings.findFirstOrThrow({
+      where: {
+        team: {
+          id: team.id,
+        },
       },
     });
 
-    await prisma.teamGlobalSettings.create({
+    await prisma.teamGlobalSettings.update({
+      where: {
+        id: teamSettingsId.id,
+      },
       data: {
-        teamId: team.id,
         includeSigningCertificate: false,
       },
     });
@@ -218,16 +237,22 @@ test.describe('Signing Certificate Tests', () => {
   });
 
   test('team can toggle signing certificate setting', async ({ page }) => {
-    const team = await seedTeam();
+    const { owner, team } = await seedTeam();
 
     await apiSignin({
       page,
-      email: team.owner.email,
+      email: owner.email,
       redirectPath: `/t/${team.url}/settings/preferences`,
     });
 
-    // Toggle signing certificate setting
-    await page.getByLabel('Include the Signing Certificate in the Document').click();
+    await page
+      .getByRole('group')
+      .locator('div')
+      .filter({ hasText: 'Include the Signing' })
+      .getByRole('combobox')
+      .click();
+    await page.getByRole('option', { name: 'No' }).click();
+
     await page
       .getByRole('button', { name: /Update/ })
       .first()
@@ -244,7 +269,13 @@ test.describe('Signing Certificate Tests', () => {
     expect(updatedTeam.teamGlobalSettings?.includeSigningCertificate).toBe(false);
 
     // Toggle the setting back to true
-    await page.getByLabel('Include the Signing Certificate in the Document').click();
+    await page
+      .getByRole('group')
+      .locator('div')
+      .filter({ hasText: 'Include the Signing' })
+      .getByRole('combobox')
+      .click();
+    await page.getByRole('option', { name: 'Yes' }).click();
     await page
       .getByRole('button', { name: /Update/ })
       .first()
diff --git a/packages/app-tests/e2e/fixtures/authentication.ts b/packages/app-tests/e2e/fixtures/authentication.ts
index f52357895..6f8fdbdf8 100644
--- a/packages/app-tests/e2e/fixtures/authentication.ts
+++ b/packages/app-tests/e2e/fixtures/authentication.ts
@@ -17,7 +17,7 @@ export const apiSignin = async ({
   page,
   email = 'example@documenso.com',
   password = 'password',
-  redirectPath = '/documents',
+  redirectPath = '/',
 }: LoginOptions) => {
   const { request } = page.context();
 
diff --git a/packages/app-tests/e2e/fixtures/generic.ts b/packages/app-tests/e2e/fixtures/generic.ts
new file mode 100644
index 000000000..f898cd476
--- /dev/null
+++ b/packages/app-tests/e2e/fixtures/generic.ts
@@ -0,0 +1,9 @@
+import { type Page, expect } from '@playwright/test';
+
+export const expectTextToBeVisible = async (page: Page, text: string) => {
+  await expect(page.getByText(text).first()).toBeVisible();
+};
+
+export const expectTextToNotBeVisible = async (page: Page, text: string) => {
+  await expect(page.getByText(text).first()).not.toBeVisible();
+};
diff --git a/packages/app-tests/e2e/folders/individual-account-folders.spec.ts b/packages/app-tests/e2e/folders/individual-account-folders.spec.ts
deleted file mode 100644
index 2f1421553..000000000
--- a/packages/app-tests/e2e/folders/individual-account-folders.spec.ts
+++ /dev/null
@@ -1,866 +0,0 @@
-import { expect, test } from '@playwright/test';
-import path from 'node:path';
-
-import { FolderType } from '@documenso/prisma/client';
-import { seedBlankDocument } from '@documenso/prisma/seed/documents';
-import { seedBlankFolder } from '@documenso/prisma/seed/folders';
-import { seedBlankTemplate } from '@documenso/prisma/seed/templates';
-import { seedUser } from '@documenso/prisma/seed/users';
-
-import { apiSignin } from '../fixtures/authentication';
-
-test.describe.configure({ mode: 'parallel' });
-
-test('create folder button is visible on documents page', async ({ page }) => {
-  const user = await seedUser();
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/',
-  });
-
-  await expect(page.getByRole('button', { name: 'Create Folder' })).toBeVisible();
-});
-
-test('user can create a document folder', async ({ page }) => {
-  const user = await seedUser();
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/',
-  });
-
-  await page.getByRole('button', { name: 'Create Folder' }).click();
-  await expect(page.getByRole('dialog', { name: 'Create New folder' })).toBeVisible();
-
-  await page.getByLabel('Folder name').fill('My folder');
-  await page.getByRole('button', { name: 'Create' }).click();
-
-  await page.waitForTimeout(1000);
-
-  await expect(page.getByText('My folder')).toBeVisible();
-
-  await page.goto('/documents');
-  await expect(page.locator('div').filter({ hasText: 'My folder' }).nth(3)).toBeVisible();
-});
-
-test('user can create a document subfolder inside a document folder', async ({ page }) => {
-  const user = await seedUser();
-
-  const folder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Client Contracts',
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/documents/f/${folder.id}`,
-  });
-
-  await expect(page.getByText('Client Contracts')).toBeVisible();
-
-  await page.getByRole('button', { name: 'Create Folder' }).click();
-  await expect(page.getByRole('dialog', { name: 'Create New folder' })).toBeVisible();
-
-  await page.getByLabel('Folder name').fill('Invoices');
-  await page.getByRole('button', { name: 'Create' }).click();
-
-  await page.waitForTimeout(1000);
-
-  await expect(page.getByText('Invoices')).toBeVisible();
-});
-
-test('user can create a document inside a document folder', async ({ page }) => {
-  const user = await seedUser();
-
-  const folder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Client Contracts',
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/documents/f/${folder.id}`,
-  });
-
-  const fileInput = page.locator('input[type="file"]').nth(1);
-  await fileInput.waitFor({ state: 'attached' });
-
-  await fileInput.setInputFiles(
-    path.join(__dirname, '../../../assets/documenso-supporter-pledge.pdf'),
-  );
-
-  await page.waitForTimeout(3000);
-
-  await expect(page.getByText('documenso-supporter-pledge.pdf')).toBeVisible();
-
-  await page.goto(`/documents/f/${folder.id}`);
-
-  await expect(page.getByText('documenso-supporter-pledge.pdf')).toBeVisible();
-});
-
-test('user can pin a document folder', async ({ page }) => {
-  const user = await seedUser();
-
-  await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Contracts',
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/documents',
-  });
-
-  await page.getByRole('button', { name: '•••' }).click();
-  await page.getByRole('menuitem', { name: 'Pin' }).click();
-
-  await page.reload();
-
-  await expect(page.locator('svg.text-documenso.h-3.w-3')).toBeVisible();
-});
-
-test('user can unpin a document folder', async ({ page }) => {
-  const user = await seedUser();
-
-  await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Contracts',
-      pinned: true,
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/documents',
-  });
-
-  await page.getByRole('button', { name: '•••' }).click();
-  await page.getByRole('menuitem', { name: 'Unpin' }).click();
-
-  await page.reload();
-
-  await expect(page.locator('svg.text-documenso.h-3.w-3')).not.toBeVisible();
-});
-
-test('user can rename a document folder', async ({ page }) => {
-  const user = await seedUser();
-
-  await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Contracts',
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/documents',
-  });
-
-  await page.getByRole('button', { name: '•••' }).click();
-  await page.getByRole('menuitem', { name: 'Settings' }).click();
-
-  await page.getByLabel('Name').fill('Archive');
-  await page.getByRole('button', { name: 'Save Changes' }).click();
-
-  await expect(page.getByText('Archive')).toBeVisible();
-});
-
-test('document folder visibility is not visible to user', async ({ page }) => {
-  const user = await seedUser();
-
-  await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Contracts',
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/documents',
-  });
-
-  await page.getByRole('button', { name: '•••' }).click();
-  await page.getByRole('menuitem', { name: 'Settings' }).click();
-
-  await expect(page.getByRole('menuitem', { name: 'Visibility' })).not.toBeVisible();
-});
-
-test('document folder can be moved to another document folder', async ({ page }) => {
-  const user = await seedUser();
-
-  const folder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Clients',
-    },
-  });
-
-  await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Contracts',
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/documents',
-  });
-
-  await page.getByRole('button', { name: '•••' }).nth(0).click();
-  await page.getByRole('menuitem', { name: 'Move' }).click();
-
-  await page.getByRole('button', { name: 'Clients' }).click();
-  await page.getByRole('button', { name: 'Move Folder' }).click();
-
-  await page.waitForTimeout(1000);
-
-  await page.goto(`/documents/f/${folder.id}`);
-
-  await expect(page.getByText('Contracts')).toBeVisible();
-});
-
-test('document folder can be moved to the root', async ({ page }) => {
-  const user = await seedUser();
-
-  const parentFolder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Clients',
-    },
-  });
-
-  await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Contracts',
-      parentId: parentFolder.id,
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/documents',
-  });
-
-  await page.getByText('Clients').click();
-
-  await page.getByRole('button', { name: '•••' }).nth(0).click();
-  await page.getByRole('menuitem', { name: 'Move' }).click();
-
-  await page.getByRole('button', { name: 'Root' }).click();
-  await page.getByRole('button', { name: 'Move Folder' }).click();
-
-  await page.waitForTimeout(1000);
-
-  await page.goto('/documents');
-
-  await expect(page.getByText('Clients')).toBeVisible();
-});
-
-test('document folder and its contents can be deleted', async ({ page }) => {
-  const user = await seedUser();
-
-  const folder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Proposals',
-    },
-  });
-
-  const proposal = await seedBlankDocument(user, {
-    createDocumentOptions: {
-      title: 'Proposal 1',
-      folderId: folder.id,
-    },
-  });
-
-  const reportsFolder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Reports',
-      parentId: folder.id,
-    },
-  });
-
-  const report = await seedBlankDocument(user, {
-    createDocumentOptions: {
-      title: 'Report 1',
-      folderId: reportsFolder.id,
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/documents',
-  });
-
-  await page.getByRole('button', { name: '•••' }).click();
-  await page.getByRole('menuitem', { name: 'Delete' }).click();
-
-  await page.getByRole('textbox').fill(`delete ${folder.name}`);
-  await page.getByRole('button', { name: 'Delete' }).click();
-
-  await page.goto('/documents');
-
-  await expect(page.locator('div').filter({ hasText: folder.name })).not.toBeVisible();
-  await expect(page.getByText(proposal.title)).not.toBeVisible();
-
-  await page.goto(`/documents/f/${folder.id}`);
-
-  await expect(page.getByText(report.title)).not.toBeVisible();
-  await expect(page.locator('div').filter({ hasText: reportsFolder.name })).not.toBeVisible();
-});
-
-test('user can move a document to a document folder', async ({ page }) => {
-  const user = await seedUser();
-
-  const folder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Proposals',
-    },
-  });
-
-  await seedBlankDocument(user, {
-    createDocumentOptions: {
-      title: 'Proposal 1',
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/documents',
-  });
-
-  await expect(async () => {
-    await page.getByTestId('document-table-action-btn').first().click();
-    await page.waitForTimeout(1000);
-
-    await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
-  }).toPass();
-
-  await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
-
-  await page.getByRole('button', { name: 'Proposals' }).click();
-  await page.getByRole('button', { name: 'Move' }).click();
-
-  await page.waitForTimeout(1000);
-
-  await page.goto(`/documents/f/${folder.id}`);
-
-  await expect(page.getByText('Proposal 1')).toBeVisible();
-});
-
-test('user can move a document from folder to the root', async ({ page }) => {
-  const user = await seedUser();
-
-  const folder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Proposals',
-    },
-  });
-
-  await seedBlankDocument(user, {
-    createDocumentOptions: {
-      title: 'Proposal 1',
-      folderId: folder.id,
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/documents',
-  });
-
-  await page.getByText('Proposals').click();
-
-  await expect(async () => {
-    await page.getByTestId('document-table-action-btn').first().click();
-    await page.waitForTimeout(1000);
-
-    await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
-  }).toPass();
-
-  await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
-
-  await page.getByRole('button', { name: 'Root' }).click();
-  await page.getByRole('button', { name: 'Move' }).click();
-
-  await page.waitForTimeout(1000);
-
-  await page.goto('/documents');
-
-  await expect(page.getByText('Proposal 1')).toBeVisible();
-});
-
-test('create folder button is visible on templates page', async ({ page }) => {
-  const user = await seedUser();
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/templates',
-  });
-
-  await expect(page.getByRole('button', { name: 'Create folder' })).toBeVisible();
-});
-
-test('user can create a template folder', async ({ page }) => {
-  const user = await seedUser();
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/templates',
-  });
-
-  await page.getByRole('button', { name: 'Create folder' }).click();
-  await expect(page.getByRole('dialog', { name: 'Create New folder' })).toBeVisible();
-
-  await page.getByLabel('Folder name').fill('My template folder');
-  await page.getByRole('button', { name: 'Create' }).click();
-
-  await page.waitForTimeout(1000);
-
-  await expect(page.getByText('My template folder')).toBeVisible();
-
-  await page.goto('/templates');
-  await expect(page.locator('div').filter({ hasText: 'My template folder' }).nth(3)).toBeVisible();
-});
-
-test('user can create a template subfolder inside a template folder', async ({ page }) => {
-  const user = await seedUser();
-
-  const folder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Client Templates',
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/templates/f/${folder.id}`,
-  });
-
-  await expect(page.getByText('Client Templates')).toBeVisible();
-
-  await page.getByRole('button', { name: 'Create folder' }).click();
-  await expect(page.getByRole('dialog', { name: 'Create New folder' })).toBeVisible();
-
-  await page.getByLabel('Folder name').fill('Contract Templates');
-  await page.getByRole('button', { name: 'Create' }).click();
-
-  await page.waitForTimeout(1000);
-
-  await expect(page.getByText('Contract Templates')).toBeVisible();
-});
-
-test('user can create a template inside a template folder', async ({ page }) => {
-  const user = await seedUser();
-
-  const folder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Client Templates',
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/templates/f/${folder.id}`,
-  });
-
-  await expect(page.getByText('Client Templates')).toBeVisible();
-
-  await page.getByRole('button', { name: 'New Template' }).click();
-  // await expect(page.getByRole('dialog', { name: 'New Template' })).toBeVisible();
-
-  await page
-    .locator('div')
-    .filter({ hasText: /^Upload Template DocumentDrag & drop your PDF here\.$/ })
-    .nth(2)
-    .click();
-  await page.locator('input[type="file"]').waitFor({ state: 'attached' });
-
-  await page
-    .locator('input[type="file"]')
-    .setInputFiles(path.join(__dirname, '../../../assets/documenso-supporter-pledge.pdf'));
-
-  await page.waitForTimeout(3000);
-
-  await page.getByRole('button', { name: 'Create' }).click();
-
-  await page.waitForTimeout(1000);
-
-  await expect(page.getByText('documenso-supporter-pledge.pdf')).toBeVisible();
-
-  await page.goto(`/templates/f/${folder.id}`);
-  await expect(page.getByText('documenso-supporter-pledge.pdf')).toBeVisible();
-});
-
-test('user can pin a template folder', async ({ page }) => {
-  const user = await seedUser();
-
-  await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Contract Templates',
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/templates',
-  });
-
-  await page.getByRole('button', { name: '•••' }).click();
-  await page.getByRole('menuitem', { name: 'Pin' }).click();
-
-  await page.reload();
-
-  await expect(page.locator('svg.text-documenso.h-3.w-3')).toBeVisible();
-});
-
-test('user can unpin a template folder', async ({ page }) => {
-  const user = await seedUser();
-
-  await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Contract Templates',
-      pinned: true,
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/templates',
-  });
-
-  await page.getByRole('button', { name: '•••' }).click();
-  await page.getByRole('menuitem', { name: 'Unpin' }).click();
-
-  await page.reload();
-
-  await expect(page.locator('svg.text-documenso.h-3.w-3')).not.toBeVisible();
-});
-
-test('user can rename a template folder', async ({ page }) => {
-  const user = await seedUser();
-
-  await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Contract Templates',
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/templates',
-  });
-
-  await page.getByRole('button', { name: '•••' }).click();
-  await page.getByRole('menuitem', { name: 'Settings' }).click();
-
-  await page.getByLabel('Name').fill('Updated Template Folder');
-  await page.getByRole('button', { name: 'Save Changes' }).click();
-
-  await expect(page.getByText('Updated Template Folder')).toBeVisible();
-});
-
-test('template folder visibility is not visible to user', async ({ page }) => {
-  const user = await seedUser();
-
-  await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Contract Templates',
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/templates',
-  });
-
-  await page.getByRole('button', { name: '•••' }).click();
-  await page.getByRole('menuitem', { name: 'Settings' }).click();
-
-  await expect(page.getByRole('menuitem', { name: 'Visibility' })).not.toBeVisible();
-});
-
-test('template folder can be moved to another template folder', async ({ page }) => {
-  const user = await seedUser();
-
-  const folder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Client Templates',
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Contract Templates',
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/templates',
-  });
-
-  await page.getByRole('button', { name: '•••' }).nth(0).click();
-  await page.getByRole('menuitem', { name: 'Move' }).click();
-
-  await page.getByRole('button', { name: 'Client Templates' }).click();
-  await page.getByRole('button', { name: 'Move Folder' }).click();
-
-  await page.waitForTimeout(1000);
-
-  await page.goto(`/templates/f/${folder.id}`);
-
-  await expect(page.getByText('Contract Templates')).toBeVisible();
-});
-
-test('template folder can be moved to the root', async ({ page }) => {
-  const user = await seedUser();
-
-  const parentFolder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Client Templates',
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Contract Templates',
-      parentId: parentFolder.id,
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/templates',
-  });
-
-  await page.getByText('Client Templates').click();
-  await page.getByRole('button', { name: '•••' }).nth(0).click();
-  await page.getByRole('menuitem', { name: 'Move' }).click();
-
-  await page.getByRole('button', { name: 'Root' }).click();
-  await page.getByRole('button', { name: 'Move Folder' }).click();
-
-  await page.waitForTimeout(1000);
-
-  await page.goto('/templates');
-
-  await expect(page.getByText('Contract Templates')).toBeVisible();
-});
-
-test('template folder and its contents can be deleted', async ({ page }) => {
-  const user = await seedUser();
-
-  const folder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Proposal Templates',
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  const template = await seedBlankTemplate(user, {
-    createTemplateOptions: {
-      title: 'Proposal Template 1',
-      folderId: folder.id,
-    },
-  });
-
-  const subfolder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Report Templates',
-      parentId: folder.id,
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  const reportTemplate = await seedBlankTemplate(user, {
-    createTemplateOptions: {
-      title: 'Report Template 1',
-      folderId: subfolder.id,
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/templates',
-  });
-
-  await page.getByRole('button', { name: '•••' }).click();
-  await page.getByRole('menuitem', { name: 'Delete' }).click();
-
-  await page.getByRole('textbox').fill(`delete ${folder.name}`);
-  await page.getByRole('button', { name: 'Delete' }).click();
-
-  await page.goto('/templates');
-
-  await expect(page.locator('div').filter({ hasText: folder.name })).not.toBeVisible();
-  await expect(page.getByText(template.title)).not.toBeVisible();
-
-  await page.goto(`/templates/f/${folder.id}`);
-
-  await expect(page.getByText(reportTemplate.title)).not.toBeVisible();
-  await expect(page.locator('div').filter({ hasText: subfolder.name })).not.toBeVisible();
-});
-
-test('user can navigate between template folders', async ({ page }) => {
-  const user = await seedUser();
-
-  const parentFolder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Client Templates',
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  const subfolder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Contract Templates',
-      parentId: parentFolder.id,
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  await seedBlankTemplate(user, {
-    createTemplateOptions: {
-      title: 'Contract Template 1',
-      folderId: subfolder.id,
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/templates',
-  });
-
-  await page.getByText('Client Templates').click();
-  await expect(page.getByText('Contract Templates')).toBeVisible();
-
-  await page.getByText('Contract Templates').click();
-  await expect(page.getByText('Contract Template 1')).toBeVisible();
-
-  await page.getByRole('button', { name: parentFolder.name }).click();
-  await expect(page.getByText('Contract Templates')).toBeVisible();
-
-  await page.getByRole('button', { name: subfolder.name }).click();
-  await expect(page.getByText('Contract Template 1')).toBeVisible();
-});
-
-test('user can move a template to a template folder', async ({ page }) => {
-  const user = await seedUser();
-
-  const folder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Client Templates',
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  await seedBlankTemplate(user, {
-    createTemplateOptions: {
-      title: 'Proposal Template 1',
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/templates',
-  });
-
-  await expect(async () => {
-    await page.getByTestId('template-table-action-btn').first().click();
-    await page.waitForTimeout(1000);
-
-    await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
-  }).toPass();
-
-  await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
-
-  await page.getByRole('button', { name: 'Client Templates' }).click();
-  await page.getByRole('button', { name: 'Move' }).click();
-
-  await page.goto(`/templates/f/${folder.id}`);
-  await page.waitForTimeout(1000);
-
-  await expect(page.getByText('Proposal Template 1')).toBeVisible();
-});
-
-test('user can move a template from a folder to the root', async ({ page }) => {
-  const user = await seedUser();
-
-  const folder = await seedBlankFolder(user, {
-    createFolderOptions: {
-      name: 'Client Templates',
-      type: FolderType.TEMPLATE,
-    },
-  });
-
-  await seedBlankTemplate(user, {
-    createTemplateOptions: {
-      title: 'Proposal Template 1',
-      folderId: folder.id,
-    },
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/templates',
-  });
-
-  await page.getByText('Client Templates').click();
-
-  await expect(async () => {
-    await page.getByTestId('template-table-action-btn').first().click();
-    await page.waitForTimeout(1000);
-
-    await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
-  }).toPass();
-
-  await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
-
-  await page.getByRole('button', { name: 'Root' }).click();
-  await page.getByRole('button', { name: 'Move' }).click();
-
-  await page.waitForTimeout(1000);
-
-  await page.goto('/templates');
-
-  await expect(page.getByText('Proposal Template 1')).toBeVisible();
-});
diff --git a/packages/app-tests/e2e/folders/team-account-folders.spec.ts b/packages/app-tests/e2e/folders/team-account-folders.spec.ts
index e908adfd3..31382d4f5 100644
--- a/packages/app-tests/e2e/folders/team-account-folders.spec.ts
+++ b/packages/app-tests/e2e/folders/team-account-folders.spec.ts
@@ -7,7 +7,6 @@ import { seedTeamDocuments } from '@documenso/prisma/seed/documents';
 import { seedBlankDocument } from '@documenso/prisma/seed/documents';
 import { seedBlankFolder } from '@documenso/prisma/seed/folders';
 import { seedTeamMember } from '@documenso/prisma/seed/teams';
-import { seedTeam } from '@documenso/prisma/seed/teams';
 import { seedBlankTemplate } from '@documenso/prisma/seed/templates';
 
 import { apiSignin } from '../fixtures/authentication';
@@ -15,11 +14,11 @@ import { apiSignin } from '../fixtures/authentication';
 test.describe.configure({ mode: 'parallel' });
 
 test('[TEAMS]: create document folder button is visible', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}`,
   });
 
@@ -27,11 +26,11 @@ test('[TEAMS]: create document folder button is visible', async ({ page }) => {
 });
 
 test('[TEAMS]: can create document folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}`,
   });
 
@@ -44,15 +43,15 @@ test('[TEAMS]: can create document folder', async ({ page }) => {
 });
 
 test('[TEAMS]: can create document subfolder within a document folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}`,
   });
 
-  const teamFolder = await seedBlankFolder(team.owner, {
+  const teamFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Folder',
       teamId: team.id,
@@ -70,9 +69,9 @@ test('[TEAMS]: can create document subfolder within a document folder', async ({
 });
 
 test('[TEAMS]: can create a document inside a document folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  const teamFolder = await seedBlankFolder(team.owner, {
+  const teamFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Documents',
       teamId: team.id,
@@ -81,7 +80,7 @@ test('[TEAMS]: can create a document inside a document folder', async ({ page })
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents/f/${teamFolder.id}`,
   });
 
@@ -102,9 +101,9 @@ test('[TEAMS]: can create a document inside a document folder', async ({ page })
 });
 
 test('[TEAMS]: can pin a document folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Contracts',
       teamId: team.id,
@@ -113,7 +112,7 @@ test('[TEAMS]: can pin a document folder', async ({ page }) => {
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -126,9 +125,9 @@ test('[TEAMS]: can pin a document folder', async ({ page }) => {
 });
 
 test('[TEAMS]: can unpin a document folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Contracts',
       pinned: true,
@@ -138,7 +137,7 @@ test('[TEAMS]: can unpin a document folder', async ({ page }) => {
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -151,9 +150,9 @@ test('[TEAMS]: can unpin a document folder', async ({ page }) => {
 });
 
 test('[TEAMS]: can rename a document folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Contracts',
       teamId: team.id,
@@ -162,7 +161,7 @@ test('[TEAMS]: can rename a document folder', async ({ page }) => {
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -176,9 +175,9 @@ test('[TEAMS]: can rename a document folder', async ({ page }) => {
 });
 
 test('[TEAMS]: document folder visibility is visible to team member', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Contracts',
       teamId: team.id,
@@ -187,7 +186,7 @@ test('[TEAMS]: document folder visibility is visible to team member', async ({ p
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -198,16 +197,16 @@ test('[TEAMS]: document folder visibility is visible to team member', async ({ p
 });
 
 test('[TEAMS]: document folder can be moved to another document folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  const folder = await seedBlankFolder(team.owner, {
+  const folder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Clients',
       teamId: team.id,
     },
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Contracts',
       teamId: team.id,
@@ -216,7 +215,7 @@ test('[TEAMS]: document folder can be moved to another document folder', async (
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -234,23 +233,23 @@ test('[TEAMS]: document folder can be moved to another document folder', async (
 });
 
 test('[TEAMS]: document folder and its contents can be deleted', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  const folder = await seedBlankFolder(team.owner, {
+  const folder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Proposals',
       teamId: team.id,
     },
   });
 
-  const proposal = await seedBlankDocument(team.owner, {
+  const proposal = await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Team Proposal 1',
       folderId: folder.id,
     },
   });
 
-  const reportsFolder = await seedBlankFolder(team.owner, {
+  const reportsFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Reports',
       parentId: folder.id,
@@ -258,7 +257,7 @@ test('[TEAMS]: document folder and its contents can be deleted', async ({ page }
     },
   });
 
-  const report = await seedBlankDocument(team.owner, {
+  const report = await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Team Report 1',
       folderId: reportsFolder.id,
@@ -267,7 +266,7 @@ test('[TEAMS]: document folder and its contents can be deleted', async ({ page }
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -289,11 +288,11 @@ test('[TEAMS]: document folder and its contents can be deleted', async ({ page }
 });
 
 test('[TEAMS]: create folder button is visible on templates page', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/templates`,
   });
 
@@ -301,11 +300,11 @@ test('[TEAMS]: create folder button is visible on templates page', async ({ page
 });
 
 test('[TEAMS]: can create a template folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/templates`,
   });
 
@@ -326,9 +325,9 @@ test('[TEAMS]: can create a template folder', async ({ page }) => {
 });
 
 test('[TEAMS]: can create a template subfolder inside a template folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  const folder = await seedBlankFolder(team.owner, {
+  const folder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Client Templates',
       type: FolderType.TEMPLATE,
@@ -338,7 +337,7 @@ test('[TEAMS]: can create a template subfolder inside a template folder', async
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/templates/f/${folder.id}`,
   });
 
@@ -356,9 +355,9 @@ test('[TEAMS]: can create a template subfolder inside a template folder', async
 });
 
 test('[TEAMS]: can create a template inside a template folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  const folder = await seedBlankFolder(team.owner, {
+  const folder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Client Templates',
       type: FolderType.TEMPLATE,
@@ -368,7 +367,7 @@ test('[TEAMS]: can create a template inside a template folder', async ({ page })
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/templates/f/${folder.id}`,
   });
 
@@ -400,9 +399,9 @@ test('[TEAMS]: can create a template inside a template folder', async ({ page })
 });
 
 test('[TEAMS]: can pin a template folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Contract Templates',
       type: FolderType.TEMPLATE,
@@ -412,7 +411,7 @@ test('[TEAMS]: can pin a template folder', async ({ page }) => {
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/templates`,
   });
 
@@ -425,9 +424,9 @@ test('[TEAMS]: can pin a template folder', async ({ page }) => {
 });
 
 test('[TEAMS]: can unpin a template folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Contract Templates',
       pinned: true,
@@ -438,7 +437,7 @@ test('[TEAMS]: can unpin a template folder', async ({ page }) => {
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/templates`,
   });
 
@@ -452,9 +451,9 @@ test('[TEAMS]: can unpin a template folder', async ({ page }) => {
 });
 
 test('[TEAMS]: can rename a template folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Contract Templates',
       type: FolderType.TEMPLATE,
@@ -464,7 +463,7 @@ test('[TEAMS]: can rename a template folder', async ({ page }) => {
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/templates`,
   });
 
@@ -478,9 +477,9 @@ test('[TEAMS]: can rename a template folder', async ({ page }) => {
 });
 
 test('[TEAMS]: template folder visibility is not visible to team member', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Contract Templates',
       type: FolderType.TEMPLATE,
@@ -490,7 +489,7 @@ test('[TEAMS]: template folder visibility is not visible to team member', async
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/templates`,
   });
 
@@ -501,9 +500,9 @@ test('[TEAMS]: template folder visibility is not visible to team member', async
 });
 
 test('[TEAMS]: template folder can be moved to another template folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  const folder = await seedBlankFolder(team.owner, {
+  const folder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Client Templates',
       type: FolderType.TEMPLATE,
@@ -511,7 +510,7 @@ test('[TEAMS]: template folder can be moved to another template folder', async (
     },
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Contract Templates',
       type: FolderType.TEMPLATE,
@@ -521,7 +520,7 @@ test('[TEAMS]: template folder can be moved to another template folder', async (
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/templates`,
   });
 
@@ -539,9 +538,9 @@ test('[TEAMS]: template folder can be moved to another template folder', async (
 });
 
 test('[TEAMS]: template folder and its contents can be deleted', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  const folder = await seedBlankFolder(team.owner, {
+  const folder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Proposal Templates',
       type: FolderType.TEMPLATE,
@@ -549,14 +548,14 @@ test('[TEAMS]: template folder and its contents can be deleted', async ({ page }
     },
   });
 
-  const template = await seedBlankTemplate(team.owner, {
+  const template = await seedBlankTemplate(teamOwner, team.id, {
     createTemplateOptions: {
       title: 'Team Proposal Template 1',
       folderId: folder.id,
     },
   });
 
-  const subfolder = await seedBlankFolder(team.owner, {
+  const subfolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Report Templates',
       parentId: folder.id,
@@ -565,7 +564,7 @@ test('[TEAMS]: template folder and its contents can be deleted', async ({ page }
     },
   });
 
-  const reportTemplate = await seedBlankTemplate(team.owner, {
+  const reportTemplate = await seedBlankTemplate(teamOwner, team.id, {
     createTemplateOptions: {
       title: 'Team Report Template 1',
       folderId: subfolder.id,
@@ -574,7 +573,7 @@ test('[TEAMS]: template folder and its contents can be deleted', async ({ page }
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/templates`,
   });
 
@@ -596,9 +595,9 @@ test('[TEAMS]: template folder and its contents can be deleted', async ({ page }
 });
 
 test('[TEAMS]: can navigate between template folders', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  const parentFolder = await seedBlankFolder(team.owner, {
+  const parentFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Client Templates',
       type: FolderType.TEMPLATE,
@@ -606,7 +605,7 @@ test('[TEAMS]: can navigate between template folders', async ({ page }) => {
     },
   });
 
-  const subfolder = await seedBlankFolder(team.owner, {
+  const subfolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Contract Templates',
       parentId: parentFolder.id,
@@ -615,7 +614,7 @@ test('[TEAMS]: can navigate between template folders', async ({ page }) => {
     },
   });
 
-  await seedBlankTemplate(team.owner, {
+  await seedBlankTemplate(teamOwner, team.id, {
     createTemplateOptions: {
       title: 'Team Contract Template 1',
       folderId: subfolder.id,
@@ -625,7 +624,7 @@ test('[TEAMS]: can navigate between template folders', async ({ page }) => {
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/templates`,
   });
 
@@ -645,7 +644,7 @@ test('[TEAMS]: can navigate between template folders', async ({ page }) => {
 test('[TEAMS]: folder visibility is properly applied based on team member roles', async ({
   page,
 }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamMember1 = await seedTeamMember({
     teamId: team.id,
@@ -665,7 +664,7 @@ test('[TEAMS]: folder visibility is properly applied based on team member roles'
     role: TeamMemberRole.ADMIN,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Only Folder',
       teamId: team.id,
@@ -673,7 +672,7 @@ test('[TEAMS]: folder visibility is properly applied based on team member roles'
     },
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -681,7 +680,7 @@ test('[TEAMS]: folder visibility is properly applied based on team member roles'
     },
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -691,7 +690,7 @@ test('[TEAMS]: folder visibility is properly applied based on team member roles'
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -731,18 +730,28 @@ test('[TEAMS]: folder visibility is properly applied based on team member roles'
 });
 
 test('[TEAMS]: folder inherits team visibility settings', async ({ page }) => {
-  const team = await seedTeam();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await prisma.teamGlobalSettings.create({
+  const teamSettingsId = await prisma.teamGlobalSettings.findFirstOrThrow({
+    where: {
+      team: {
+        id: team.id,
+      },
+    },
+  });
+
+  await prisma.teamGlobalSettings.update({
+    where: {
+      id: teamSettingsId.id,
+    },
     data: {
-      teamId: team.id,
       documentVisibility: DocumentVisibility.ADMIN,
     },
   });
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -760,7 +769,7 @@ test('[TEAMS]: folder inherits team visibility settings', async ({ page }) => {
   await expect(page.getByRole('combobox', { name: 'Visibility' })).toHaveText('Admins only');
 
   await prisma.teamGlobalSettings.update({
-    where: { teamId: team.id },
+    where: { id: teamSettingsId.id },
     data: { documentVisibility: DocumentVisibility.MANAGER_AND_ABOVE },
   });
 
@@ -780,7 +789,7 @@ test('[TEAMS]: folder inherits team visibility settings', async ({ page }) => {
   await expect(page.getByRole('combobox', { name: 'Visibility' })).toHaveText('Managers and above');
 
   await prisma.teamGlobalSettings.update({
-    where: { teamId: team.id },
+    where: { id: teamSettingsId.id },
     data: { documentVisibility: DocumentVisibility.EVERYONE },
   });
 
@@ -801,18 +810,28 @@ test('[TEAMS]: folder inherits team visibility settings', async ({ page }) => {
 });
 
 test('[TEAMS]: documents inherit folder visibility', async ({ page }) => {
-  const team = await seedTeam();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await prisma.teamGlobalSettings.create({
+  const teamSettingsId = await prisma.teamGlobalSettings.findFirstOrThrow({
+    where: {
+      team: {
+        id: team.id,
+      },
+    },
+  });
+
+  await prisma.teamGlobalSettings.update({
+    where: {
+      id: teamSettingsId.id,
+    },
     data: {
-      teamId: team.id,
       documentVisibility: DocumentVisibility.ADMIN,
     },
   });
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -839,16 +858,16 @@ test('[TEAMS]: documents inherit folder visibility', async ({ page }) => {
 });
 
 test('[TEAMS]: documents are properly organized within folders', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  const folder = await seedBlankFolder(team.owner, {
+  const folder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Team Folder',
       teamId: team.id,
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Folder Document',
       folderId: folder.id,
@@ -858,7 +877,7 @@ test('[TEAMS]: documents are properly organized within folders', async ({ page }
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -871,7 +890,7 @@ test('[TEAMS]: documents are properly organized within folders', async ({ page }
 });
 
 test('[TEAMS]: team member can move documents to everyone folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamMember = await seedTeamMember({
     teamId: team.id,
@@ -879,7 +898,7 @@ test('[TEAMS]: team member can move documents to everyone folder', async ({ page
     role: TeamMemberRole.MEMBER,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Only Folder',
       teamId: team.id,
@@ -888,7 +907,7 @@ test('[TEAMS]: team member can move documents to everyone folder', async ({ page
     },
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -897,7 +916,7 @@ test('[TEAMS]: team member can move documents to everyone folder', async ({ page
     },
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -906,7 +925,7 @@ test('[TEAMS]: team member can move documents to everyone folder', async ({ page
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Admin Document',
       teamId: team.id,
@@ -914,7 +933,7 @@ test('[TEAMS]: team member can move documents to everyone folder', async ({ page
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Manager Document',
       teamId: team.id,
@@ -922,7 +941,7 @@ test('[TEAMS]: team member can move documents to everyone folder', async ({ page
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Everyone Document',
       teamId: team.id,
@@ -961,7 +980,7 @@ test('[TEAMS]: team member can move documents to everyone folder', async ({ page
 });
 
 test('[TEAMS]: team manager can move manager document to manager folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamManager = await seedTeamMember({
     teamId: team.id,
@@ -969,7 +988,7 @@ test('[TEAMS]: team manager can move manager document to manager folder', async
     role: TeamMemberRole.MANAGER,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -978,7 +997,7 @@ test('[TEAMS]: team manager can move manager document to manager folder', async
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Manager Document',
       teamId: team.id,
@@ -1014,7 +1033,7 @@ test('[TEAMS]: team manager can move manager document to manager folder', async
 });
 
 test('[TEAMS]: team manager can move manager document to everyone folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamManager = await seedTeamMember({
     teamId: team.id,
@@ -1022,7 +1041,7 @@ test('[TEAMS]: team manager can move manager document to everyone folder', async
     role: TeamMemberRole.MANAGER,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -1031,7 +1050,7 @@ test('[TEAMS]: team manager can move manager document to everyone folder', async
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Manager Document',
       teamId: team.id,
@@ -1067,7 +1086,7 @@ test('[TEAMS]: team manager can move manager document to everyone folder', async
 });
 
 test('[TEAMS]: team manager can move everyone document to manager folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamManager = await seedTeamMember({
     teamId: team.id,
@@ -1075,7 +1094,7 @@ test('[TEAMS]: team manager can move everyone document to manager folder', async
     role: TeamMemberRole.MANAGER,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -1084,7 +1103,7 @@ test('[TEAMS]: team manager can move everyone document to manager folder', async
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Everyone Document',
       teamId: team.id,
@@ -1120,7 +1139,7 @@ test('[TEAMS]: team manager can move everyone document to manager folder', async
 });
 
 test('[TEAMS]: team admin can move admin document to admin folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamAdmin = await seedTeamMember({
     teamId: team.id,
@@ -1128,7 +1147,7 @@ test('[TEAMS]: team admin can move admin document to admin folder', async ({ pag
     role: TeamMemberRole.ADMIN,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Folder',
       teamId: team.id,
@@ -1137,7 +1156,7 @@ test('[TEAMS]: team admin can move admin document to admin folder', async ({ pag
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Admin Document',
       teamId: team.id,
@@ -1171,7 +1190,7 @@ test('[TEAMS]: team admin can move admin document to admin folder', async ({ pag
 });
 
 test('[TEAMS]: team admin can move admin document to manager folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamAdmin = await seedTeamMember({
     teamId: team.id,
@@ -1179,7 +1198,7 @@ test('[TEAMS]: team admin can move admin document to manager folder', async ({ p
     role: TeamMemberRole.ADMIN,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -1188,7 +1207,7 @@ test('[TEAMS]: team admin can move admin document to manager folder', async ({ p
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Admin Document',
       teamId: team.id,
@@ -1222,7 +1241,7 @@ test('[TEAMS]: team admin can move admin document to manager folder', async ({ p
 });
 
 test('[TEAMS]: team admin can move admin document to everyone folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamAdmin = await seedTeamMember({
     teamId: team.id,
@@ -1230,7 +1249,7 @@ test('[TEAMS]: team admin can move admin document to everyone folder', async ({
     role: TeamMemberRole.ADMIN,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -1239,7 +1258,7 @@ test('[TEAMS]: team admin can move admin document to everyone folder', async ({
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Admin Document',
       teamId: team.id,
@@ -1273,7 +1292,7 @@ test('[TEAMS]: team admin can move admin document to everyone folder', async ({
 });
 
 test('[TEAMS]: team admin can move manager document to admin folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamAdmin = await seedTeamMember({
     teamId: team.id,
@@ -1281,7 +1300,7 @@ test('[TEAMS]: team admin can move manager document to admin folder', async ({ p
     role: TeamMemberRole.ADMIN,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Folder',
       teamId: team.id,
@@ -1290,7 +1309,7 @@ test('[TEAMS]: team admin can move manager document to admin folder', async ({ p
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Manager Document',
       teamId: team.id,
@@ -1324,7 +1343,7 @@ test('[TEAMS]: team admin can move manager document to admin folder', async ({ p
 });
 
 test('[TEAMS]: team admin can move manager document to manager folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamAdmin = await seedTeamMember({
     teamId: team.id,
@@ -1332,7 +1351,7 @@ test('[TEAMS]: team admin can move manager document to manager folder', async ({
     role: TeamMemberRole.ADMIN,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -1341,7 +1360,7 @@ test('[TEAMS]: team admin can move manager document to manager folder', async ({
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Manager Document',
       teamId: team.id,
@@ -1375,7 +1394,7 @@ test('[TEAMS]: team admin can move manager document to manager folder', async ({
 });
 
 test('[TEAMS]: team admin can move manager document to everyone folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamAdmin = await seedTeamMember({
     teamId: team.id,
@@ -1383,7 +1402,7 @@ test('[TEAMS]: team admin can move manager document to everyone folder', async (
     role: TeamMemberRole.ADMIN,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -1392,7 +1411,7 @@ test('[TEAMS]: team admin can move manager document to everyone folder', async (
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Manager Document',
       teamId: team.id,
@@ -1426,7 +1445,7 @@ test('[TEAMS]: team admin can move manager document to everyone folder', async (
 });
 
 test('[TEAMS]: team admin can move everyone document to admin folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamAdmin = await seedTeamMember({
     teamId: team.id,
@@ -1434,7 +1453,7 @@ test('[TEAMS]: team admin can move everyone document to admin folder', async ({
     role: TeamMemberRole.ADMIN,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Folder',
       teamId: team.id,
@@ -1443,7 +1462,7 @@ test('[TEAMS]: team admin can move everyone document to admin folder', async ({
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Everyone Document',
       teamId: team.id,
@@ -1477,7 +1496,7 @@ test('[TEAMS]: team admin can move everyone document to admin folder', async ({
 });
 
 test('[TEAMS]: team admin can move everyone document to manager folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamAdmin = await seedTeamMember({
     teamId: team.id,
@@ -1485,7 +1504,7 @@ test('[TEAMS]: team admin can move everyone document to manager folder', async (
     role: TeamMemberRole.ADMIN,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -1494,7 +1513,7 @@ test('[TEAMS]: team admin can move everyone document to manager folder', async (
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Everyone Document',
       teamId: team.id,
@@ -1528,7 +1547,7 @@ test('[TEAMS]: team admin can move everyone document to manager folder', async (
 });
 
 test('[TEAMS]: team admin can move everyone document to everyone folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamAdmin = await seedTeamMember({
     teamId: team.id,
@@ -1536,7 +1555,7 @@ test('[TEAMS]: team admin can move everyone document to everyone folder', async
     role: TeamMemberRole.ADMIN,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -1545,7 +1564,7 @@ test('[TEAMS]: team admin can move everyone document to everyone folder', async
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Everyone Document',
       teamId: team.id,
@@ -1579,9 +1598,9 @@ test('[TEAMS]: team admin can move everyone document to everyone folder', async
 });
 
 test('[TEAMS]: team owner can move admin document to admin folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Folder',
       teamId: team.id,
@@ -1590,7 +1609,7 @@ test('[TEAMS]: team owner can move admin document to admin folder', async ({ pag
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Admin Document',
       teamId: team.id,
@@ -1600,7 +1619,7 @@ test('[TEAMS]: team owner can move admin document to admin folder', async ({ pag
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -1624,9 +1643,9 @@ test('[TEAMS]: team owner can move admin document to admin folder', async ({ pag
 });
 
 test('[TEAMS]: team owner can move admin document to manager folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -1635,7 +1654,7 @@ test('[TEAMS]: team owner can move admin document to manager folder', async ({ p
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Admin Document',
       teamId: team.id,
@@ -1645,7 +1664,7 @@ test('[TEAMS]: team owner can move admin document to manager folder', async ({ p
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -1669,9 +1688,9 @@ test('[TEAMS]: team owner can move admin document to manager folder', async ({ p
 });
 
 test('[TEAMS]: team owner can move admin document to everyone folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -1680,7 +1699,7 @@ test('[TEAMS]: team owner can move admin document to everyone folder', async ({
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Admin Document',
       teamId: team.id,
@@ -1690,7 +1709,7 @@ test('[TEAMS]: team owner can move admin document to everyone folder', async ({
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -1714,9 +1733,9 @@ test('[TEAMS]: team owner can move admin document to everyone folder', async ({
 });
 
 test('[TEAMS]: team owner can move manager document to admin folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Folder',
       teamId: team.id,
@@ -1725,7 +1744,7 @@ test('[TEAMS]: team owner can move manager document to admin folder', async ({ p
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Manager Document',
       teamId: team.id,
@@ -1735,7 +1754,7 @@ test('[TEAMS]: team owner can move manager document to admin folder', async ({ p
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -1759,9 +1778,9 @@ test('[TEAMS]: team owner can move manager document to admin folder', async ({ p
 });
 
 test('[TEAMS]: team owner can move manager document to manager folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -1770,7 +1789,7 @@ test('[TEAMS]: team owner can move manager document to manager folder', async ({
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Manager Document',
       teamId: team.id,
@@ -1780,7 +1799,7 @@ test('[TEAMS]: team owner can move manager document to manager folder', async ({
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -1804,9 +1823,9 @@ test('[TEAMS]: team owner can move manager document to manager folder', async ({
 });
 
 test('[TEAMS]: team owner can move manager document to everyone folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -1815,7 +1834,7 @@ test('[TEAMS]: team owner can move manager document to everyone folder', async (
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Manager Document',
       teamId: team.id,
@@ -1825,7 +1844,7 @@ test('[TEAMS]: team owner can move manager document to everyone folder', async (
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -1849,9 +1868,9 @@ test('[TEAMS]: team owner can move manager document to everyone folder', async (
 });
 
 test('[TEAMS]: team owner can move everyone document to admin folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Folder',
       teamId: team.id,
@@ -1860,7 +1879,7 @@ test('[TEAMS]: team owner can move everyone document to admin folder', async ({
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Everyone Document',
       teamId: team.id,
@@ -1870,7 +1889,7 @@ test('[TEAMS]: team owner can move everyone document to admin folder', async ({
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -1894,9 +1913,9 @@ test('[TEAMS]: team owner can move everyone document to admin folder', async ({
 });
 
 test('[TEAMS]: team owner can move everyone document to manager folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -1905,7 +1924,7 @@ test('[TEAMS]: team owner can move everyone document to manager folder', async (
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Everyone Document',
       teamId: team.id,
@@ -1915,7 +1934,7 @@ test('[TEAMS]: team owner can move everyone document to manager folder', async (
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -1939,9 +1958,9 @@ test('[TEAMS]: team owner can move everyone document to manager folder', async (
 });
 
 test('[TEAMS]: team owner can move everyone document to everyone folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -1950,7 +1969,7 @@ test('[TEAMS]: team owner can move everyone document to everyone folder', async
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: '[TEST] Everyone Document',
       teamId: team.id,
@@ -1960,7 +1979,7 @@ test('[TEAMS]: team owner can move everyone document to everyone folder', async
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -1984,7 +2003,7 @@ test('[TEAMS]: team owner can move everyone document to everyone folder', async
 });
 
 test('[TEAMS]: team member cannot see admin folder in folder list', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamMember = await seedTeamMember({
     teamId: team.id,
@@ -1992,7 +2011,7 @@ test('[TEAMS]: team member cannot see admin folder in folder list', async ({ pag
     role: TeamMemberRole.MEMBER,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Only Folder',
       teamId: team.id,
@@ -2012,7 +2031,7 @@ test('[TEAMS]: team member cannot see admin folder in folder list', async ({ pag
 test('[TEAMS]: team member can access admin folder via URL and see everyone documents', async ({
   page,
 }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamMember = await seedTeamMember({
     teamId: team.id,
@@ -2020,7 +2039,7 @@ test('[TEAMS]: team member can access admin folder via URL and see everyone docu
     role: TeamMemberRole.MEMBER,
   });
 
-  const adminFolder = await seedBlankFolder(team.owner, {
+  const adminFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Only Folder',
       teamId: team.id,
@@ -2028,7 +2047,7 @@ test('[TEAMS]: team member can access admin folder via URL and see everyone docu
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Admin Folder - Everyone Document',
       folderId: adminFolder.id,
@@ -2037,7 +2056,7 @@ test('[TEAMS]: team member can access admin folder via URL and see everyone docu
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Admin Folder - Manager Document',
       folderId: adminFolder.id,
@@ -2046,7 +2065,7 @@ test('[TEAMS]: team member can access admin folder via URL and see everyone docu
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Admin Folder - Admin Document',
       folderId: adminFolder.id,
@@ -2068,7 +2087,7 @@ test('[TEAMS]: team member can access admin folder via URL and see everyone docu
 });
 
 test('[TEAMS]: team member cannot see manager folder in folder list', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamMember = await seedTeamMember({
     teamId: team.id,
@@ -2076,7 +2095,7 @@ test('[TEAMS]: team member cannot see manager folder in folder list', async ({ p
     role: TeamMemberRole.MEMBER,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -2096,7 +2115,7 @@ test('[TEAMS]: team member cannot see manager folder in folder list', async ({ p
 test('[TEAMS]: team member can access manager folder via URL and see everyone documents', async ({
   page,
 }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamMember = await seedTeamMember({
     teamId: team.id,
@@ -2104,7 +2123,7 @@ test('[TEAMS]: team member can access manager folder via URL and see everyone do
     role: TeamMemberRole.MEMBER,
   });
 
-  const managerFolder = await seedBlankFolder(team.owner, {
+  const managerFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -2112,7 +2131,7 @@ test('[TEAMS]: team member can access manager folder via URL and see everyone do
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Manager Folder - Everyone Document',
       folderId: managerFolder.id,
@@ -2121,7 +2140,7 @@ test('[TEAMS]: team member can access manager folder via URL and see everyone do
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Manager Folder - Manager Document',
       folderId: managerFolder.id,
@@ -2130,7 +2149,7 @@ test('[TEAMS]: team member can access manager folder via URL and see everyone do
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Manager Folder - Admin Document',
       folderId: managerFolder.id,
@@ -2152,7 +2171,7 @@ test('[TEAMS]: team member can access manager folder via URL and see everyone do
 });
 
 test('[TEAMS]: team member can see everyone folders', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamMember = await seedTeamMember({
     teamId: team.id,
@@ -2160,7 +2179,7 @@ test('[TEAMS]: team member can see everyone folders', async ({ page }) => {
     role: TeamMemberRole.MEMBER,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Only Folder',
       teamId: team.id,
@@ -2168,7 +2187,7 @@ test('[TEAMS]: team member can see everyone folders', async ({ page }) => {
     },
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -2176,7 +2195,7 @@ test('[TEAMS]: team member can see everyone folders', async ({ page }) => {
     },
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -2198,7 +2217,7 @@ test('[TEAMS]: team member can see everyone folders', async ({ page }) => {
 test('[TEAMS]: team member can only see everyone documents in everyone folder', async ({
   page,
 }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamMember = await seedTeamMember({
     teamId: team.id,
@@ -2206,7 +2225,7 @@ test('[TEAMS]: team member can only see everyone documents in everyone folder',
     role: TeamMemberRole.MEMBER,
   });
 
-  const everyoneFolder = await seedBlankFolder(team.owner, {
+  const everyoneFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -2214,7 +2233,7 @@ test('[TEAMS]: team member can only see everyone documents in everyone folder',
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Everyone Document',
       folderId: everyoneFolder.id,
@@ -2223,7 +2242,7 @@ test('[TEAMS]: team member can only see everyone documents in everyone folder',
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Manager Document',
       folderId: everyoneFolder.id,
@@ -2232,7 +2251,7 @@ test('[TEAMS]: team member can only see everyone documents in everyone folder',
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Admin Document',
       folderId: everyoneFolder.id,
@@ -2255,7 +2274,7 @@ test('[TEAMS]: team member can only see everyone documents in everyone folder',
 test('[TEAMS]: team manager can see manager and everyone folders in folder list', async ({
   page,
 }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamManager = await seedTeamMember({
     teamId: team.id,
@@ -2263,7 +2282,7 @@ test('[TEAMS]: team manager can see manager and everyone folders in folder list'
     role: TeamMemberRole.MANAGER,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Only Folder',
       teamId: team.id,
@@ -2271,7 +2290,7 @@ test('[TEAMS]: team manager can see manager and everyone folders in folder list'
     },
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -2279,7 +2298,7 @@ test('[TEAMS]: team manager can see manager and everyone folders in folder list'
     },
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -2301,7 +2320,7 @@ test('[TEAMS]: team manager can see manager and everyone folders in folder list'
 test('[TEAMS]: team manager can see manager and everyone documents in manager folder', async ({
   page,
 }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamManager = await seedTeamMember({
     teamId: team.id,
@@ -2309,7 +2328,7 @@ test('[TEAMS]: team manager can see manager and everyone documents in manager fo
     role: TeamMemberRole.MANAGER,
   });
 
-  const managerFolder = await seedBlankFolder(team.owner, {
+  const managerFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -2317,7 +2336,7 @@ test('[TEAMS]: team manager can see manager and everyone documents in manager fo
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Manager Folder - Everyone Document',
       folderId: managerFolder.id,
@@ -2326,7 +2345,7 @@ test('[TEAMS]: team manager can see manager and everyone documents in manager fo
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Manager Folder - Manager Document',
       folderId: managerFolder.id,
@@ -2335,7 +2354,7 @@ test('[TEAMS]: team manager can see manager and everyone documents in manager fo
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Manager Folder - Admin Document',
       folderId: managerFolder.id,
@@ -2359,7 +2378,7 @@ test('[TEAMS]: team manager can see manager and everyone documents in manager fo
 test('[TEAMS]: team manager can see manager and everyone documents in everyone folder', async ({
   page,
 }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamManager = await seedTeamMember({
     teamId: team.id,
@@ -2367,7 +2386,7 @@ test('[TEAMS]: team manager can see manager and everyone documents in everyone f
     role: TeamMemberRole.MANAGER,
   });
 
-  const everyoneFolder = await seedBlankFolder(team.owner, {
+  const everyoneFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -2375,7 +2394,7 @@ test('[TEAMS]: team manager can see manager and everyone documents in everyone f
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Everyone Folder - Everyone Document',
       folderId: everyoneFolder.id,
@@ -2384,7 +2403,7 @@ test('[TEAMS]: team manager can see manager and everyone documents in everyone f
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Everyone Folder - Manager Document',
       folderId: everyoneFolder.id,
@@ -2393,7 +2412,7 @@ test('[TEAMS]: team manager can see manager and everyone documents in everyone f
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Everyone Folder - Admin Document',
       folderId: everyoneFolder.id,
@@ -2417,7 +2436,7 @@ test('[TEAMS]: team manager can see manager and everyone documents in everyone f
 test('[TEAMS]: team manager can access admin folder via URL and see manager and everyone documents', async ({
   page,
 }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamManager = await seedTeamMember({
     teamId: team.id,
@@ -2425,7 +2444,7 @@ test('[TEAMS]: team manager can access admin folder via URL and see manager and
     role: TeamMemberRole.MANAGER,
   });
 
-  const adminFolder = await seedBlankFolder(team.owner, {
+  const adminFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Only Folder',
       teamId: team.id,
@@ -2433,7 +2452,7 @@ test('[TEAMS]: team manager can access admin folder via URL and see manager and
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Admin Folder - Everyone Document',
       folderId: adminFolder.id,
@@ -2442,7 +2461,7 @@ test('[TEAMS]: team manager can access admin folder via URL and see manager and
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Admin Folder - Manager Document',
       folderId: adminFolder.id,
@@ -2451,7 +2470,7 @@ test('[TEAMS]: team manager can access admin folder via URL and see manager and
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Admin Folder - Admin Document',
       folderId: adminFolder.id,
@@ -2473,9 +2492,9 @@ test('[TEAMS]: team manager can access admin folder via URL and see manager and
 });
 
 test('[TEAMS]: team owner can see all folders in folder list', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Only Folder',
       teamId: team.id,
@@ -2483,7 +2502,7 @@ test('[TEAMS]: team owner can see all folders in folder list', async ({ page })
     },
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -2491,7 +2510,7 @@ test('[TEAMS]: team owner can see all folders in folder list', async ({ page })
     },
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -2501,7 +2520,7 @@ test('[TEAMS]: team owner can see all folders in folder list', async ({ page })
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents`,
   });
 
@@ -2511,9 +2530,9 @@ test('[TEAMS]: team owner can see all folders in folder list', async ({ page })
 });
 
 test('[TEAMS]: team owner can see all documents in admin folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  const adminFolder = await seedBlankFolder(team.owner, {
+  const adminFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Only Folder',
       teamId: team.id,
@@ -2521,7 +2540,7 @@ test('[TEAMS]: team owner can see all documents in admin folder', async ({ page
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Admin Folder - Everyone Document',
       folderId: adminFolder.id,
@@ -2530,7 +2549,7 @@ test('[TEAMS]: team owner can see all documents in admin folder', async ({ page
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Admin Folder - Manager Document',
       folderId: adminFolder.id,
@@ -2539,7 +2558,7 @@ test('[TEAMS]: team owner can see all documents in admin folder', async ({ page
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Admin Folder - Admin Document',
       folderId: adminFolder.id,
@@ -2550,7 +2569,7 @@ test('[TEAMS]: team owner can see all documents in admin folder', async ({ page
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents/f/${adminFolder.id}`,
   });
 
@@ -2561,9 +2580,9 @@ test('[TEAMS]: team owner can see all documents in admin folder', async ({ page
 });
 
 test('[TEAMS]: team owner can see all documents in manager folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  const managerFolder = await seedBlankFolder(team.owner, {
+  const managerFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -2571,7 +2590,7 @@ test('[TEAMS]: team owner can see all documents in manager folder', async ({ pag
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Manager Folder - Everyone Document',
       folderId: managerFolder.id,
@@ -2580,7 +2599,7 @@ test('[TEAMS]: team owner can see all documents in manager folder', async ({ pag
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Manager Folder - Manager Document',
       folderId: managerFolder.id,
@@ -2589,7 +2608,7 @@ test('[TEAMS]: team owner can see all documents in manager folder', async ({ pag
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Manager Folder - Admin Document',
       folderId: managerFolder.id,
@@ -2600,7 +2619,7 @@ test('[TEAMS]: team owner can see all documents in manager folder', async ({ pag
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents/f/${managerFolder.id}`,
   });
 
@@ -2611,9 +2630,9 @@ test('[TEAMS]: team owner can see all documents in manager folder', async ({ pag
 });
 
 test('[TEAMS]: team owner can see all documents in everyone folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
-  const everyoneFolder = await seedBlankFolder(team.owner, {
+  const everyoneFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -2621,7 +2640,7 @@ test('[TEAMS]: team owner can see all documents in everyone folder', async ({ pa
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Everyone Folder - Everyone Document',
       folderId: everyoneFolder.id,
@@ -2630,7 +2649,7 @@ test('[TEAMS]: team owner can see all documents in everyone folder', async ({ pa
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Everyone Folder - Manager Document',
       folderId: everyoneFolder.id,
@@ -2639,7 +2658,7 @@ test('[TEAMS]: team owner can see all documents in everyone folder', async ({ pa
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Everyone Folder - Admin Document',
       folderId: everyoneFolder.id,
@@ -2650,7 +2669,7 @@ test('[TEAMS]: team owner can see all documents in everyone folder', async ({ pa
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: teamOwner.email,
     redirectPath: `/t/${team.url}/documents/f/${everyoneFolder.id}`,
   });
 
@@ -2661,7 +2680,7 @@ test('[TEAMS]: team owner can see all documents in everyone folder', async ({ pa
 });
 
 test('[TEAMS]: team admin can see all folders in folder list', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamAdmin = await seedTeamMember({
     teamId: team.id,
@@ -2669,7 +2688,7 @@ test('[TEAMS]: team admin can see all folders in folder list', async ({ page })
     role: TeamMemberRole.ADMIN,
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Only Folder',
       teamId: team.id,
@@ -2677,7 +2696,7 @@ test('[TEAMS]: team admin can see all folders in folder list', async ({ page })
     },
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -2685,7 +2704,7 @@ test('[TEAMS]: team admin can see all folders in folder list', async ({ page })
     },
   });
 
-  await seedBlankFolder(team.owner, {
+  await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -2705,7 +2724,7 @@ test('[TEAMS]: team admin can see all folders in folder list', async ({ page })
 });
 
 test('[TEAMS]: team admin can see all documents in admin folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamAdmin = await seedTeamMember({
     teamId: team.id,
@@ -2713,7 +2732,7 @@ test('[TEAMS]: team admin can see all documents in admin folder', async ({ page
     role: TeamMemberRole.ADMIN,
   });
 
-  const adminFolder = await seedBlankFolder(team.owner, {
+  const adminFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Admin Only Folder',
       teamId: team.id,
@@ -2721,7 +2740,7 @@ test('[TEAMS]: team admin can see all documents in admin folder', async ({ page
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Admin Folder - Everyone Document',
       folderId: adminFolder.id,
@@ -2730,7 +2749,7 @@ test('[TEAMS]: team admin can see all documents in admin folder', async ({ page
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Admin Folder - Manager Document',
       folderId: adminFolder.id,
@@ -2739,7 +2758,7 @@ test('[TEAMS]: team admin can see all documents in admin folder', async ({ page
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Admin Folder - Admin Document',
       folderId: adminFolder.id,
@@ -2761,7 +2780,7 @@ test('[TEAMS]: team admin can see all documents in admin folder', async ({ page
 });
 
 test('[TEAMS]: team admin can see all documents in manager folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamAdmin = await seedTeamMember({
     teamId: team.id,
@@ -2769,7 +2788,7 @@ test('[TEAMS]: team admin can see all documents in manager folder', async ({ pag
     role: TeamMemberRole.ADMIN,
   });
 
-  const managerFolder = await seedBlankFolder(team.owner, {
+  const managerFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Manager Folder',
       teamId: team.id,
@@ -2777,7 +2796,7 @@ test('[TEAMS]: team admin can see all documents in manager folder', async ({ pag
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Manager Folder - Everyone Document',
       folderId: managerFolder.id,
@@ -2786,7 +2805,7 @@ test('[TEAMS]: team admin can see all documents in manager folder', async ({ pag
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Manager Folder - Manager Document',
       folderId: managerFolder.id,
@@ -2795,7 +2814,7 @@ test('[TEAMS]: team admin can see all documents in manager folder', async ({ pag
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Manager Folder - Admin Document',
       folderId: managerFolder.id,
@@ -2817,7 +2836,7 @@ test('[TEAMS]: team admin can see all documents in manager folder', async ({ pag
 });
 
 test('[TEAMS]: team admin can see all documents in everyone folder', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { team, teamOwner } = await seedTeamDocuments();
 
   const teamAdmin = await seedTeamMember({
     teamId: team.id,
@@ -2825,7 +2844,7 @@ test('[TEAMS]: team admin can see all documents in everyone folder', async ({ pa
     role: TeamMemberRole.ADMIN,
   });
 
-  const everyoneFolder = await seedBlankFolder(team.owner, {
+  const everyoneFolder = await seedBlankFolder(teamOwner, team.id, {
     createFolderOptions: {
       name: 'Everyone Folder',
       teamId: team.id,
@@ -2833,7 +2852,7 @@ test('[TEAMS]: team admin can see all documents in everyone folder', async ({ pa
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Everyone Folder - Everyone Document',
       folderId: everyoneFolder.id,
@@ -2842,7 +2861,7 @@ test('[TEAMS]: team admin can see all documents in everyone folder', async ({ pa
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Everyone Folder - Manager Document',
       folderId: everyoneFolder.id,
@@ -2851,7 +2870,7 @@ test('[TEAMS]: team admin can see all documents in everyone folder', async ({ pa
     },
   });
 
-  await seedBlankDocument(team.owner, {
+  await seedBlankDocument(teamOwner, team.id, {
     createDocumentOptions: {
       title: 'Everyone Folder - Admin Document',
       folderId: everyoneFolder.id,
diff --git a/packages/app-tests/e2e/organisations/manage-organisation.spec.ts b/packages/app-tests/e2e/organisations/manage-organisation.spec.ts
new file mode 100644
index 000000000..b870b07a8
--- /dev/null
+++ b/packages/app-tests/e2e/organisations/manage-organisation.spec.ts
@@ -0,0 +1,565 @@
+import { expect, test } from '@playwright/test';
+
+import { createTeam } from '@documenso/lib/server-only/team/create-team';
+import { nanoid } from '@documenso/lib/universal/id';
+import { seedOrganisationMembers } from '@documenso/prisma/seed/organisations';
+import { seedUser } from '@documenso/prisma/seed/users';
+
+import { apiSignin, apiSignout } from '../fixtures/authentication';
+import { expectTextToBeVisible, expectTextToNotBeVisible } from '../fixtures/generic';
+
+test('[ORGANISATIONS]: create and delete organisation', async ({ page }) => {
+  const { user, organisation } = await seedUser({
+    isPersonalOrganisation: false,
+  });
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/settings/organisations`,
+  });
+
+  await expect(page.getByRole('button', { name: 'Leave' })).toBeDisabled();
+
+  await page.getByRole('link', { name: 'Manage' }).click();
+  await page.waitForURL(`/o/${organisation.url}/settings/general`);
+
+  await page.getByRole('button', { name: 'Delete' }).click();
+  await page
+    .getByLabel(`Confirm by typing delete ${organisation.name}`)
+    .fill(`delete ${organisation.name}`);
+  await page.getByRole('button', { name: 'Delete' }).click();
+
+  await page.waitForURL(`/settings/organisations`);
+  await expect(page.getByText('No results found')).toBeVisible();
+  await page.getByRole('button', { name: 'Create organisation' }).click();
+
+  await page.getByLabel('Organisation Name*').fill('test');
+  await page.getByRole('button', { name: 'Create' }).click();
+  await expect(page.getByText('Your organisation has been created').first()).toBeVisible();
+  await page.reload();
+
+  await page.getByRole('row').filter({ hasText: 'test' }).getByRole('link').nth(1).click();
+});
+
+test('[ORGANISATIONS]: manage general settings', async ({ page }) => {
+  const { user, organisation } = await seedUser({
+    isPersonalOrganisation: false,
+  });
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/o/${organisation.url}/settings/general`,
+  });
+
+  const updatedOrganisationId = `organisation-${Date.now()}`;
+
+  // Update team.
+  await page.getByLabel('Organisation Name*').click();
+  await page.getByLabel('Organisation Name*').clear();
+  await page.getByLabel('Organisation Name*').fill(updatedOrganisationId);
+  await page.getByLabel('Organisation URL*').click();
+  await page.getByLabel('Organisation URL*').clear();
+  await page.getByLabel('Organisation URL*').fill(updatedOrganisationId);
+
+  await page.getByRole('button', { name: 'Update organisation' }).click();
+
+  // Check we have been redirected to the new organisation URL and the name is updated.
+  await page.waitForURL(`/o/${updatedOrganisationId}/settings/general`);
+});
+
+test('[ORGANISATIONS]: inherit members', async ({ page }) => {
+  const {
+    user,
+    organisation,
+    team: teamWithInheritMembers,
+  } = await seedUser({
+    isPersonalOrganisation: false,
+  });
+
+  const teamWithoutInheritedMembersUrl = `team-${nanoid()}`;
+
+  await createTeam({
+    userId: user.id,
+    teamName: 'No inherit',
+    teamUrl: teamWithoutInheritedMembersUrl,
+    organisationId: organisation.id,
+    inheritMembers: false,
+  });
+
+  const memberEmail = `member-${nanoid()}@test.documenso.com`;
+  const memberEmail2 = `member-2-${nanoid()}@test.documenso.com`;
+  const memberEmail3 = `member-3-${nanoid()}@test.documenso.com`;
+  const managerEmail = `manager-${nanoid()}@test.documenso.com`;
+  const adminEmail = `admin-${nanoid()}@test.documenso.com`;
+  const ownerEmail = user.email;
+
+  await seedOrganisationMembers({
+    members: [
+      {
+        email: memberEmail,
+        name: 'Member 1',
+        organisationRole: 'MEMBER',
+      },
+      {
+        email: memberEmail2,
+        name: 'Member 2',
+        organisationRole: 'MEMBER',
+      },
+      {
+        email: memberEmail3,
+        name: 'Member 3',
+        organisationRole: 'MEMBER',
+      },
+      {
+        email: managerEmail,
+        name: 'Manager',
+        organisationRole: 'MANAGER',
+      },
+      {
+        email: adminEmail,
+        name: 'Admin',
+        organisationRole: 'ADMIN',
+      },
+    ],
+    organisationId: organisation.id,
+  });
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/t/${teamWithoutInheritedMembersUrl}/settings/members`,
+  });
+
+  // Check from admin POV that member counts are correct
+  // You should only see the manager/admins from the organisation in this table.
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Team Admin' }).getByText(managerEmail),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Team Admin' }).getByText(adminEmail),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Team Admin' }).getByText(ownerEmail),
+  ).toBeVisible();
+  await expect(page.getByRole('row').filter({ hasText: memberEmail })).not.toBeVisible();
+  await expect(page.getByRole('row').filter({ hasText: memberEmail2 })).not.toBeVisible();
+  await expect(page.getByRole('row').filter({ hasText: memberEmail3 })).not.toBeVisible();
+
+  // Explicitly add a member to the team.
+  await page.getByRole('button', { name: 'Add members' }).click();
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Member 1' }).first().click();
+  await page.getByRole('button', { name: 'Next' }).click();
+  await page.getByRole('button', { name: 'Add Members' }).click();
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Team Member' }).getByText(memberEmail),
+  ).toBeVisible();
+
+  await page.goto(`/t/${teamWithInheritMembers.url}/settings/members`);
+
+  // Check from member POV that member counts are correct for inherit members team.
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Team Admin' }).getByText(managerEmail),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Team Admin' }).getByText(adminEmail),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Team Admin' }).getByText(ownerEmail),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Team Member' }).getByText(memberEmail),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Team Member' }).getByText(memberEmail2),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Team Member' }).getByText(memberEmail3),
+  ).toBeVisible();
+
+  // Disable inherit mode.
+  await page.goto(`/t/${teamWithInheritMembers.url}/settings/groups`);
+  await page.getByRole('button', { name: 'Disable access' }).click();
+  await page.getByRole('button', { name: 'Disable' }).click();
+  await expect(page.getByText('Enable Access').first()).toBeVisible();
+
+  // Expect the inherited members to disappear
+  await page.goto(`/t/${teamWithInheritMembers.url}/settings/members`);
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Team Admin' }).getByText(managerEmail),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Team Admin' }).getByText(adminEmail),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Team Admin' }).getByText(ownerEmail),
+  ).toBeVisible();
+  await expect(page.getByRole('row').filter({ hasText: memberEmail })).not.toBeVisible();
+  await expect(page.getByRole('row').filter({ hasText: memberEmail2 })).not.toBeVisible();
+  await expect(page.getByRole('row').filter({ hasText: memberEmail3 })).not.toBeVisible();
+});
+
+test('[ORGANISATIONS]: manage groups and members', async ({ page }) => {
+  const {
+    user,
+    organisation,
+    team: teamInherit,
+  } = await seedUser({
+    isPersonalOrganisation: false,
+  });
+
+  const teamInheritName = teamInherit.name;
+
+  const teamA = `team-${nanoid()}`;
+  const teamAName = `TeamA - No inherit`;
+  const teamB = `team-${nanoid()}`;
+  const teamBName = `TeamB - No inherit`;
+
+  await createTeam({
+    userId: user.id,
+    teamName: teamAName,
+    teamUrl: teamA,
+    organisationId: organisation.id,
+    inheritMembers: false,
+  });
+
+  await createTeam({
+    userId: user.id,
+    teamName: teamBName,
+    teamUrl: teamB,
+    organisationId: organisation.id,
+    inheritMembers: false,
+  });
+
+  const memberEmail1 = `member-1-${nanoid()}@test.documenso.com`;
+  const memberEmail2 = `member-2-${nanoid()}@test.documenso.com`;
+  const memberEmail3 = `member-3-${nanoid()}@test.documenso.com`;
+  const memberEmail4 = `member-4-${nanoid()}@test.documenso.com`;
+  const memberEmail5 = `member-5-${nanoid()}@test.documenso.com`;
+  const memberEmail6 = `member-6-${nanoid()}@test.documenso.com`;
+
+  const adminEmail1 = `admin-1-${nanoid()}@test.documenso.com`;
+  const adminEmail2 = `admin-2-${nanoid()}@test.documenso.com`;
+  const adminEmail3 = `admin-3-${nanoid()}@test.documenso.com`;
+
+  const ownerEmail = user.email;
+
+  await seedOrganisationMembers({
+    members: [
+      {
+        email: memberEmail1,
+        name: 'Member1',
+        organisationRole: 'MEMBER',
+      },
+      {
+        email: memberEmail2,
+        name: 'Member2',
+        organisationRole: 'MEMBER',
+      },
+      {
+        email: memberEmail3,
+        name: 'Member3',
+        organisationRole: 'MEMBER',
+      },
+      {
+        email: memberEmail4,
+        name: 'Member4',
+        organisationRole: 'MEMBER',
+      },
+      {
+        email: memberEmail5,
+        name: 'Member5',
+        organisationRole: 'MEMBER',
+      },
+      {
+        email: memberEmail6,
+        name: 'Member6',
+        organisationRole: 'MEMBER',
+      },
+      {
+        email: adminEmail1,
+        name: 'Admin1',
+        organisationRole: 'ADMIN',
+      },
+      {
+        email: adminEmail2,
+        name: 'Admin2',
+        organisationRole: 'ADMIN',
+      },
+      {
+        email: adminEmail3,
+        name: 'Admin3',
+        organisationRole: 'ADMIN',
+      },
+    ],
+    organisationId: organisation.id,
+  });
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/o/${organisation.url}/settings/groups`,
+  });
+
+  // Create a custom group A with 3 members "ORGANISATION ADMIN" to check that they get the correct roles.
+  await page.getByRole('button', { name: 'Create group' }).click();
+  await page.getByRole('textbox', { name: 'Group Name *' }).fill('CUSTOM_GROUP');
+  await page.getByRole('combobox').filter({ hasText: 'Organisation Member' }).click();
+  await page.getByRole('option', { name: 'Organisation Admin' }).click();
+  await page.getByRole('combobox').filter({ hasText: 'Select members' }).click();
+  await page.getByRole('option', { name: 'Member1' }).click();
+  await page.getByRole('option', { name: 'Member2' }).click();
+  await page.getByRole('option', { name: 'Member3' }).click();
+  await page.getByTestId('dialog-create-organisation-button').click();
+  await expect(page.getByText('Group has been created.').first()).toBeVisible();
+
+  await page.goto(`/o/${organisation.url}/settings/members`);
+
+  // Confirm org roles have been applied to these members.
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Organisation Admin' }).getByText(memberEmail1),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Organisation Admin' }).getByText(memberEmail2),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Organisation Admin' }).getByText(memberEmail3),
+  ).toBeVisible();
+
+  // Test updating the group.
+  await page.goto(`/o/${organisation.url}/settings/groups`);
+  await page.getByRole('link', { name: 'Manage' }).click();
+  await page.getByRole('textbox', { name: 'Group Name *' }).fill('CUSTOM_GROUP_A');
+  await page.getByRole('combobox').filter({ hasText: 'Organisation Admin' }).click();
+  await page.getByRole('option', { name: 'Organisation Member' }).click();
+  await page.getByRole('combobox').filter({ hasText: 'Member1, Member2, Member3' }).click();
+  await page.getByRole('option', { name: 'Member3' }).click();
+  await page.getByRole('button', { name: 'Update' }).click();
+  await expect(page.getByText('Group has been updated successfully').first()).toBeVisible();
+
+  await page.goto(`/o/${organisation.url}/settings/groups`);
+
+  // Create a custom member group with the 3 admins to check that they still get the ADMIN roles.
+  await page.getByRole('button', { name: 'Create group' }).click();
+  await page.getByRole('textbox', { name: 'Group Name *' }).fill('CUSTOM_GROUP_ADMINS');
+  await page.getByRole('combobox').filter({ hasText: 'Select members' }).click();
+  await page.getByRole('option', { name: 'Admin1' }).click();
+  await page.getByRole('option', { name: 'Admin2' }).click();
+  await page.getByRole('option', { name: 'Admin3' }).click();
+  await page.getByTestId('dialog-create-organisation-button').click();
+  await expect(page.getByText('Group has been created.').first()).toBeVisible();
+
+  await page.goto(`/o/${organisation.url}/settings/members`);
+
+  // Confirm admins still get admin roles.
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Organisation Admin' }).getByText(adminEmail1),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Organisation Admin' }).getByText(adminEmail2),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Organisation Admin' }).getByText(adminEmail3),
+  ).toBeVisible();
+
+  // Create another custom group with 3 members with "ORGANISATION MEMBER" role.
+  await page.goto(`/o/${organisation.url}/settings/groups`);
+  await page.getByRole('button', { name: 'Create group' }).click();
+  await page.getByRole('textbox', { name: 'Group Name *' }).fill('CUSTOM_GROUP_B');
+  await page.getByRole('combobox').filter({ hasText: 'Organisation Member' }).click();
+  await page.getByRole('option', { name: 'Organisation Admin' }).click();
+  await page.getByRole('combobox').filter({ hasText: 'Select members' }).click();
+  await page.getByRole('option', { name: 'Member4' }).click();
+  await page.getByRole('option', { name: 'Member5' }).click();
+  await page.getByTestId('dialog-create-organisation-button').click();
+  await expect(page.getByText('Group has been created.').first()).toBeVisible();
+
+  // Assign CUSTOM_GROUP_A to TeamA
+  await page.goto(`/t/${teamA}/settings/groups`);
+  await page.getByRole('button', { name: 'Add groups' }).click();
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'CUSTOM_GROUP_A', exact: true }).click();
+  await page.getByRole('button', { name: 'Next' }).click();
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Manager' }).click();
+  await page.getByRole('button', { name: 'Create Groups' }).click();
+  await expect(page.getByText('Team members have been added').first()).toBeVisible();
+
+  // Assign CUSTOM_GROUP_B to TeamA
+  await page.goto(`/t/${teamA}/settings/groups`);
+  await page.getByRole('button', { name: 'Add groups' }).click();
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'CUSTOM_GROUP_B', exact: true }).click();
+  await page.getByRole('button', { name: 'Next' }).click();
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Manager' }).click();
+  await page.getByRole('button', { name: 'Create Groups' }).click();
+  await expect(page.getByText('Team members have been added').first()).toBeVisible();
+
+  // Update CUSTOM_GROUP_B
+  await page.getByRole('row', { name: 'CUSTOM_GROUP_B' }).getByRole('button').click();
+  await page.getByRole('menuitem', { name: 'Update role' }).click();
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: 'Team Admin' }).click();
+  await page.getByRole('button', { name: 'Update' }).click();
+  await expectTextToBeVisible(page, 'You have updated the team group');
+  await expect(page.getByText('Team Admin').first()).toBeVisible();
+  await page.reload();
+
+  // Delete CUSTOM_GROUP_B
+  await page.getByRole('row', { name: 'CUSTOM_GROUP_B' }).getByRole('button').click();
+  await page.getByRole('menuitem', { name: 'Remove' }).click();
+  await page.getByRole('button', { name: 'Delete' }).click();
+  await expectTextToBeVisible(page, 'You have successfully removed this group from the team.');
+  await expect(page.getByText('CUSTOM_GROUP_B')).not.toBeVisible();
+
+  // Navigate to team members and validate members are there.
+  await page.goto(`/t/${teamA}/settings/members`);
+
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Team Manager' }).getByText(memberEmail1),
+  ).toBeVisible();
+  await expect(
+    page.getByRole('row').filter({ hasText: 'Team Manager' }).getByText(memberEmail2),
+  ).toBeVisible();
+
+  // Member 1 should see inherit team and teamA
+  await apiSignout({ page });
+  await apiSignin({ page, email: memberEmail1, redirectPath: `/o/${organisation.url}` });
+  await expectTextToBeVisible(page, teamInheritName);
+  await expectTextToBeVisible(page, teamAName);
+  await expectTextToNotBeVisible(page, teamBName);
+
+  // Member 3 should only see inherit team
+  await apiSignout({ page });
+  await apiSignin({ page, email: memberEmail3, redirectPath: `/o/${organisation.url}` });
+  await expectTextToBeVisible(page, teamInheritName);
+  await expectTextToNotBeVisible(page, teamAName);
+  await expectTextToNotBeVisible(page, teamBName);
+
+  // Admin 1 should see all teams.
+  await apiSignout({ page });
+  await apiSignin({ page, email: adminEmail1, redirectPath: `/o/${organisation.url}` });
+  await expectTextToBeVisible(page, teamInheritName);
+  await expectTextToBeVisible(page, teamAName);
+  await expectTextToBeVisible(page, teamBName);
+});
+
+test('[ORGANISATIONS]: member invites', async ({ page }) => {
+  const { user, organisation, team } = await seedUser({
+    inheritMembers: false,
+  });
+
+  const { user: user2 } = await seedUser({
+    isPersonalOrganisation: false,
+  });
+  const { user: user3 } = await seedUser({
+    isPersonalOrganisation: false,
+  });
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/o/${organisation.url}/settings/members`,
+  });
+
+  await page.getByRole('button', { name: 'Invite member' }).click();
+  await page.getByRole('textbox', { name: 'Email address *' }).click();
+  await page.getByRole('textbox', { name: 'Email address *' }).fill(user2.email);
+  await page.getByRole('button', { name: 'Add more' }).click();
+
+  await page.locator('input[name="invitations\\.1\\.email"]').fill(user3.email);
+  await page.getByRole('button', { name: 'Invite' }).click();
+
+  await page.getByRole('tab', { name: 'Pending' }).click();
+  await expect(page.getByText(user2.email)).toBeVisible();
+  await expect(page.getByText(user3.email)).toBeVisible();
+
+  await page.getByRole('row', { name: user3.email }).getByRole('button').click();
+  await page.getByRole('menuitem', { name: 'Remove' }).click();
+  await expect(page.getByText('Invitation has been deleted').first()).toBeVisible();
+  await expect(page.getByText(user3.email)).not.toBeVisible();
+
+  // Sign in as member and accept invite
+  await apiSignout({ page });
+  await apiSignin({ page, email: user2.email, redirectPath: `/settings/organisations` });
+  await page.getByRole('button', { name: 'View invites' }).click();
+  await page.getByRole('button', { name: 'Accept' }).click();
+  await expect(page.getByText('Invitation accepted').first()).toBeVisible();
+
+  // Sign back in as org owner.
+  await apiSignout({ page });
+  await apiSignin({ page, email: user.email, redirectPath: `/t/${team.url}/settings/members` });
+
+  // Expect 1 member in team.
+  await expect(page.getByText(user.email)).toBeVisible();
+  await expect(page.getByText(user2.email)).not.toBeVisible();
+
+  // Add member to team.
+  await page.getByRole('button', { name: 'Add members' }).click();
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: user2.name ?? '' }).click();
+  await page.getByRole('button', { name: 'Next' }).click();
+  await page.getByRole('button', { name: 'Add Members' }).click();
+
+  // Expect 2 members to be visible.
+  await expect(page.getByText(user.email)).toBeVisible();
+  await expect(page.getByText(user2.email)).toBeVisible();
+
+  await page.getByRole('row', { name: user2.email }).getByRole('button').click();
+  await page.getByRole('menuitem', { name: 'Remove' }).click();
+  await page.getByRole('button', { name: 'Remove' }).click();
+  await expect(page.getByText('You have successfully removed').first()).toBeVisible();
+
+  // Expect 1 member in team.
+  await expect(page.getByText(user.email)).toBeVisible();
+  await expect(page.getByText(user2.email)).not.toBeVisible();
+
+  // Expect 2 members in organisation.
+  await page.goto(`/o/${organisation.url}/settings/members`);
+  await expect(page.getByText(user.email)).toBeVisible();
+  await expect(page.getByText(user2.email)).toBeVisible();
+
+  await page.getByRole('row', { name: user2.email }).getByRole('button').click();
+  await page.getByRole('menuitem', { name: 'Remove' }).click();
+  await page.getByRole('button', { name: 'Delete' }).click();
+  await expect(page.getByText('You have successfully removed this user').first()).toBeVisible();
+
+  // Expect 1 member in organisation.
+  await expect(page.getByText(user.email)).toBeVisible();
+  await expect(page.getByText(user2.email)).not.toBeVisible();
+});
+
+test('[ORGANISATIONS]: leave organisation', async ({ page }) => {
+  const { organisation } = await seedUser({
+    isPersonalOrganisation: false,
+  });
+
+  const memberEmail = `member-${nanoid()}@test.documenso.com`;
+
+  await seedOrganisationMembers({
+    members: [
+      {
+        email: memberEmail,
+        name: 'Member 1',
+        organisationRole: 'MEMBER',
+      },
+    ],
+    organisationId: organisation.id,
+  });
+
+  await apiSignin({
+    page,
+    email: memberEmail,
+    redirectPath: `/settings/organisations`,
+  });
+  await page.getByRole('button', { name: 'Leave' }).click();
+  await page.getByRole('button', { name: 'Leave' }).click();
+
+  await expect(
+    page.getByText('You have successfully left this organisation').first(),
+  ).toBeVisible();
+  await expect(page.getByText('No results found').first()).toBeVisible();
+});
diff --git a/packages/app-tests/e2e/organisations/organisation-team-preferences.spec.ts b/packages/app-tests/e2e/organisations/organisation-team-preferences.spec.ts
new file mode 100644
index 000000000..dff2d5ddd
--- /dev/null
+++ b/packages/app-tests/e2e/organisations/organisation-team-preferences.spec.ts
@@ -0,0 +1,113 @@
+import { expect, test } from '@playwright/test';
+
+import { getTeamSettings } from '@documenso/lib/server-only/team/get-team-settings';
+import { prisma } from '@documenso/prisma';
+import { DocumentVisibility } from '@documenso/prisma/client';
+import { seedTeamDocumentWithMeta } from '@documenso/prisma/seed/documents';
+import { seedUser } from '@documenso/prisma/seed/users';
+
+import { apiSignin } from '../fixtures/authentication';
+
+test('[ORGANISATIONS]: manage preferences', async ({ page }) => {
+  const { user, organisation, team } = await seedUser({
+    isPersonalOrganisation: false,
+  });
+
+  await apiSignin({
+    page,
+    email: user.email,
+    redirectPath: `/o/${organisation.url}/settings/preferences`,
+  });
+
+  // Update document preferences.
+  await page.getByRole('combobox').filter({ hasText: 'Everyone can access and view' }).click();
+  await page.getByRole('option', { name: 'Only managers and above can' }).click();
+  await page.getByRole('combobox').filter({ hasText: 'English' }).click();
+  await page.getByRole('option', { name: 'German' }).click();
+  await page.getByTestId('signature-types-combobox').click();
+  await page.getByRole('option', { name: 'Draw' }).click();
+  await page.getByRole('option', { name: 'Upload' }).click();
+  await page.getByRole('combobox').nth(3).click();
+  await page.getByRole('option', { name: 'No' }).click();
+  await page.getByRole('combobox').filter({ hasText: 'Yes' }).click();
+  await page.getByRole('option', { name: 'No' }).click();
+  await page.getByRole('button', { name: 'Update' }).first().click();
+  await expect(page.getByText('Your document preferences have been updated').first()).toBeVisible();
+
+  // Update branding.
+  await page.getByTestId('enable-branding').click();
+  await page.getByRole('option', { name: 'Yes' }).click();
+  await page.getByRole('textbox', { name: 'Brand Website' }).click();
+  await page.getByRole('textbox', { name: 'Brand Website' }).fill('https://documenso.com');
+  await page.getByRole('textbox', { name: 'Brand Details' }).click();
+  await page.getByRole('textbox', { name: 'Brand Details' }).fill('BrandDetails');
+  await page.getByRole('button', { name: 'Update' }).nth(1).click();
+  await expect(page.getByText('Your branding preferences have been updated').first()).toBeVisible();
+
+  const teamSettings = await getTeamSettings({
+    teamId: team.id,
+  });
+
+  // Check that the team settings have inherited these values.
+  expect(teamSettings.documentVisibility).toEqual(DocumentVisibility.MANAGER_AND_ABOVE);
+  expect(teamSettings.documentLanguage).toEqual('de');
+  expect(teamSettings.includeSenderDetails).toEqual(false);
+  expect(teamSettings.includeSigningCertificate).toEqual(false);
+  expect(teamSettings.typedSignatureEnabled).toEqual(true);
+  expect(teamSettings.uploadSignatureEnabled).toEqual(false);
+  expect(teamSettings.drawSignatureEnabled).toEqual(false);
+  expect(teamSettings.brandingEnabled).toEqual(true);
+  expect(teamSettings.brandingUrl).toEqual('https://documenso.com');
+  expect(teamSettings.brandingCompanyDetails).toEqual('BrandDetails');
+
+  // Edit the team settings
+  await page.goto(`/t/${team.url}/settings/preferences`);
+
+  await page
+    .getByRole('group')
+    .locator('div')
+    .filter({
+      hasText: 'Default Document Visibility',
+    })
+    .getByRole('combobox')
+    .click();
+  await page.getByRole('option', { name: 'Everyone can access and view' }).click();
+  await page
+    .getByRole('group')
+    .locator('div')
+    .filter({ hasText: 'Default Document Language' })
+    .getByRole('combobox')
+    .click();
+  await page.getByRole('option', { name: 'Polish' }).click();
+  await page.getByRole('button', { name: 'Update' }).first().click();
+  await expect(page.getByText('Your document preferences have been updated').first()).toBeVisible();
+
+  const updatedTeamSettings = await getTeamSettings({
+    teamId: team.id,
+  });
+
+  // Check that the team settings have inherited/overriden the correct values.
+  expect(updatedTeamSettings.documentVisibility).toEqual(DocumentVisibility.EVERYONE);
+  expect(updatedTeamSettings.documentLanguage).toEqual('pl');
+  expect(updatedTeamSettings.includeSenderDetails).toEqual(false);
+  expect(updatedTeamSettings.includeSigningCertificate).toEqual(false);
+  expect(updatedTeamSettings.typedSignatureEnabled).toEqual(true);
+  expect(updatedTeamSettings.uploadSignatureEnabled).toEqual(false);
+  expect(updatedTeamSettings.drawSignatureEnabled).toEqual(false);
+
+  const document = await seedTeamDocumentWithMeta(team);
+
+  const documentMeta = await prisma.documentMeta.findFirstOrThrow({
+    where: {
+      documentId: document.id,
+    },
+  });
+
+  // Confirm the settings have been applied to a newly created document.
+  expect(document.visibility).toEqual(DocumentVisibility.EVERYONE);
+
+  expect(documentMeta.typedSignatureEnabled).toEqual(true);
+  expect(documentMeta.uploadSignatureEnabled).toEqual(false);
+  expect(documentMeta.drawSignatureEnabled).toEqual(false);
+  expect(documentMeta.language).toEqual('pl');
+});
diff --git a/packages/app-tests/e2e/public-profiles/public-profiles.spec.ts b/packages/app-tests/e2e/public-profiles/public-profiles.spec.ts
index 52f203c98..2fb19d750 100644
--- a/packages/app-tests/e2e/public-profiles/public-profiles.spec.ts
+++ b/packages/app-tests/e2e/public-profiles/public-profiles.spec.ts
@@ -1,82 +1,13 @@
 import { expect, test } from '@playwright/test';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { seedTeam } from '@documenso/prisma/seed/teams';
 import { seedDirectTemplate } from '@documenso/prisma/seed/templates';
 import { seedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin } from '../fixtures/authentication';
 
-test('[PUBLIC_PROFILE]: create profile', async ({ page }) => {
-  const user = await seedUser();
-
-  // Create direct template.
-  const directTemplate = await seedDirectTemplate({
-    userId: user.id,
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: '/settings/public-profile',
-  });
-
-  const publicProfileUrl = Date.now().toString();
-  const publicProfileBio = `public-profile-bio`;
-
-  await page.getByRole('textbox', { name: 'Public profile URL' }).click();
-  await page.getByRole('textbox', { name: 'Public profile URL' }).fill(publicProfileUrl);
-
-  await page.getByRole('textbox', { name: 'Bio' }).click();
-  await page.getByRole('textbox', { name: 'Bio' }).fill(publicProfileBio);
-
-  await page.getByRole('button', { name: 'Update' }).click();
-
-  await expect(page.getByRole('status').first()).toContainText(
-    'Your public profile has been updated.',
-  );
-
-  // Link direct template to public profile.
-  await page.getByRole('button', { name: 'Link template' }).click();
-  await page.getByRole('cell', { name: directTemplate.title }).click();
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  await page.getByRole('textbox', { name: 'Title *' }).fill('public-direct-template-title');
-  await page
-    .getByRole('textbox', { name: 'Description *' })
-    .fill('public-direct-template-description');
-  await page.getByRole('button', { name: 'Update' }).click();
-
-  // Check that public profile is disabled.
-  await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/p/${publicProfileUrl}`);
-  await expect(page.locator('body')).toContainText('404 Profile not found');
-
-  // Go back to public profile page.
-  await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/settings/public-profile`);
-  await page.getByRole('switch').click();
-  await page.waitForTimeout(1000);
-
-  // Assert values.
-  await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/p/${publicProfileUrl}`);
-  await expect(page.getByRole('main')).toContainText(publicProfileBio);
-  await expect(page.locator('body')).toContainText('public-direct-template-title');
-  await expect(page.locator('body')).toContainText('public-direct-template-description');
-
-  await page.getByRole('link', { name: 'Sign' }).click();
-  await page.getByRole('button', { name: 'Continue' }).click();
-  await page.getByRole('button', { name: 'Complete' }).click();
-  await page.getByRole('button', { name: 'Sign' }).click();
-
-  await expect(page.getByRole('heading', { name: 'Document Signed' })).toBeVisible();
-  await expect(page.getByRole('heading')).toContainText('Document Signed');
-});
-
 test('[PUBLIC_PROFILE]: create team profile', async ({ page }) => {
-  const team = await seedTeam({
-    createTeamMembers: 1,
-  });
-
-  const user = team.owner;
+  const { user, team } = await seedUser();
 
   // Create direct template.
   const directTemplate = await seedDirectTemplate({
@@ -84,12 +15,6 @@ test('[PUBLIC_PROFILE]: create team profile', async ({ page }) => {
     teamId: team.id,
   });
 
-  // Create non team template to make sure you can only see the team one.
-  // Will be indirectly asserted because test should fail when 2 elements appear.
-  await seedDirectTemplate({
-    userId: user.id,
-  });
-
   await apiSignin({
     page,
     email: user.email,
diff --git a/packages/app-tests/e2e/teams/manage-team.spec.ts b/packages/app-tests/e2e/teams/manage-team.spec.ts
index d226030ad..d7f1fff66 100644
--- a/packages/app-tests/e2e/teams/manage-team.spec.ts
+++ b/packages/app-tests/e2e/teams/manage-team.spec.ts
@@ -1,13 +1,13 @@
 import { test } from '@playwright/test';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { seedTeam } from '@documenso/prisma/seed/teams';
 import { seedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin } from '../fixtures/authentication';
+import { expectTextToBeVisible } from '../fixtures/generic';
 
 test('[TEAMS]: create team', async ({ page }) => {
-  const user = await seedUser();
+  const { user, organisation } = await seedUser();
 
   test.skip(
     process.env.NEXT_PUBLIC_FEATURE_BILLING_ENABLED === 'true',
@@ -17,7 +17,7 @@ test('[TEAMS]: create team', async ({ page }) => {
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: '/settings/teams',
+    redirectPath: `/o/${organisation.url}/settings/teams`,
   });
 
   const teamId = `team-${Date.now()}`;
@@ -34,38 +34,32 @@ test('[TEAMS]: create team', async ({ page }) => {
 });
 
 test('[TEAMS]: delete team', async ({ page }) => {
-  const team = await seedTeam();
+  const { user, team, organisation } = await seedUser();
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: user.email,
     redirectPath: `/t/${team.url}/settings`,
   });
 
   // Delete team.
-  await page.getByRole('button', { name: 'Delete team' }).click();
-  await page.getByLabel(`Confirm by typing delete ${team.url}`).fill(`delete ${team.url}`);
+  await page.getByRole('button', { name: 'Delete' }).click();
+  await page.getByLabel(`Confirm by typing delete ${team.name}`).fill(`delete ${team.name}`);
   await page.getByRole('button', { name: 'Delete' }).click();
 
-  // Check that we have been redirected to the teams page.
-  await page.waitForURL(`${NEXT_PUBLIC_WEBAPP_URL()}/settings/teams`);
+  // Your team has been successfully deleted
+  await expectTextToBeVisible(page, 'Your team has been successfully deleted');
 });
 
 test('[TEAMS]: update team', async ({ page }) => {
-  const team = await seedTeam();
+  const { user, team } = await seedUser();
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: user.email,
+    redirectPath: `/t/${team.url}/settings`,
   });
 
-  // Navigate to create team page.
-  await page.getByTestId('menu-switcher').click();
-  await page.getByRole('menuitem', { name: 'Manage teams' }).click();
-
-  // Goto team settings page.
-  await page.getByRole('row').filter({ hasText: team.url }).getByRole('link').nth(1).click();
-
   const updatedTeamId = `team-${Date.now()}`;
 
   // Update team.
diff --git a/packages/app-tests/e2e/teams/search-documents.spec.ts b/packages/app-tests/e2e/teams/search-documents.spec.ts
index 940d800ae..feda585d3 100644
--- a/packages/app-tests/e2e/teams/search-documents.spec.ts
+++ b/packages/app-tests/e2e/teams/search-documents.spec.ts
@@ -1,7 +1,10 @@
 import { expect, test } from '@playwright/test';
-import { DocumentStatus, TeamMemberRole } from '@prisma/client';
+import { DocumentStatus, OrganisationMemberRole, TeamMemberRole } from '@prisma/client';
 
+import { generateDatabaseId } from '@documenso/lib/universal/id';
+import { prisma } from '@documenso/prisma';
 import { seedDocuments, seedTeamDocuments } from '@documenso/prisma/seed/documents';
+import { seedOrganisationMembers } from '@documenso/prisma/seed/organisations';
 import { seedTeam, seedTeamMember } from '@documenso/prisma/seed/teams';
 import { seedUser } from '@documenso/prisma/seed/users';
 
@@ -9,38 +12,75 @@ import { apiSignin, apiSignout } from '../fixtures/authentication';
 import { checkDocumentTabCount } from '../fixtures/documents';
 
 test('[TEAMS]: search respects team document visibility', async ({ page }) => {
-  const team = await seedTeam();
-  const adminUser = await seedTeamMember({ teamId: team.id, role: TeamMemberRole.ADMIN });
-  const managerUser = await seedTeamMember({ teamId: team.id, role: TeamMemberRole.MANAGER });
-  const memberUser = await seedTeamMember({ teamId: team.id, role: TeamMemberRole.MEMBER });
+  const { user: owner, organisation, team } = await seedUser();
+
+  const [adminUser, managerUser, memberUser] = await seedOrganisationMembers({
+    organisationId: organisation.id,
+    members: [
+      {
+        organisationRole: OrganisationMemberRole.ADMIN,
+      },
+      {
+        organisationRole: OrganisationMemberRole.MEMBER, // Org managers = team admins so need to workaround this.
+      },
+      {
+        organisationRole: OrganisationMemberRole.MEMBER,
+      },
+    ],
+  });
+
+  const managerTeamGroup = await prisma.teamGroup.findFirstOrThrow({
+    where: {
+      teamId: team.id,
+      teamRole: TeamMemberRole.MANAGER,
+    },
+    include: {
+      organisationGroup: true,
+    },
+  });
+
+  const managerOrganisationMember = await prisma.organisationMember.findFirstOrThrow({
+    where: {
+      organisationId: organisation.id,
+      userId: managerUser.id,
+    },
+  });
+
+  await prisma.organisationGroupMember.create({
+    data: {
+      id: generateDatabaseId('group_member'),
+      groupId: managerTeamGroup.organisationGroupId,
+      organisationMemberId: managerOrganisationMember.id,
+    },
+  });
 
   await seedDocuments([
     {
-      sender: team.owner,
+      sender: owner,
+      teamId: team.id,
       recipients: [],
       type: DocumentStatus.COMPLETED,
       documentOptions: {
-        teamId: team.id,
         visibility: 'EVERYONE',
         title: 'Searchable Document for Everyone',
       },
     },
     {
-      sender: team.owner,
+      sender: owner,
+      teamId: team.id,
       recipients: [],
       type: DocumentStatus.COMPLETED,
       documentOptions: {
-        teamId: team.id,
         visibility: 'MANAGER_AND_ABOVE',
         title: 'Searchable Document for Managers',
       },
     },
     {
-      sender: team.owner,
+      sender: owner,
+      teamId: team.id,
       recipients: [],
       type: DocumentStatus.COMPLETED,
       documentOptions: {
-        teamId: team.id,
         visibility: 'ADMIN',
         title: 'Searchable Document for Admins',
       },
@@ -70,26 +110,30 @@ test('[TEAMS]: search respects team document visibility', async ({ page }) => {
 });
 
 test('[TEAMS]: search does not reveal documents from other teams', async ({ page }) => {
-  const { team: teamA, teamMember2: teamAMember } = await seedTeamDocuments();
-  const { team: teamB } = await seedTeamDocuments();
+  const {
+    team: teamA,
+    teamOwner: teamAOwner,
+    teamMember2: teamAMember,
+  } = await seedTeamDocuments();
+  const { team: teamB, teamOwner: teamBOwner } = await seedTeamDocuments();
 
   await seedDocuments([
     {
-      sender: teamA.owner,
+      sender: teamAOwner,
       recipients: [],
       type: DocumentStatus.COMPLETED,
+      teamId: teamA.id,
       documentOptions: {
-        teamId: teamA.id,
         visibility: 'EVERYONE',
         title: 'Unique Team A Document',
       },
     },
     {
-      sender: teamB.owner,
+      sender: teamBOwner,
       recipients: [],
       type: DocumentStatus.COMPLETED,
+      teamId: teamB.id,
       documentOptions: {
-        teamId: teamB.id,
         visibility: 'EVERYONE',
         title: 'Unique Team B Document',
       },
@@ -112,60 +156,19 @@ test('[TEAMS]: search does not reveal documents from other teams', async ({ page
   await apiSignout({ page });
 });
 
-test('[PERSONAL]: search does not reveal team documents in personal account', async ({ page }) => {
-  const { team, teamMember2 } = await seedTeamDocuments();
-
-  await seedDocuments([
-    {
-      sender: teamMember2,
-      recipients: [],
-      type: DocumentStatus.COMPLETED,
-      documentOptions: {
-        teamId: null,
-        title: 'Personal Unique Document',
-      },
-    },
-    {
-      sender: team.owner,
-      recipients: [],
-      type: DocumentStatus.COMPLETED,
-      documentOptions: {
-        teamId: team.id,
-        visibility: 'EVERYONE',
-        title: 'Team Unique Document',
-      },
-    },
-  ]);
-
-  await apiSignin({
-    page,
-    email: teamMember2.email,
-    redirectPath: '/documents',
-  });
-
-  await page.getByPlaceholder('Search documents...').fill('Unique');
-  await page.waitForURL(/query=Unique/);
-
-  await checkDocumentTabCount(page, 'All', 1);
-  await expect(page.getByRole('link', { name: 'Personal Unique Document' })).toBeVisible();
-  await expect(page.getByRole('link', { name: 'Team Unique Document' })).not.toBeVisible();
-
-  await apiSignout({ page });
-});
-
 test('[TEAMS]: search respects recipient visibility regardless of team visibility', async ({
   page,
 }) => {
-  const team = await seedTeam();
+  const { team, owner } = await seedTeam();
   const memberUser = await seedTeamMember({ teamId: team.id, role: TeamMemberRole.MEMBER });
 
   await seedDocuments([
     {
-      sender: team.owner,
+      sender: owner,
+      teamId: team.id,
       recipients: [memberUser],
       type: DocumentStatus.COMPLETED,
       documentOptions: {
-        teamId: team.id,
         visibility: 'ADMIN',
         title: 'Admin Document with Member Recipient',
       },
@@ -190,7 +193,7 @@ test('[TEAMS]: search respects recipient visibility regardless of team visibilit
 });
 
 test('[TEAMS]: search by recipient name respects visibility', async ({ page }) => {
-  const team = await seedTeam();
+  const { team, owner } = await seedTeam();
   const adminUser = await seedTeamMember({ teamId: team.id, role: TeamMemberRole.ADMIN });
   const memberUser = await seedTeamMember({
     teamId: team.id,
@@ -198,15 +201,15 @@ test('[TEAMS]: search by recipient name respects visibility', async ({ page }) =
     name: 'Team Member',
   });
 
-  const uniqueRecipient = await seedUser();
+  const { user: uniqueRecipient } = await seedUser();
 
   await seedDocuments([
     {
-      sender: team.owner,
+      sender: owner,
       recipients: [uniqueRecipient],
       type: DocumentStatus.COMPLETED,
+      teamId: team.id,
       documentOptions: {
-        teamId: team.id,
         visibility: 'ADMIN',
         title: 'Admin Document for Unique Recipient',
       },
diff --git a/packages/app-tests/e2e/teams/team-documents.spec.ts b/packages/app-tests/e2e/teams/team-documents.spec.ts
index 420cc9c4f..28de98cb2 100644
--- a/packages/app-tests/e2e/teams/team-documents.spec.ts
+++ b/packages/app-tests/e2e/teams/team-documents.spec.ts
@@ -8,12 +8,13 @@ import { seedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin, apiSignout } from '../fixtures/authentication';
 import { checkDocumentTabCount } from '../fixtures/documents';
+import { expectTextToBeVisible } from '../fixtures/generic';
 
 test('[TEAMS]: check team documents count', async ({ page }) => {
-  const { team, teamMember2 } = await seedTeamDocuments();
+  const { team, teamOwner, teamMember2 } = await seedTeamDocuments();
 
   // Run the test twice, once with the team owner and once with a team member to ensure the counts are the same.
-  for (const user of [team.owner, teamMember2]) {
+  for (const user of [teamOwner, teamMember2]) {
     await apiSignin({
       page,
       email: user.email,
@@ -44,8 +45,12 @@ test('[TEAMS]: check team documents count', async ({ page }) => {
 });
 
 test('[TEAMS]: check team documents count with internal team email', async ({ page }) => {
-  const { team, teamMember2, teamMember4 } = await seedTeamDocuments();
-  const { team: team2, teamMember2: team2Member2 } = await seedTeamDocuments();
+  const { team, teamOwner, teamMember2, teamMember4 } = await seedTeamDocuments();
+  const {
+    team: team2,
+    teamOwner: team2Owner,
+    teamMember2: team2Member2,
+  } = await seedTeamDocuments();
 
   const teamEmailMember = teamMember4;
 
@@ -54,7 +59,7 @@ test('[TEAMS]: check team documents count with internal team email', async ({ pa
     teamId: team.id,
   });
 
-  const testUser1 = await seedUser();
+  const { user: testUser1, team: testUser1Team } = await seedUser();
 
   await seedDocuments([
     // Documents sent from the team email account.
@@ -62,52 +67,53 @@ test('[TEAMS]: check team documents count with internal team email', async ({ pa
       sender: teamEmailMember,
       recipients: [testUser1],
       type: DocumentStatus.COMPLETED,
-      documentOptions: {
-        teamId: team.id,
-      },
+      teamId: team.id,
+      documentOptions: {},
     },
     {
       sender: teamEmailMember,
       recipients: [testUser1],
       type: DocumentStatus.PENDING,
-      documentOptions: {
-        teamId: team.id,
-      },
+      teamId: team.id,
+      documentOptions: {},
     },
     {
       sender: teamMember4,
       recipients: [testUser1],
       type: DocumentStatus.DRAFT,
+      teamId: team.id,
     },
     // Documents sent to the team email account.
     {
       sender: testUser1,
       recipients: [teamEmailMember],
       type: DocumentStatus.COMPLETED,
+      teamId: testUser1Team.id,
     },
     {
       sender: testUser1,
       recipients: [teamEmailMember],
       type: DocumentStatus.PENDING,
+      teamId: testUser1Team.id,
     },
     {
       sender: testUser1,
       recipients: [teamEmailMember],
       type: DocumentStatus.DRAFT,
+      teamId: testUser1Team.id,
     },
     // Document sent to the team email account from another team.
     {
       sender: team2Member2,
       recipients: [teamEmailMember],
       type: DocumentStatus.PENDING,
-      documentOptions: {
-        teamId: team2.id,
-      },
+      teamId: team2.id,
+      documentOptions: {},
     },
   ]);
 
   // Run the test twice, one with the team owner and once with the team member email to ensure the counts are the same.
-  for (const user of [team.owner, teamEmailMember]) {
+  for (const user of [teamOwner, teamEmailMember]) {
     await apiSignin({
       page,
       email: user.email,
@@ -138,7 +144,8 @@ test('[TEAMS]: check team documents count with internal team email', async ({ pa
 });
 
 test('[TEAMS]: check team documents count with external team email', async ({ page }) => {
-  const { team, teamMember2 } = await seedTeamDocuments();
+  const { team, teamOwner, teamMember2 } = await seedTeamDocuments();
+
   const { team: team2, teamMember2: team2Member2 } = await seedTeamDocuments();
 
   const teamEmail = `external-team-email-${team.id}@test.documenso.com`;
@@ -148,7 +155,9 @@ test('[TEAMS]: check team documents count with external team email', async ({ pa
     teamId: team.id,
   });
 
-  const testUser1 = await seedUser();
+  const { user: testUser1, team: testUser1Team } = await seedUser({
+    isPersonalOrganisation: true,
+  });
 
   await seedDocuments([
     // Documents sent to the team email account.
@@ -156,42 +165,39 @@ test('[TEAMS]: check team documents count with external team email', async ({ pa
       sender: testUser1,
       recipients: [teamEmail],
       type: DocumentStatus.COMPLETED,
+      teamId: testUser1Team.id,
     },
     {
       sender: testUser1,
       recipients: [teamEmail],
       type: DocumentStatus.PENDING,
+      teamId: testUser1Team.id,
     },
     {
       sender: testUser1,
       recipients: [teamEmail],
       type: DocumentStatus.DRAFT,
+      teamId: testUser1Team.id,
     },
     // Document sent to the team email account from another team.
     {
       sender: team2Member2,
       recipients: [teamEmail],
       type: DocumentStatus.PENDING,
-      documentOptions: {
-        teamId: team2.id,
-      },
+      teamId: team2.id,
     },
     // Document sent to the team email account from an individual user.
     {
       sender: testUser1,
       recipients: [teamEmail],
       type: DocumentStatus.PENDING,
-      documentOptions: {
-        teamId: team2.id,
-      },
+      teamId: testUser1Team.id,
     },
     {
       sender: testUser1,
       recipients: [teamEmail],
       type: DocumentStatus.DRAFT,
-      documentOptions: {
-        teamId: team2.id,
-      },
+      teamId: testUser1Team.id,
     },
   ]);
 
@@ -222,7 +228,7 @@ test('[TEAMS]: check team documents count with external team email', async ({ pa
 });
 
 test('[TEAMS]: resend pending team document', async ({ page }) => {
-  const { team, teamMember2: currentUser } = await seedTeamDocuments();
+  const { team, teamOwner, teamMember2: currentUser } = await seedTeamDocuments();
 
   await apiSignin({
     page,
@@ -248,7 +254,7 @@ test('[TEAMS]: resend pending team document', async ({ page }) => {
 });
 
 test('[TEAMS]: delete draft team document', async ({ page }) => {
-  const { team, teamMember2: teamEmailMember, teamMember3 } = await seedTeamDocuments();
+  const { team, teamOwner, teamMember2: teamEmailMember, teamMember3 } = await seedTeamDocuments();
 
   await apiSignin({
     page,
@@ -273,7 +279,7 @@ test('[TEAMS]: delete draft team document', async ({ page }) => {
   await apiSignout({ page });
 
   // Run the test twice, one with the team owner and once with the team member email to ensure the counts are the same.
-  for (const user of [team.owner, teamEmailMember]) {
+  for (const user of [teamOwner, teamEmailMember]) {
     await apiSignin({
       page,
       email: user.email,
@@ -292,7 +298,7 @@ test('[TEAMS]: delete draft team document', async ({ page }) => {
 });
 
 test('[TEAMS]: delete pending team document', async ({ page }) => {
-  const { team, teamMember2: teamEmailMember, teamMember3 } = await seedTeamDocuments();
+  const { team, teamOwner, teamMember2: teamEmailMember, teamMember3 } = await seedTeamDocuments();
 
   await apiSignin({
     page,
@@ -318,7 +324,7 @@ test('[TEAMS]: delete pending team document', async ({ page }) => {
   await apiSignout({ page });
 
   // Run the test twice, one with the team owner and once with the team member email to ensure the counts are the same.
-  for (const user of [team.owner, teamEmailMember]) {
+  for (const user of [teamOwner, teamEmailMember]) {
     await apiSignin({
       page,
       email: user.email,
@@ -337,7 +343,7 @@ test('[TEAMS]: delete pending team document', async ({ page }) => {
 });
 
 test('[TEAMS]: delete completed team document', async ({ page }) => {
-  const { team, teamMember2: teamEmailMember, teamMember3 } = await seedTeamDocuments();
+  const { team, teamOwner, teamMember2: teamEmailMember, teamMember3 } = await seedTeamDocuments();
 
   await apiSignin({
     page,
@@ -363,7 +369,7 @@ test('[TEAMS]: delete completed team document', async ({ page }) => {
   await apiSignout({ page });
 
   // Run the test twice, one with the team owner and once with the team member email to ensure the counts are the same.
-  for (const user of [team.owner, teamEmailMember]) {
+  for (const user of [teamOwner, teamEmailMember]) {
     await apiSignin({
       page,
       email: user.email,
@@ -382,7 +388,7 @@ test('[TEAMS]: delete completed team document', async ({ page }) => {
 });
 
 test('[TEAMS]: check document visibility based on team member role', async ({ page }) => {
-  const team = await seedTeam();
+  const { team, owner } = await seedTeam();
 
   // Seed users with different roles
   const adminUser = await seedTeamMember({
@@ -400,46 +406,48 @@ test('[TEAMS]: check document visibility based on team member role', async ({ pa
     role: TeamMemberRole.MEMBER,
   });
 
-  const outsideUser = await seedUser();
+  const { user: outsideUser, team: outsideUserTeam } = await seedUser({
+    isPersonalOrganisation: true,
+  });
 
   // Seed documents with different visibility levels
   await seedDocuments([
     {
-      sender: team.owner,
+      sender: owner,
       recipients: [],
       type: DocumentStatus.COMPLETED,
+      teamId: team.id,
       documentOptions: {
-        teamId: team.id,
         visibility: 'EVERYONE',
         title: 'Document Visible to Everyone',
       },
     },
     {
-      sender: team.owner,
+      sender: owner,
       recipients: [],
       type: DocumentStatus.COMPLETED,
+      teamId: team.id,
       documentOptions: {
-        teamId: team.id,
         visibility: 'MANAGER_AND_ABOVE',
         title: 'Document Visible to Manager and Above',
       },
     },
     {
-      sender: team.owner,
+      sender: owner,
       recipients: [],
       type: DocumentStatus.COMPLETED,
+      teamId: team.id,
       documentOptions: {
-        teamId: team.id,
         visibility: 'ADMIN',
         title: 'Document Visible to Admin',
       },
     },
     {
-      sender: team.owner,
+      sender: owner,
       recipients: [outsideUser],
       type: DocumentStatus.COMPLETED,
+      teamId: team.id,
       documentOptions: {
-        teamId: team.id,
         visibility: 'ADMIN',
         title: 'Document Visible to Admin with Recipient',
       },
@@ -470,11 +478,6 @@ test('[TEAMS]: check document visibility based on team member role', async ({ pa
       path: teamUrlRedirect,
       expectedDocuments: ['Document Visible to Everyone'],
     },
-    {
-      user: outsideUser,
-      path: '/documents',
-      expectedDocuments: ['Document Visible to Admin with Recipient'],
-    },
   ];
 
   for (const testCase of testCases) {
@@ -491,12 +494,20 @@ test('[TEAMS]: check document visibility based on team member role', async ({ pa
 
     await apiSignout({ page });
   }
+
+  await apiSignin({
+    page,
+    email: outsideUser.email,
+    redirectPath: '/inbox',
+  });
+
+  await expectTextToBeVisible(page, 'Document Visible to Admin with Recipient');
 });
 
 test('[TEAMS]: ensure document owner can see document regardless of visibility', async ({
   page,
 }) => {
-  const team = await seedTeam();
+  const { team, owner } = await seedTeam();
 
   // Seed a member user
   const memberUser = await seedTeamMember({
@@ -510,8 +521,8 @@ test('[TEAMS]: ensure document owner can see document regardless of visibility',
       sender: memberUser,
       recipients: [],
       type: DocumentStatus.COMPLETED,
+      teamId: team.id,
       documentOptions: {
-        teamId: team.id,
         visibility: 'ADMIN',
         title: 'Admin Document with Member Document Owner',
       },
@@ -533,7 +544,7 @@ test('[TEAMS]: ensure document owner can see document regardless of visibility',
 });
 
 test('[TEAMS]: ensure recipient can see document regardless of visibility', async ({ page }) => {
-  const team = await seedTeam();
+  const { team, owner } = await seedTeam();
 
   // Seed a member user
   const memberUser = await seedTeamMember({
@@ -544,11 +555,11 @@ test('[TEAMS]: ensure recipient can see document regardless of visibility', asyn
   // Seed a document with ADMIN visibility but make the member user a recipient
   await seedDocuments([
     {
-      sender: team.owner,
+      sender: owner,
       recipients: [memberUser],
       type: DocumentStatus.COMPLETED,
+      teamId: team.id,
       documentOptions: {
-        teamId: team.id,
         visibility: 'ADMIN',
         title: 'Admin Document with Member Recipient',
       },
@@ -570,7 +581,7 @@ test('[TEAMS]: ensure recipient can see document regardless of visibility', asyn
 });
 
 test('[TEAMS]: check that MEMBER role cannot see ADMIN-only documents', async ({ page }) => {
-  const team = await seedTeam();
+  const { team, owner } = await seedTeam();
 
   // Seed a member user
   const memberUser = await seedTeamMember({
@@ -581,11 +592,11 @@ test('[TEAMS]: check that MEMBER role cannot see ADMIN-only documents', async ({
   // Seed an ADMIN-only document
   await seedDocuments([
     {
-      sender: team.owner,
+      sender: owner,
       recipients: [],
       type: DocumentStatus.COMPLETED,
+      teamId: team.id,
       documentOptions: {
-        teamId: team.id,
         visibility: 'ADMIN',
         title: 'Admin Only Document',
       },
@@ -609,7 +620,7 @@ test('[TEAMS]: check that MEMBER role cannot see ADMIN-only documents', async ({
 test('[TEAMS]: check that MEMBER role cannot see MANAGER_AND_ABOVE-only documents', async ({
   page,
 }) => {
-  const team = await seedTeam();
+  const { team, owner } = await seedTeam();
 
   // Seed a member user
   const memberUser = await seedTeamMember({
@@ -620,11 +631,11 @@ test('[TEAMS]: check that MEMBER role cannot see MANAGER_AND_ABOVE-only document
   // Seed an ADMIN-only document
   await seedDocuments([
     {
-      sender: team.owner,
+      sender: owner,
       recipients: [],
       type: DocumentStatus.COMPLETED,
+      teamId: team.id,
       documentOptions: {
-        teamId: team.id,
         visibility: 'MANAGER_AND_ABOVE',
         title: 'Manager and Above Only Document',
       },
@@ -646,7 +657,7 @@ test('[TEAMS]: check that MEMBER role cannot see MANAGER_AND_ABOVE-only document
 });
 
 test('[TEAMS]: check that MANAGER role cannot see ADMIN-only documents', async ({ page }) => {
-  const team = await seedTeam();
+  const { team, owner } = await seedTeam();
 
   // Seed a manager user
   const managerUser = await seedTeamMember({
@@ -657,11 +668,11 @@ test('[TEAMS]: check that MANAGER role cannot see ADMIN-only documents', async (
   // Seed an ADMIN-only document
   await seedDocuments([
     {
-      sender: team.owner,
+      sender: owner,
       recipients: [],
       type: DocumentStatus.COMPLETED,
+      teamId: team.id,
       documentOptions: {
-        teamId: team.id,
         visibility: 'ADMIN',
         title: 'Admin Only Document',
       },
@@ -683,7 +694,7 @@ test('[TEAMS]: check that MANAGER role cannot see ADMIN-only documents', async (
 });
 
 test('[TEAMS]: check that ADMIN role can see MANAGER_AND_ABOVE documents', async ({ page }) => {
-  const team = await seedTeam();
+  const { team, owner } = await seedTeam();
 
   // Seed an admin user
   const adminUser = await seedTeamMember({
@@ -694,11 +705,11 @@ test('[TEAMS]: check that ADMIN role can see MANAGER_AND_ABOVE documents', async
   // Seed a MANAGER_AND_ABOVE document
   await seedDocuments([
     {
-      sender: team.owner,
+      sender: owner,
       recipients: [],
       type: DocumentStatus.COMPLETED,
+      teamId: team.id,
       documentOptions: {
-        teamId: team.id,
         visibility: 'MANAGER_AND_ABOVE',
         title: 'Manager and Above Document',
       },
@@ -720,25 +731,16 @@ test('[TEAMS]: check that ADMIN role can see MANAGER_AND_ABOVE documents', async
 });
 
 test('[TEAMS]: check that ADMIN role can change document visibility', async ({ page }) => {
-  const team = await seedTeam({
-    createTeamOptions: {
-      teamGlobalSettings: {
-        create: {
-          documentVisibility: DocumentVisibility.MANAGER_AND_ABOVE,
-        },
-      },
-    },
-  });
+  const { team, owner } = await seedTeam();
 
   const adminUser = await seedTeamMember({
     teamId: team.id,
     role: TeamMemberRole.ADMIN,
   });
 
-  const document = await seedBlankDocument(adminUser, {
+  const document = await seedBlankDocument(adminUser, team.id, {
     createDocumentOptions: {
-      teamId: team.id,
-      visibility: team.teamGlobalSettings?.documentVisibility,
+      visibility: DocumentVisibility.MANAGER_AND_ABOVE,
     },
   });
 
@@ -763,25 +765,16 @@ test('[TEAMS]: check that ADMIN role can change document visibility', async ({ p
 test('[TEAMS]: check that MEMBER role cannot change visibility of EVERYONE documents', async ({
   page,
 }) => {
-  const team = await seedTeam({
-    createTeamOptions: {
-      teamGlobalSettings: {
-        create: {
-          documentVisibility: DocumentVisibility.EVERYONE,
-        },
-      },
-    },
-  });
+  const { team, owner } = await seedTeam();
 
   const teamMember = await seedTeamMember({
     teamId: team.id,
     role: TeamMemberRole.MEMBER,
   });
 
-  const document = await seedBlankDocument(teamMember, {
+  const document = await seedBlankDocument(teamMember, team.id, {
     createDocumentOptions: {
-      teamId: team.id,
-      visibility: team.teamGlobalSettings?.documentVisibility,
+      visibility: DocumentVisibility.EVERYONE,
     },
   });
 
@@ -798,25 +791,16 @@ test('[TEAMS]: check that MEMBER role cannot change visibility of EVERYONE docum
 test('[TEAMS]: check that MEMBER role cannot change visibility of MANAGER_AND_ABOVE documents', async ({
   page,
 }) => {
-  const team = await seedTeam({
-    createTeamOptions: {
-      teamGlobalSettings: {
-        create: {
-          documentVisibility: DocumentVisibility.MANAGER_AND_ABOVE,
-        },
-      },
-    },
-  });
+  const { team, owner } = await seedTeam();
 
   const teamMember = await seedTeamMember({
     teamId: team.id,
     role: TeamMemberRole.MEMBER,
   });
 
-  const document = await seedBlankDocument(teamMember, {
+  const document = await seedBlankDocument(teamMember, team.id, {
     createDocumentOptions: {
-      teamId: team.id,
-      visibility: team.teamGlobalSettings?.documentVisibility,
+      visibility: DocumentVisibility.MANAGER_AND_ABOVE,
     },
   });
 
@@ -833,25 +817,16 @@ test('[TEAMS]: check that MEMBER role cannot change visibility of MANAGER_AND_AB
 test('[TEAMS]: check that MEMBER role cannot change visibility of ADMIN documents', async ({
   page,
 }) => {
-  const team = await seedTeam({
-    createTeamOptions: {
-      teamGlobalSettings: {
-        create: {
-          documentVisibility: DocumentVisibility.ADMIN,
-        },
-      },
-    },
-  });
+  const { team, owner } = await seedTeam();
 
   const teamMember = await seedTeamMember({
     teamId: team.id,
     role: TeamMemberRole.MEMBER,
   });
 
-  const document = await seedBlankDocument(teamMember, {
+  const document = await seedBlankDocument(teamMember, team.id, {
     createDocumentOptions: {
-      teamId: team.id,
-      visibility: team.teamGlobalSettings?.documentVisibility,
+      visibility: DocumentVisibility.ADMIN,
     },
   });
 
@@ -868,25 +843,16 @@ test('[TEAMS]: check that MEMBER role cannot change visibility of ADMIN document
 test('[TEAMS]: check that MANAGER role cannot change visibility of ADMIN documents', async ({
   page,
 }) => {
-  const team = await seedTeam({
-    createTeamOptions: {
-      teamGlobalSettings: {
-        create: {
-          documentVisibility: DocumentVisibility.ADMIN,
-        },
-      },
-    },
-  });
+  const { team, owner } = await seedTeam();
 
   const teamManager = await seedTeamMember({
     teamId: team.id,
     role: TeamMemberRole.MANAGER,
   });
 
-  const document = await seedBlankDocument(teamManager, {
+  const document = await seedBlankDocument(teamManager, team.id, {
     createDocumentOptions: {
-      teamId: team.id,
-      visibility: team.teamGlobalSettings?.documentVisibility,
+      visibility: DocumentVisibility.ADMIN,
     },
   });
 
@@ -902,17 +868,25 @@ test('[TEAMS]: check that MANAGER role cannot change visibility of ADMIN documen
 
 test('[TEAMS]: users cannot see documents from other teams', async ({ page }) => {
   // Seed two teams with documents
-  const { team: teamA, teamMember2: teamAMember } = await seedTeamDocuments();
-  const { team: teamB, teamMember2: teamBMember } = await seedTeamDocuments();
+  const {
+    team: teamA,
+    teamOwner: teamAOwner,
+    teamMember2: teamAMember,
+  } = await seedTeamDocuments();
+  const {
+    team: teamB,
+    teamOwner: teamBOwner,
+    teamMember2: teamBMember,
+  } = await seedTeamDocuments();
 
   // Seed a document in team B
   await seedDocuments([
     {
-      sender: teamB.owner,
+      sender: teamBOwner,
       recipients: [],
       type: DocumentStatus.COMPLETED,
+      teamId: teamB.id,
       documentOptions: {
-        teamId: teamB.id,
         visibility: 'EVERYONE',
         title: 'Team B Document',
       },
@@ -934,8 +908,8 @@ test('[TEAMS]: users cannot see documents from other teams', async ({ page }) =>
 
 test('[TEAMS]: personal documents are not visible in team context', async ({ page }) => {
   // Seed a team and a user with personal documents
-  const { team, teamMember2 } = await seedTeamDocuments();
-  const personalUser = await seedUser();
+  const { team, teamOwner, teamMember2 } = await seedTeamDocuments();
+  const { user: personalUser, team: personalUserTeam } = await seedUser();
 
   // Seed a personal document for teamMember2
   await seedDocuments([
@@ -943,8 +917,8 @@ test('[TEAMS]: personal documents are not visible in team context', async ({ pag
       sender: teamMember2,
       recipients: [],
       type: DocumentStatus.COMPLETED,
+      teamId: personalUserTeam.id,
       documentOptions: {
-        teamId: null, // Indicates a personal document
         visibility: 'EVERYONE',
         title: 'Personal Document',
       },
@@ -965,34 +939,3 @@ test('[TEAMS]: personal documents are not visible in team context', async ({ pag
 
   await apiSignout({ page });
 });
-
-test('[PERSONAL]: team documents are not visible in personal account', async ({ page }) => {
-  // Seed a team and a user with personal documents
-  const { team, teamMember2 } = await seedTeamDocuments();
-
-  // Seed a team document
-  await seedDocuments([
-    {
-      sender: teamMember2,
-      recipients: [],
-      type: DocumentStatus.COMPLETED,
-      documentOptions: {
-        teamId: team.id,
-        visibility: 'EVERYONE',
-        title: 'Team Document',
-      },
-    },
-  ]);
-
-  // Sign in as teamMember2 in the personal context
-  await apiSignin({
-    page,
-    email: teamMember2.email,
-    redirectPath: `/documents?status=COMPLETED`,
-  });
-
-  // Verify that the team document is not visible in the personal context
-  await expect(page.getByRole('link', { name: 'Team Document', exact: true })).not.toBeVisible();
-
-  await apiSignout({ page });
-});
diff --git a/packages/app-tests/e2e/teams/team-email.spec.ts b/packages/app-tests/e2e/teams/team-email.spec.ts
index 06d5beb44..ddb374747 100644
--- a/packages/app-tests/e2e/teams/team-email.spec.ts
+++ b/packages/app-tests/e2e/teams/team-email.spec.ts
@@ -1,17 +1,17 @@
 import { expect, test } from '@playwright/test';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { seedTeam, seedTeamEmailVerification } from '@documenso/prisma/seed/teams';
+import { seedTeamEmailVerification } from '@documenso/prisma/seed/teams';
 import { seedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin } from '../fixtures/authentication';
 
 test('[TEAMS]: send team email request', async ({ page }) => {
-  const team = await seedTeam();
+  const { user, team } = await seedUser();
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: user.email,
     password: 'password',
     redirectPath: `/t/${team.url}/settings`,
   });
@@ -32,9 +32,7 @@ test('[TEAMS]: send team email request', async ({ page }) => {
 });
 
 test('[TEAMS]: accept team email request', async ({ page }) => {
-  const team = await seedTeam({
-    createTeamMembers: 1,
-  });
+  const { user, team } = await seedUser();
 
   const teamEmailVerification = await seedTeamEmailVerification({
     email: `team-email-verification--${team.url}@test.documenso.com`,
@@ -46,14 +44,13 @@ test('[TEAMS]: accept team email request', async ({ page }) => {
 });
 
 test('[TEAMS]: delete team email', async ({ page }) => {
-  const team = await seedTeam({
-    createTeamMembers: 1,
-    createTeamEmail: true,
+  const { user, team } = await seedUser({
+    setTeamEmailAsOwner: true,
   });
 
   await apiSignin({
     page,
-    email: team.owner.email,
+    email: user.email,
     redirectPath: `/t/${team.url}/settings`,
   });
 
@@ -66,23 +63,16 @@ test('[TEAMS]: delete team email', async ({ page }) => {
 });
 
 test('[TEAMS]: team email owner removes access', async ({ page }) => {
-  const team = await seedTeam({
-    createTeamMembers: 1,
-    createTeamEmail: true,
-  });
+  const teamEmailOwner = await seedUser();
 
-  if (!team.teamEmail) {
-    throw new Error('Not possible');
-  }
-
-  const teamEmailOwner = await seedUser({
-    email: team.teamEmail.email,
+  const { user: secondUser } = await seedUser({
+    teamEmail: teamEmailOwner.user.email,
   });
 
   await apiSignin({
     page,
-    email: teamEmailOwner.email,
-    redirectPath: `/settings/teams`,
+    email: teamEmailOwner.user.email,
+    redirectPath: `/settings/profile`,
   });
 
   await page.getByRole('button', { name: 'Revoke access' }).click();
diff --git a/packages/app-tests/e2e/teams/team-global-settings.spec.ts b/packages/app-tests/e2e/teams/team-global-settings.spec.ts
deleted file mode 100644
index 7e277e36b..000000000
--- a/packages/app-tests/e2e/teams/team-global-settings.spec.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { expect, test } from '@playwright/test';
-
-import { seedTeam } from '@documenso/prisma/seed/teams';
-
-import { apiSignin } from '../fixtures/authentication';
-
-test('[TEAMS]: update the default document visibility in the team global settings', async ({
-  page,
-}) => {
-  const team = await seedTeam({
-    createTeamMembers: 1,
-  });
-
-  await apiSignin({
-    page,
-    email: team.owner.email,
-    password: 'password',
-    redirectPath: `/t/${team.url}/settings/preferences`,
-  });
-
-  // !: Brittle selector
-  await page.getByRole('combobox').first().click();
-  await page.getByRole('option', { name: 'Admin' }).click();
-  await page.getByRole('button', { name: 'Update' }).first().click();
-
-  const toast = page.locator('li[role="status"][data-state="open"]').first();
-  await expect(toast).toBeVisible();
-  await expect(toast.getByText('Document preferences updated', { exact: true })).toBeVisible();
-});
-
-test('[TEAMS]: update the sender details in the team global settings', async ({ page }) => {
-  const team = await seedTeam({
-    createTeamMembers: 1,
-  });
-
-  await apiSignin({
-    page,
-    email: team.owner.email,
-    password: 'password',
-    redirectPath: `/t/${team.url}/settings/preferences`,
-  });
-
-  const checkbox = page.getByLabel('Send on Behalf of Team');
-  await checkbox.check();
-
-  await expect(checkbox).toBeChecked();
-
-  await page.getByRole('button', { name: 'Update' }).first().click();
-
-  const toast = page.locator('li[role="status"][data-state="open"]').first();
-  await expect(toast).toBeVisible();
-  await expect(toast.getByText('Document preferences updated', { exact: true })).toBeVisible();
-
-  await expect(checkbox).toBeChecked();
-});
diff --git a/packages/app-tests/e2e/teams/team-members.spec.ts b/packages/app-tests/e2e/teams/team-members.spec.ts
deleted file mode 100644
index 44dd30901..000000000
--- a/packages/app-tests/e2e/teams/team-members.spec.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { expect, test } from '@playwright/test';
-
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { seedTeam, seedTeamInvite } from '@documenso/prisma/seed/teams';
-import { seedUser } from '@documenso/prisma/seed/users';
-
-import { apiSignin } from '../fixtures/authentication';
-
-test('[TEAMS]: update team member role', async ({ page }) => {
-  const team = await seedTeam({
-    createTeamMembers: 1,
-  });
-
-  await apiSignin({
-    page,
-    email: team.owner.email,
-    password: 'password',
-    redirectPath: `/t/${team.url}/settings/members`,
-  });
-
-  const teamMemberToUpdate = team.members[1];
-
-  await page
-    .getByRole('row')
-    .filter({ hasText: teamMemberToUpdate.user.email })
-    .getByRole('button')
-    .click();
-
-  await page.getByRole('menuitem', { name: 'Update role' }).click();
-  await page.getByRole('combobox').click();
-  await page.getByLabel('Manager').click();
-  await page.getByRole('button', { name: 'Update' }).click();
-
-  await page.reload();
-
-  await expect(
-    page.getByRole('row').filter({ hasText: teamMemberToUpdate.user.email }).first(),
-  ).toContainText('Manager');
-});
-
-test('[TEAMS]: accept team invitation without account', async ({ page }) => {
-  const team = await seedTeam();
-
-  const teamInvite = await seedTeamInvite({
-    email: `team-invite-test-${Date.now()}@test.documenso.com`,
-    teamId: team.id,
-  });
-
-  await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/team/invite/${teamInvite.token}`);
-  await expect(page.getByRole('heading')).toContainText('Team invitation');
-});
-
-test('[TEAMS]: accept team invitation with account', async ({ page }) => {
-  const team = await seedTeam();
-  const user = await seedUser();
-
-  const teamInvite = await seedTeamInvite({
-    email: user.email,
-    teamId: team.id,
-  });
-
-  await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/team/invite/${teamInvite.token}`);
-  await expect(page.getByRole('heading')).toContainText('Invitation accepted!');
-});
-
-test('[TEAMS]: member can leave team', async ({ page }) => {
-  const team = await seedTeam({
-    createTeamMembers: 1,
-  });
-
-  const teamMember = team.members[1];
-
-  await apiSignin({
-    page,
-    email: teamMember.user.email,
-    password: 'password',
-    redirectPath: `/settings/teams`,
-  });
-
-  await page.getByRole('button', { name: 'Leave' }).click();
-  await page.getByRole('button', { name: 'Leave' }).click();
-
-  await expect(page.getByRole('status').first()).toContainText(
-    'You have successfully left this team.',
-  );
-});
-
-test('[TEAMS]: owner cannot leave team', async ({ page }) => {
-  const team = await seedTeam({
-    createTeamMembers: 1,
-  });
-
-  await apiSignin({
-    page,
-    email: team.owner.email,
-    password: 'password',
-    redirectPath: `/settings/teams`,
-  });
-
-  await expect(page.getByRole('button').getByText('Leave')).toBeDisabled();
-});
diff --git a/packages/app-tests/e2e/teams/team-signature-settings.spec.ts b/packages/app-tests/e2e/teams/team-signature-settings.spec.ts
index 1528f3732..dcd195ffe 100644
--- a/packages/app-tests/e2e/teams/team-signature-settings.spec.ts
+++ b/packages/app-tests/e2e/teams/team-signature-settings.spec.ts
@@ -3,27 +3,21 @@ import { expect, test } from '@playwright/test';
 import { prisma } from '@documenso/prisma';
 import {
   seedTeamDocumentWithMeta,
-  seedTeamDocuments,
   seedTeamTemplateWithMeta,
 } from '@documenso/prisma/seed/documents';
+import { seedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin } from '../fixtures/authentication';
 
 test('[TEAMS]: check that default team signature settings are all enabled', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { user, team } = await seedUser();
 
   await apiSignin({
     page,
-    email: team.owner.email,
-    password: 'password',
+    email: user.email,
     redirectPath: `/t/${team.url}/settings/preferences`,
   });
 
-  // Verify that the default created team settings has all signatures enabled
-  await expect(page.getByRole('combobox').filter({ hasText: 'Type' })).toBeVisible();
-  await expect(page.getByRole('combobox').filter({ hasText: 'Upload' })).toBeVisible();
-  await expect(page.getByRole('combobox').filter({ hasText: 'Draw' })).toBeVisible();
-
   const document = await seedTeamDocumentWithMeta(team);
 
   // Create a document and check the settings
@@ -46,12 +40,11 @@ test('[TEAMS]: check that default team signature settings are all enabled', asyn
 });
 
 test('[TEAMS]: check signature modes can be disabled', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { user, team } = await seedUser();
 
   await apiSignin({
     page,
-    email: team.owner.email,
-    password: 'password',
+    email: user.email,
     redirectPath: `/t/${team.url}/settings/preferences`,
   });
 
@@ -105,12 +98,11 @@ test('[TEAMS]: check signature modes can be disabled', async ({ page }) => {
 });
 
 test('[TEAMS]: check signature modes work for templates', async ({ page }) => {
-  const { team } = await seedTeamDocuments();
+  const { user, team } = await seedUser();
 
   await apiSignin({
     page,
-    email: team.owner.email,
-    password: 'password',
+    email: user.email,
     redirectPath: `/t/${team.url}/settings/preferences`,
   });
 
diff --git a/packages/app-tests/e2e/teams/transfer-team.spec.ts b/packages/app-tests/e2e/teams/transfer-team.spec.ts
deleted file mode 100644
index 006bccec5..000000000
--- a/packages/app-tests/e2e/teams/transfer-team.spec.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { expect, test } from '@playwright/test';
-
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { seedTeam, seedTeamTransfer } from '@documenso/prisma/seed/teams';
-
-import { apiSignin } from '../fixtures/authentication';
-
-test('[TEAMS]: initiate and cancel team transfer', async ({ page }) => {
-  const team = await seedTeam({
-    createTeamMembers: 1,
-  });
-
-  const teamMember = team.members[1];
-
-  await apiSignin({
-    page,
-    email: team.owner.email,
-    password: 'password',
-    redirectPath: `/t/${team.url}/settings`,
-  });
-
-  await page.getByRole('button', { name: 'Transfer team' }).click();
-
-  await page.getByRole('combobox').click();
-  await page.getByLabel(teamMember.user.name ?? '').click();
-  await page.getByLabel('Confirm by typing transfer').click();
-  await page.getByLabel('Confirm by typing transfer').fill('transfer');
-  await page.getByRole('button', { name: 'Transfer' }).click();
-
-  await expect(page.locator('[id*="form-item-message"]').first()).toContainText(
-    `You must enter 'transfer ${team.name}' to proceed`,
-  );
-
-  await page.getByLabel('Confirm by typing transfer').click();
-  await page.getByLabel('Confirm by typing transfer').fill(`transfer ${team.name}`);
-  await page.getByRole('button', { name: 'Transfer' }).click();
-
-  await expect(page.getByRole('heading', { name: 'Team transfer in progress' })).toBeVisible();
-  await page.getByRole('button', { name: 'Cancel' }).click();
-
-  await expect(page.getByRole('status').first()).toContainText(
-    'The team transfer invitation has been successfully deleted.',
-  );
-});
-
-/**
- * Current skipped until we disable billing during tests.
- */
-test.skip('[TEAMS]: accept team transfer', async ({ page }) => {
-  const team = await seedTeam({
-    createTeamMembers: 1,
-  });
-
-  const newOwnerMember = team.members[1];
-
-  const teamTransferRequest = await seedTeamTransfer({
-    teamId: team.id,
-    newOwnerUserId: newOwnerMember.userId,
-  });
-
-  await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/team/verify/transfer/${teamTransferRequest.token}`);
-  await expect(page.getByRole('heading')).toContainText('Team ownership transferred!');
-});
diff --git a/packages/app-tests/e2e/templates-flow/template-settings-step.spec.ts b/packages/app-tests/e2e/templates-flow/template-settings-step.spec.ts
index 3cdf197f8..f0a86347e 100644
--- a/packages/app-tests/e2e/templates-flow/template-settings-step.spec.ts
+++ b/packages/app-tests/e2e/templates-flow/template-settings-step.spec.ts
@@ -1,138 +1,20 @@
 import { expect, test } from '@playwright/test';
 import { TeamMemberRole } from '@prisma/client';
 
-import { prisma } from '@documenso/prisma';
-import { seedUserSubscription } from '@documenso/prisma/seed/subscriptions';
-import { seedTeam } from '@documenso/prisma/seed/teams';
+import { seedTeam, seedTeamMember } from '@documenso/prisma/seed/teams';
 import { seedBlankTemplate } from '@documenso/prisma/seed/templates';
 import { seedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin } from '../fixtures/authentication';
 
-test.describe('[EE_ONLY]', () => {
-  const enterprisePriceId = '';
-
-  test.beforeEach(() => {
-    test.skip(
-      process.env.NEXT_PUBLIC_FEATURE_BILLING_ENABLED !== 'true' || !enterprisePriceId,
-      'Billing required for this test',
-    );
-  });
-
-  test('[TEMPLATE_FLOW] add action auth settings', async ({ page }) => {
-    const user = await seedUser();
-
-    await seedUserSubscription({
-      userId: user.id,
-      priceId: enterprisePriceId,
-    });
-
-    const template = await seedBlankTemplate(user);
-
-    await apiSignin({
-      page,
-      email: user.email,
-      redirectPath: `/templates/${template.id}/edit`,
-    });
-
-    // Set EE action auth.
-    await page.getByTestId('documentActionSelectValue').click();
-    await page.getByRole('option').filter({ hasText: 'Require passkey' }).click();
-    await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require passkey');
-
-    // Save the settings by going to the next step.
-    await page.getByRole('button', { name: 'Continue' }).click();
-    await expect(page.getByRole('heading', { name: 'Add Placeholders' })).toBeVisible();
-
-    // Return to the settings step to check that the results are saved correctly.
-    await page.getByRole('button', { name: 'Go Back' }).click();
-    await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
-
-    await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require passkey');
-  });
-
-  test('[TEMPLATE_FLOW] enterprise team member can add action auth settings', async ({ page }) => {
-    const team = await seedTeam({
-      createTeamMembers: 1,
-    });
-
-    const owner = team.owner;
-    const teamMemberUser = team.members[1].user;
-
-    // Make the team enterprise by giving the owner the enterprise subscription.
-    await seedUserSubscription({
-      userId: team.ownerUserId,
-      priceId: enterprisePriceId,
-    });
-
-    const template = await seedBlankTemplate(owner, {
-      createTemplateOptions: {
-        teamId: team.id,
-      },
-    });
-
-    await apiSignin({
-      page,
-      email: teamMemberUser.email,
-      redirectPath: `/t/${team.url}/templates/${template.id}/edit`,
-    });
-
-    // Set EE action auth.
-    await page.getByTestId('documentActionSelectValue').click();
-    await page.getByRole('option').filter({ hasText: 'Require passkey' }).click();
-    await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require passkey');
-
-    // Save the settings by going to the next step.
-    await page.getByRole('button', { name: 'Continue' }).click();
-    await expect(page.getByRole('heading', { name: 'Add Placeholders' })).toBeVisible();
-
-    // Advanced settings should be visible.
-    await expect(page.getByLabel('Show advanced settings')).toBeVisible();
-  });
-
-  test('[TEMPLATE_FLOW] enterprise team member should not have access to enterprise on personal account', async ({
-    page,
-  }) => {
-    const team = await seedTeam({
-      createTeamMembers: 1,
-    });
-
-    const teamMemberUser = team.members[1].user;
-
-    // Make the team enterprise by giving the owner the enterprise subscription.
-    await seedUserSubscription({
-      userId: team.ownerUserId,
-      priceId: enterprisePriceId,
-    });
-
-    const template = await seedBlankTemplate(teamMemberUser);
-
-    await apiSignin({
-      page,
-      email: teamMemberUser.email,
-      redirectPath: `/templates/${template.id}/edit`,
-    });
-
-    // Global action auth should not be visible.
-    await expect(page.getByTestId('documentActionSelectValue')).not.toBeVisible();
-
-    // Next step.
-    await page.getByRole('button', { name: 'Continue' }).click();
-    await expect(page.getByRole('heading', { name: 'Add Placeholders' })).toBeVisible();
-
-    // Advanced settings should not be visible.
-    await expect(page.getByLabel('Show advanced settings')).not.toBeVisible();
-  });
-});
-
 test('[TEMPLATE_FLOW]: add settings', async ({ page }) => {
-  const user = await seedUser();
-  const template = await seedBlankTemplate(user);
+  const { user, team } = await seedUser();
+  const template = await seedBlankTemplate(user, team.id);
 
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/templates/${template.id}/edit`,
+    redirectPath: `/t/${team.url}/templates/${template.id}/edit`,
   });
 
   // Set title.
@@ -159,19 +41,13 @@ test('[TEMPLATE_FLOW]: add settings', async ({ page }) => {
 });
 
 test('[TEMPLATE_FLOW] add document visibility settings', async ({ page }) => {
-  const { owner, ...team } = await seedTeam({
-    createTeamMembers: 1,
-  });
+  const { user, team } = await seedUser();
 
-  const template = await seedBlankTemplate(owner, {
-    createTemplateOptions: {
-      teamId: team.id,
-    },
-  });
+  const template = await seedBlankTemplate(user, team.id);
 
   await apiSignin({
     page,
-    email: owner.email,
+    email: user.email,
     redirectPath: `/t/${team.url}/templates/${template.id}/edit`,
   });
 
@@ -196,24 +72,21 @@ test('[TEMPLATE_FLOW] add document visibility settings', async ({ page }) => {
 });
 
 test('[TEMPLATE_FLOW] team member visibility permissions', async ({ page }) => {
-  const team = await seedTeam({
+  const { team, owner, organisation } = await seedTeam({
     createTeamMembers: 2, // Create an additional member to test different roles
   });
 
-  await prisma.teamMember.update({
-    where: {
-      id: team.members[1].id,
-    },
-    data: {
-      role: TeamMemberRole.MANAGER,
-    },
+  const memberUser = await seedTeamMember({
+    teamId: team.id,
+    role: TeamMemberRole.MEMBER,
   });
 
-  const owner = team.owner;
-  const managerUser = team.members[1].user;
-  const memberUser = team.members[2].user;
+  const managerUser = await seedTeamMember({
+    teamId: team.id,
+    role: TeamMemberRole.MANAGER,
+  });
 
-  const template = await seedBlankTemplate(owner, {
+  const template = await seedBlankTemplate(owner, team.id, {
     createTemplateOptions: {
       teamId: team.id,
     },
@@ -249,7 +122,7 @@ test('[TEMPLATE_FLOW] team member visibility permissions', async ({ page }) => {
   await expect(page.getByTestId('documentVisibilitySelectValue')).toBeDisabled();
 
   // Create a new template with 'everyone' visibility
-  const everyoneTemplate = await seedBlankTemplate(owner, {
+  const everyoneTemplate = await seedBlankTemplate(owner, team.id, {
     createTemplateOptions: {
       teamId: team.id,
       visibility: 'EVERYONE',
diff --git a/packages/app-tests/e2e/templates-flow/template-signers-step.spec.ts b/packages/app-tests/e2e/templates-flow/template-signers-step.spec.ts
index 338d86e9d..2d7f118a7 100644
--- a/packages/app-tests/e2e/templates-flow/template-signers-step.spec.ts
+++ b/packages/app-tests/e2e/templates-flow/template-signers-step.spec.ts
@@ -1,86 +1,85 @@
 import { expect, test } from '@playwright/test';
 
-import { seedUserSubscription } from '@documenso/prisma/seed/subscriptions';
 import { seedBlankTemplate } from '@documenso/prisma/seed/templates';
 import { seedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin } from '../fixtures/authentication';
 
-test.describe('[EE_ONLY]', () => {
-  // eslint-disable-next-line turbo/no-undeclared-env-vars
-  const enterprisePriceId = process.env.NEXT_PUBLIC_STRIPE_ENTERPRISE_PLAN_MONTHLY_PRICE_ID || '';
+// test.describe('[EE_ONLY]', () => {
+//   // eslint-disable-next-line turbo/no-undeclared-env-vars
+//   const enterprisePriceId = process.env.NEXT_PUBLIC_STRIPE_ENTERPRISE_PLAN_MONTHLY_PRICE_ID || '';
 
-  test.beforeEach(() => {
-    test.skip(
-      process.env.NEXT_PUBLIC_FEATURE_BILLING_ENABLED !== 'true' || !enterprisePriceId,
-      'Billing required for this test',
-    );
-  });
+//   test.beforeEach(() => {
+//     test.skip(
+//       process.env.NEXT_PUBLIC_FEATURE_BILLING_ENABLED !== 'true' || !enterprisePriceId,
+//       'Billing required for this test',
+//     );
+//   });
 
-  test('[TEMPLATE_FLOW] add EE settings', async ({ page }) => {
-    const user = await seedUser();
+//   test('[TEMPLATE_FLOW] add EE settings', async ({ page }) => {
+//     const user = await seedUser();
 
-    await seedUserSubscription({
-      userId: user.id,
-      priceId: enterprisePriceId,
-    });
+//     await seedUserSubscription({
+//       userId: user.id,
+//       priceId: enterprisePriceId,
+//     });
 
-    const template = await seedBlankTemplate(user);
+//     const template = await seedBlankTemplate(user);
 
-    await apiSignin({
-      page,
-      email: user.email,
-      redirectPath: `/templates/${template.id}/edit`,
-    });
+//     await apiSignin({
+//       page,
+//       email: user.email,
+//       redirectPath: `/templates/${template.id}/edit`,
+//     });
 
-    // Save the settings by going to the next step.
-    await page.getByRole('button', { name: 'Continue' }).click();
-    await expect(page.getByRole('heading', { name: 'Add Placeholder' })).toBeVisible();
+//     // Save the settings by going to the next step.
+//     await page.getByRole('button', { name: 'Continue' }).click();
+//     await expect(page.getByRole('heading', { name: 'Add Placeholder' })).toBeVisible();
 
-    // Add 2 signers.
-    await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
-    await page.getByPlaceholder('Name').fill('Recipient 1');
-    await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
-    await page.getByPlaceholder('Email').nth(1).fill('recipient2@documenso.com');
-    await page.getByPlaceholder('Name').nth(1).fill('Recipient 2');
+//     // Add 2 signers.
+//     await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
+//     await page.getByPlaceholder('Name').fill('Recipient 1');
+//     await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
+//     await page.getByPlaceholder('Email').nth(1).fill('recipient2@documenso.com');
+//     await page.getByPlaceholder('Name').nth(1).fill('Recipient 2');
 
-    // Display advanced settings.
-    await page.getByLabel('Show advanced settings').check();
+//     // Display advanced settings.
+//     await page.getByLabel('Show advanced settings').check();
 
-    // Navigate to the next step and back.
-    await page.getByRole('button', { name: 'Continue' }).click();
-    await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-    await page.getByRole('button', { name: 'Go Back' }).click();
-    await expect(page.getByRole('heading', { name: 'Add Placeholder' })).toBeVisible();
+//     // Navigate to the next step and back.
+//     await page.getByRole('button', { name: 'Continue' }).click();
+//     await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+//     await page.getByRole('button', { name: 'Go Back' }).click();
+//     await expect(page.getByRole('heading', { name: 'Add Placeholder' })).toBeVisible();
 
-    // Expect that the advanced settings is unchecked, since no advanced settings were applied.
-    await expect(page.getByLabel('Show advanced settings')).toBeChecked({ checked: false });
+//     // Expect that the advanced settings is unchecked, since no advanced settings were applied.
+//     await expect(page.getByLabel('Show advanced settings')).toBeChecked({ checked: false });
 
-    // Add advanced settings for a single recipient.
-    await page.getByLabel('Show advanced settings').check();
-    await page.getByTestId('documentActionSelectValue').click();
-    await page.getByRole('option').filter({ hasText: 'Require passkey' }).click();
+//     // Add advanced settings for a single recipient.
+//     await page.getByLabel('Show advanced settings').check();
+//     await page.getByRole('combobox').first().click();
+//     await page.getByLabel('Require passkey').click();
 
-    // Navigate to the next step and back.
-    await page.getByRole('button', { name: 'Continue' }).click();
-    await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-    await page.getByRole('button', { name: 'Go Back' }).click();
-    await expect(page.getByRole('heading', { name: 'Add Placeholder' })).toBeVisible();
+//     // Navigate to the next step and back.
+//     await page.getByRole('button', { name: 'Continue' }).click();
+//     await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+//     await page.getByRole('button', { name: 'Go Back' }).click();
+//     await expect(page.getByRole('heading', { name: 'Add Placeholder' })).toBeVisible();
 
-    // Expect that the advanced settings is visible, and the checkbox is hidden. Since advanced
-    // settings were applied.
-    await expect(page.getByLabel('Show advanced settings')).toBeHidden();
-  });
-});
+//     // Expect that the advanced settings is visible, and the checkbox is hidden. Since advanced
+//     // settings were applied.
+//     await expect(page.getByLabel('Show advanced settings')).toBeHidden();
+//   });
+// });
 
 test('[TEMPLATE_FLOW]: add placeholder', async ({ page }) => {
-  const user = await seedUser();
-  const template = await seedBlankTemplate(user);
+  const { user, team } = await seedUser();
+  const template = await seedBlankTemplate(user, team.id);
 
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/templates/${template.id}/edit`,
+    redirectPath: `/t/${team.url}/templates/${template.id}/edit`,
   });
 
   // Save the settings by going to the next step.
diff --git a/packages/app-tests/e2e/templates/create-document-from-template.spec.ts b/packages/app-tests/e2e/templates/create-document-from-template.spec.ts
index 564b57d30..9db76e881 100644
--- a/packages/app-tests/e2e/templates/create-document-from-template.spec.ts
+++ b/packages/app-tests/e2e/templates/create-document-from-template.spec.ts
@@ -5,15 +5,12 @@ import path from 'path';
 
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
 import { prisma } from '@documenso/prisma';
-import { seedUserSubscription } from '@documenso/prisma/seed/subscriptions';
-import { seedTeam } from '@documenso/prisma/seed/teams';
+import { seedTeam, seedTeamMember } from '@documenso/prisma/seed/teams';
 import { seedBlankTemplate } from '@documenso/prisma/seed/templates';
 import { seedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin } from '../fixtures/authentication';
 
-const enterprisePriceId = '';
-
 const EXAMPLE_PDF_PATH = path.join(__dirname, '../../../../assets/example.pdf');
 
 /**
@@ -26,21 +23,13 @@ const EXAMPLE_PDF_PATH = path.join(__dirname, '../../../../assets/example.pdf');
  * If you update this test please update that test as well.
  */
 test('[TEMPLATE]: should create a document from a template', async ({ page }) => {
-  const user = await seedUser();
-  const template = await seedBlankTemplate(user);
-
-  const isBillingEnabled =
-    process.env.NEXT_PUBLIC_FEATURE_BILLING_ENABLED === 'true' && enterprisePriceId;
-
-  await seedUserSubscription({
-    userId: user.id,
-    priceId: enterprisePriceId,
-  });
+  const { user, team } = await seedUser();
+  const template = await seedBlankTemplate(user, team.id);
 
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/templates/${template.id}/edit`,
+    redirectPath: `/t/${team.url}/templates/${template.id}/edit`,
   });
 
   // Set template title.
@@ -51,13 +40,6 @@ test('[TEMPLATE]: should create a document from a template', async ({ page }) =>
   await page.getByRole('option').filter({ hasText: 'Require account' }).click();
   await expect(page.getByTestId('documentAccessSelectValue')).toContainText('Require account');
 
-  // Set EE action auth.
-  if (isBillingEnabled) {
-    await page.getByTestId('documentActionSelectValue').click();
-    await page.getByRole('option').filter({ hasText: 'Require passkey' }).click();
-    await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require passkey');
-  }
-
   // Set email options.
   await page.getByRole('button', { name: 'Email Options' }).click();
   await page.getByLabel('Subject (Optional)').fill('SUBJECT');
@@ -82,25 +64,18 @@ test('[TEMPLATE]: should create a document from a template', async ({ page }) =>
   await page.getByPlaceholder('Email').nth(1).fill('recipient2@documenso.com');
   await page.getByPlaceholder('Name').nth(1).fill('Recipient 2');
 
-  // Apply require passkey for Recipient 1.
-  if (isBillingEnabled) {
-    await page.getByLabel('Show advanced settings').check();
-    await page.getByTestId('documentActionSelectValue').click();
-    await page.getByRole('option').filter({ hasText: 'Require passkey' }).click();
-  }
-
   await page.getByRole('button', { name: 'Continue' }).click();
   await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
 
   await page.getByRole('button', { name: 'Save template' }).click();
 
   // Use template
-  await page.waitForURL('/templates');
+  await page.waitForURL(`/t/${team.url}/templates`);
   await page.getByRole('button', { name: 'Use Template' }).click();
   await page.getByRole('button', { name: 'Create as draft' }).click();
 
   // Review that the document was created with the correct values.
-  await page.waitForURL(/documents/);
+  await page.waitForURL(new RegExp(`/t/${team.url}/documents/\\d+`));
 
   const documentId = Number(page.url().split('/').pop());
 
@@ -121,10 +96,6 @@ test('[TEMPLATE]: should create a document from a template', async ({ page }) =>
   expect(document.title).toEqual('TEMPLATE_TITLE');
   expect(documentAuth.documentAuthOption.globalAccessAuth).toContain('ACCOUNT');
 
-  if (isBillingEnabled) {
-    expect(documentAuth.documentAuthOption.globalActionAuth).toContain('PASSKEY');
-  }
-
   expect(document.documentMeta?.dateFormat).toEqual('dd/MM/yyyy hh:mm a');
   expect(document.documentMeta?.message).toEqual('MESSAGE');
   expect(document.documentMeta?.redirectUrl).toEqual('https://documenso.com');
@@ -144,10 +115,6 @@ test('[TEMPLATE]: should create a document from a template', async ({ page }) =>
     recipientAuth: recipientTwo.authOptions,
   });
 
-  if (isBillingEnabled) {
-    expect(recipientOneAuth.derivedRecipientActionAuth).toContain('PASSKEY');
-  }
-
   expect(recipientOneAuth.derivedRecipientAccessAuth).toContain('ACCOUNT');
   expect(recipientTwoAuth.derivedRecipientAccessAuth).toContain('ACCOUNT');
 });
@@ -156,23 +123,11 @@ test('[TEMPLATE]: should create a document from a template', async ({ page }) =>
  * This is a direct copy paste of the above test but for teams.
  */
 test('[TEMPLATE]: should create a team document from a team template', async ({ page }) => {
-  const { owner, ...team } = await seedTeam({
+  const { team, owner, organisation } = await seedTeam({
     createTeamMembers: 2,
   });
 
-  const template = await seedBlankTemplate(owner, {
-    createTemplateOptions: {
-      teamId: team.id,
-    },
-  });
-
-  const isBillingEnabled =
-    process.env.NEXT_PUBLIC_FEATURE_BILLING_ENABLED === 'true' && enterprisePriceId;
-
-  await seedUserSubscription({
-    userId: owner.id,
-    priceId: enterprisePriceId,
-  });
+  const template = await seedBlankTemplate(owner, team.id);
 
   await apiSignin({
     page,
@@ -188,13 +143,6 @@ test('[TEMPLATE]: should create a team document from a team template', async ({
   await page.getByRole('option').filter({ hasText: 'Require account' }).click();
   await expect(page.getByTestId('documentAccessSelectValue')).toContainText('Require account');
 
-  // Set EE action auth.
-  if (isBillingEnabled) {
-    await page.getByTestId('documentActionSelectValue').click();
-    await page.getByRole('option').filter({ hasText: 'Require passkey' }).click();
-    await expect(page.getByTestId('documentActionSelectValue')).toContainText('Require passkey');
-  }
-
   // Set email options.
   await page.getByRole('button', { name: 'Email Options' }).click();
   await page.getByLabel('Subject (Optional)').fill('SUBJECT');
@@ -219,13 +167,6 @@ test('[TEMPLATE]: should create a team document from a team template', async ({
   await page.getByPlaceholder('Email').nth(1).fill('recipient2@documenso.com');
   await page.getByPlaceholder('Name').nth(1).fill('Recipient 2');
 
-  // Apply require passkey for Recipient 1.
-  if (isBillingEnabled) {
-    await page.getByLabel('Show advanced settings').check();
-    await page.getByTestId('documentActionSelectValue').click();
-    await page.getByRole('option').filter({ hasText: 'Require passkey' }).click();
-  }
-
   await page.getByRole('button', { name: 'Continue' }).click();
   await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
 
@@ -237,7 +178,7 @@ test('[TEMPLATE]: should create a team document from a team template', async ({
   await page.getByRole('button', { name: 'Create as draft' }).click();
 
   // Review that the document was created with the correct values.
-  await page.waitForURL(/documents/);
+  await page.waitForURL(new RegExp(`/t/${team.url}/documents/\\d+`));
 
   const documentId = Number(page.url().split('/').pop());
 
@@ -259,11 +200,6 @@ test('[TEMPLATE]: should create a team document from a team template', async ({
 
   expect(document.title).toEqual('TEMPLATE_TITLE');
   expect(documentAuth.documentAuthOption.globalAccessAuth).toContain('ACCOUNT');
-
-  if (isBillingEnabled) {
-    expect(documentAuth.documentAuthOption.globalActionAuth).toContain('PASSKEY');
-  }
-
   expect(document.documentMeta?.dateFormat).toEqual('dd/MM/yyyy hh:mm a');
   expect(document.documentMeta?.message).toEqual('MESSAGE');
   expect(document.documentMeta?.redirectUrl).toEqual('https://documenso.com');
@@ -283,10 +219,6 @@ test('[TEMPLATE]: should create a team document from a team template', async ({
     recipientAuth: recipientTwo.authOptions,
   });
 
-  if (isBillingEnabled) {
-    expect(recipientOneAuth.derivedRecipientActionAuth).toContain('PASSKEY');
-  }
-
   expect(recipientOneAuth.derivedRecipientAccessAuth).toContain('ACCOUNT');
   expect(recipientTwoAuth.derivedRecipientAccessAuth).toContain('ACCOUNT');
 });
@@ -298,8 +230,8 @@ test('[TEMPLATE]: should create a team document from a team template', async ({
 test('[TEMPLATE]: should create a document from a template with custom document', async ({
   page,
 }) => {
-  const user = await seedUser();
-  const template = await seedBlankTemplate(user);
+  const { user, team } = await seedUser();
+  const template = await seedBlankTemplate(user, team.id);
 
   // Create a temporary PDF file for upload
 
@@ -308,7 +240,7 @@ test('[TEMPLATE]: should create a document from a template with custom document'
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/templates/${template.id}/edit`,
+    redirectPath: `/t/${team.url}/templates/${template.id}/edit`,
   });
 
   // Set template title
@@ -327,7 +259,7 @@ test('[TEMPLATE]: should create a document from a template with custom document'
   await page.getByRole('button', { name: 'Save template' }).click();
 
   // Use template with custom document
-  await page.waitForURL('/templates');
+  await page.waitForURL(`/t/${team.url}/templates`);
   await page.getByRole('button', { name: 'Use Template' }).click();
 
   // Enable custom document upload and upload file
@@ -352,7 +284,7 @@ test('[TEMPLATE]: should create a document from a template with custom document'
   await page.getByRole('button', { name: 'Create as draft' }).click();
 
   // Review that the document was created with the custom document data
-  await page.waitForURL(/documents/);
+  await page.waitForURL(new RegExp(`/t/${team.url}/documents/\\d+`));
 
   const documentId = Number(page.url().split('/').pop());
 
@@ -378,15 +310,11 @@ test('[TEMPLATE]: should create a document from a template with custom document'
 test('[TEMPLATE]: should create a team document from a template with custom document', async ({
   page,
 }) => {
-  const { owner, ...team } = await seedTeam({
+  const { team, owner, organisation } = await seedTeam({
     createTeamMembers: 2,
   });
 
-  const template = await seedBlankTemplate(owner, {
-    createTemplateOptions: {
-      teamId: team.id,
-    },
-  });
+  const template = await seedBlankTemplate(owner, team.id);
 
   const pdfContent = fs.readFileSync(EXAMPLE_PDF_PATH).toString('base64');
 
@@ -437,7 +365,7 @@ test('[TEMPLATE]: should create a team document from a template with custom docu
   await page.getByRole('button', { name: 'Create as draft' }).click();
 
   // Review that the document was created with the custom document data
-  await page.waitForURL(/documents/);
+  await page.waitForURL(new RegExp(`/t/${team.url}/documents/\\d+`));
 
   const documentId = Number(page.url().split('/').pop());
 
@@ -464,13 +392,13 @@ test('[TEMPLATE]: should create a team document from a template with custom docu
 test('[TEMPLATE]: should create a document from a template using template document when custom document is not enabled', async ({
   page,
 }) => {
-  const user = await seedUser();
-  const template = await seedBlankTemplate(user);
+  const { user, team } = await seedUser();
+  const template = await seedBlankTemplate(user, team.id);
 
   await apiSignin({
     page,
     email: user.email,
-    redirectPath: `/templates/${template.id}/edit`,
+    redirectPath: `/t/${team.url}/templates/${template.id}/edit`,
   });
 
   // Set template title
@@ -489,7 +417,7 @@ test('[TEMPLATE]: should create a document from a template using template docume
   await page.getByRole('button', { name: 'Save template' }).click();
 
   // Use template without custom document
-  await page.waitForURL('/templates');
+  await page.waitForURL(`/t/${team.url}/templates`);
   await page.getByRole('button', { name: 'Use Template' }).click();
 
   // Verify custom document upload is not checked by default
@@ -499,7 +427,7 @@ test('[TEMPLATE]: should create a document from a template using template docume
   await page.getByRole('button', { name: 'Create as draft' }).click();
 
   // Review that the document was created with the template's document data
-  await page.waitForURL(/documents/);
+  await page.waitForURL(new RegExp(`/t/${team.url}/documents/\\d+`));
 
   const documentId = Number(page.url().split('/').pop());
 
@@ -532,15 +460,11 @@ test('[TEMPLATE]: should create a document from a template using template docume
 test('[TEMPLATE]: should persist document visibility when creating from template', async ({
   page,
 }) => {
-  const { owner, ...team } = await seedTeam({
+  const { team, owner, organisation } = await seedTeam({
     createTeamMembers: 2,
   });
 
-  const template = await seedBlankTemplate(owner, {
-    createTemplateOptions: {
-      teamId: team.id,
-    },
-  });
+  const template = await seedBlankTemplate(owner, team.id);
 
   await apiSignin({
     page,
@@ -569,17 +493,11 @@ test('[TEMPLATE]: should persist document visibility when creating from template
   await page.getByRole('button', { name: 'Save template' }).click();
 
   // Test creating document as team manager
-  await prisma.teamMember.update({
-    where: {
-      id: team.members[1].id,
-    },
-    data: {
-      role: TeamMemberRole.MANAGER,
-    },
+  const managerUser = await seedTeamMember({
+    teamId: team.id,
+    role: TeamMemberRole.MANAGER,
   });
 
-  const managerUser = team.members[1].user;
-
   await apiSignin({
     page,
     email: managerUser.email,
@@ -590,7 +508,7 @@ test('[TEMPLATE]: should persist document visibility when creating from template
   await page.getByRole('button', { name: 'Create as draft' }).click();
 
   // Review that the document was created with the correct visibility
-  await page.waitForURL(/documents/);
+  await page.waitForURL(new RegExp(`/t/${team.url}/documents/\\d+`));
 
   const documentId = Number(page.url().split('/').pop());
 
@@ -605,7 +523,11 @@ test('[TEMPLATE]: should persist document visibility when creating from template
   expect(document.teamId).toEqual(team.id);
 
   // Test that regular member cannot create document from restricted template
-  const memberUser = team.members[2].user;
+  const memberUser = await seedTeamMember({
+    teamId: team.id,
+    role: TeamMemberRole.MEMBER,
+  });
+
   await apiSignin({
     page,
     email: memberUser.email,
diff --git a/packages/app-tests/e2e/templates/direct-templates.spec.ts b/packages/app-tests/e2e/templates/direct-templates.spec.ts
index de25e2adc..0bdd49980 100644
--- a/packages/app-tests/e2e/templates/direct-templates.spec.ts
+++ b/packages/app-tests/e2e/templates/direct-templates.spec.ts
@@ -2,10 +2,6 @@ import { expect, test } from '@playwright/test';
 import { customAlphabet } from 'nanoid';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import {
-  DIRECT_TEMPLATE_RECIPIENT_EMAIL,
-  DIRECT_TEMPLATE_RECIPIENT_NAME,
-} from '@documenso/lib/constants/direct-templates';
 import { createDocumentAuthOptions } from '@documenso/lib/utils/document-auth';
 import { formatDirectTemplatePath } from '@documenso/lib/utils/templates';
 import { seedTeam } from '@documenso/prisma/seed/teams';
@@ -13,29 +9,18 @@ import { seedDirectTemplate, seedTemplate } from '@documenso/prisma/seed/templat
 import { seedTestEmail, seedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin } from '../fixtures/authentication';
-import { checkDocumentTabCount } from '../fixtures/documents';
 
 // Duped from `packages/lib/utils/teams.ts` due to errors when importing that file.
-const formatDocumentsPath = (teamUrl?: string) =>
-  teamUrl ? `/t/${teamUrl}/documents` : '/documents';
-const formatTemplatesPath = (teamUrl?: string) =>
-  teamUrl ? `/t/${teamUrl}/templates` : '/templates';
+const formatDocumentsPath = (teamUrl: string) => `/t/${teamUrl}/documents`;
+const formatTemplatesPath = (teamUrl: string) => `/t/${teamUrl}/templates`;
 
 const nanoid = customAlphabet('1234567890abcdef', 10);
 
 test('[DIRECT_TEMPLATES]: create direct link for template', async ({ page }) => {
-  const team = await seedTeam({
+  const { team, owner, organisation } = await seedTeam({
     createTeamMembers: 1,
   });
 
-  const owner = team.owner;
-
-  // Should only be visible to the owner in personal templates.
-  const personalTemplate = await seedTemplate({
-    title: 'Personal template',
-    userId: owner.id,
-  });
-
   // Should be visible to team members.
   const teamTemplate = await seedTemplate({
     title: 'Team template 1',
@@ -46,49 +31,35 @@ test('[DIRECT_TEMPLATES]: create direct link for template', async ({ page }) =>
   await apiSignin({
     page,
     email: owner.email,
-    redirectPath: '/templates',
+    redirectPath: `/t/${team.url}/templates`,
   });
 
-  const urls = [
-    `${NEXT_PUBLIC_WEBAPP_URL()}/t/${team.url}/templates/${teamTemplate.id}`,
-    `${NEXT_PUBLIC_WEBAPP_URL()}/templates/${personalTemplate.id}`,
-  ];
+  const url = `${NEXT_PUBLIC_WEBAPP_URL()}/t/${team.url}/templates/${teamTemplate.id}`;
 
-  // Run test for personal and team templates.
-  for (const url of urls) {
-    // Owner should see list of templates with no direct link badge.
-    await page.goto(url);
-    await expect(page.getByRole('button', { name: 'direct link' })).toHaveCount(1);
+  // Owner should see list of templates with no direct link badge.
+  await page.goto(url);
+  await expect(page.getByRole('button', { name: 'direct link' })).toHaveCount(1);
 
-    // Create direct link.
-    await page.getByRole('button', { name: 'Create Direct Link' }).click();
-    await page.getByRole('button', { name: 'Enable direct link signing' }).click();
-    await page.getByRole('button', { name: 'Create one automatically' }).click();
-    await expect(page.getByRole('heading', { name: 'Direct Link Signing' })).toBeVisible();
+  // Create direct link.
+  await page.getByRole('button', { name: 'Create Direct Link' }).click();
+  await page.getByRole('button', { name: 'Enable direct link signing' }).click();
+  await page.getByRole('button', { name: 'Create one automatically' }).click();
+  await expect(page.getByRole('heading', { name: 'Direct Link Signing' })).toBeVisible();
 
-    await page.waitForTimeout(1000);
-    await page.getByTestId('btn-dialog-close').click();
+  await page.waitForTimeout(1000);
+  await page.getByTestId('btn-dialog-close').click();
 
-    // Expect badge to appear.
-    await expect(page.getByRole('button', { name: 'direct link' })).toHaveCount(2);
-  }
+  // Expect badge to appear.
+  await expect(page.getByRole('button', { name: 'direct link' })).toHaveCount(2);
 });
 
 test('[DIRECT_TEMPLATES]: toggle direct template link', async ({ page }) => {
-  const team = await seedTeam({
+  const { team, owner, organisation } = await seedTeam({
     createTeamMembers: 1,
   });
 
-  const owner = team.owner;
-
-  // Should only be visible to the owner in personal templates.
-  const personalDirectTemplate = await seedDirectTemplate({
-    title: 'Personal direct template link',
-    userId: owner.id,
-  });
-
   // Should be visible to team members.
-  const teamDirectTemplate = await seedDirectTemplate({
+  const template = await seedDirectTemplate({
     title: 'Team direct template link 1',
     userId: owner.id,
     teamId: team.id,
@@ -99,41 +70,30 @@ test('[DIRECT_TEMPLATES]: toggle direct template link', async ({ page }) => {
     email: owner.email,
   });
 
-  // Run test for personal and team templates.
-  for (const template of [personalDirectTemplate, teamDirectTemplate]) {
-    // Check that the direct template link is accessible.
-    await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
-    await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
+  // Check that the direct template link is accessible.
+  await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
+  await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
 
-    // Navigate to template settings and disable access.
-    await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}${formatTemplatesPath(template.team?.url)}`);
-    await page.getByRole('cell', { name: 'Use Template' }).getByRole('button').nth(1).click();
-    await page.getByRole('menuitem', { name: 'Direct link' }).click();
-    await page.getByRole('switch').click();
-    await page.getByRole('button', { name: 'Save' }).click();
-    await expect(page.getByText('Direct link signing has been').first()).toBeVisible();
+  // Navigate to template settings and disable access.
+  await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}${formatTemplatesPath(template.team?.url)}`);
+  await page.getByRole('cell', { name: 'Use Template' }).getByRole('button').nth(1).click();
+  await page.getByRole('menuitem', { name: 'Direct link' }).click();
+  await page.getByRole('switch').click();
+  await page.getByRole('button', { name: 'Save' }).click();
+  await expect(page.getByText('Direct link signing has been').first()).toBeVisible();
 
-    // Check that the direct template link is no longer accessible.
-    await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
-    await expect(page.getByText('404 not found')).toBeVisible();
-  }
+  // Check that the direct template link is no longer accessible.
+  await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
+  await expect(page.getByText('404 not found')).toBeVisible();
 });
 
 test('[DIRECT_TEMPLATES]: delete direct template link', async ({ page }) => {
-  const team = await seedTeam({
+  const { team, owner, organisation } = await seedTeam({
     createTeamMembers: 1,
   });
 
-  const owner = team.owner;
-
-  // Should only be visible to the owner in personal templates.
-  const personalDirectTemplate = await seedDirectTemplate({
-    title: 'Personal direct template link',
-    userId: owner.id,
-  });
-
   // Should be visible to team members.
-  const teamDirectTemplate = await seedDirectTemplate({
+  const template = await seedDirectTemplate({
     title: 'Team direct template link 1',
     userId: owner.id,
     teamId: team.id,
@@ -144,32 +104,30 @@ test('[DIRECT_TEMPLATES]: delete direct template link', async ({ page }) => {
     email: owner.email,
   });
 
-  // Run test for personal and team templates.
-  for (const template of [personalDirectTemplate, teamDirectTemplate]) {
-    // Check that the direct template link is accessible.
-    await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
-    await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
+  // Check that the direct template link is accessible.
+  await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
+  await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
 
-    // Navigate to template settings and delete the access.
-    await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}${formatTemplatesPath(template.team?.url)}`);
-    await page.getByRole('cell', { name: 'Use Template' }).getByRole('button').nth(1).click();
-    await page.getByRole('menuitem', { name: 'Direct link' }).click();
-    await page.getByRole('button', { name: 'Remove' }).click();
-    await page.getByRole('button', { name: 'Confirm' }).click();
-    await expect(page.getByText('Direct template link deleted').first()).toBeVisible();
+  // Navigate to template settings and delete the access.
+  await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}${formatTemplatesPath(template.team?.url)}`);
+  await page.getByRole('cell', { name: 'Use Template' }).getByRole('button').nth(1).click();
+  await page.getByRole('menuitem', { name: 'Direct link' }).click();
+  await page.getByRole('button', { name: 'Remove' }).click();
+  await page.getByRole('button', { name: 'Confirm' }).click();
+  await expect(page.getByText('Direct template link deleted').first()).toBeVisible();
 
-    // Check that the direct template link is no longer accessible.
-    await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
-    await expect(page.getByText('404 not found')).toBeVisible();
-  }
+  // Check that the direct template link is no longer accessible.
+  await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
+  await expect(page.getByText('404 not found')).toBeVisible();
 });
 
 test('[DIRECT_TEMPLATES]: direct template link auth access', async ({ page }) => {
-  const user = await seedUser();
+  const { user, team } = await seedUser();
 
   const directTemplateWithAuth = await seedDirectTemplate({
     title: 'Personal direct template link',
     userId: user.id,
+    teamId: team.id,
     createTemplateOptions: {
       authOptions: createDocumentAuthOptions({
         globalAccessAuth: ['ACCOUNT'],
@@ -198,136 +156,26 @@ test('[DIRECT_TEMPLATES]: direct template link auth access', async ({ page }) =>
 });
 
 test('[DIRECT_TEMPLATES]: use direct template link with 1 recipient', async ({ page }) => {
-  const team = await seedTeam({
+  const { team, owner, organisation } = await seedTeam({
     createTeamMembers: 1,
   });
 
-  const owner = team.owner;
-
-  // Should only be visible to the owner in personal templates.
-  const personalDirectTemplate = await seedDirectTemplate({
-    title: 'Personal direct template link',
-    userId: owner.id,
-  });
-
   // Should be visible to team members.
-  const teamDirectTemplate = await seedDirectTemplate({
+  const template = await seedDirectTemplate({
     title: 'Team direct template link 1',
     userId: owner.id,
     teamId: team.id,
   });
 
-  // Run test for personal and team templates.
-  for (const template of [personalDirectTemplate, teamDirectTemplate]) {
-    // Check that the direct template link is accessible.
-    await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
-    await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
+  // Check that the direct template link is accessible.
+  await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
+  await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
 
-    await page.getByPlaceholder('recipient@documenso.com').fill(seedTestEmail());
+  await page.getByPlaceholder('recipient@documenso.com').fill(seedTestEmail());
 
-    await page.getByRole('button', { name: 'Continue' }).click();
-    await page.getByRole('button', { name: 'Complete' }).click();
-    await page.getByRole('button', { name: 'Sign' }).click();
-    await page.waitForURL(/\/sign/);
-    await expect(page.getByRole('heading', { name: 'Document Signed' })).toBeVisible();
-  }
-
-  await apiSignin({
-    page,
-    email: owner.email,
-  });
-
-  // Check that the owner has the documents.
-  for (const template of [personalDirectTemplate, teamDirectTemplate]) {
-    await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}${formatDocumentsPath(template.team?.url)}`);
-
-    await expect(async () => {
-      // Check that the document is in the 'All' tab.
-      await checkDocumentTabCount(page, 'Completed', 1);
-    }).toPass();
-  }
-});
-
-test('[DIRECT_TEMPLATES]: use direct template link with 2 recipients', async ({ page }) => {
-  const team = await seedTeam({
-    createTeamMembers: 1,
-  });
-
-  const owner = team.owner;
-
-  const secondRecipient = await seedUser();
-
-  const createTemplateOptions = {
-    recipients: {
-      createMany: {
-        data: [
-          {
-            email: DIRECT_TEMPLATE_RECIPIENT_EMAIL,
-            name: DIRECT_TEMPLATE_RECIPIENT_NAME,
-            token: nanoid(),
-          },
-          {
-            email: secondRecipient.email,
-            token: nanoid(),
-          },
-        ],
-      },
-    },
-  };
-
-  // Should only be visible to the owner in personal templates.
-  const personalDirectTemplate = await seedDirectTemplate({
-    title: 'Personal direct template link',
-    userId: owner.id,
-    createTemplateOptions,
-  });
-
-  // Should be visible to team members.
-  const teamDirectTemplate = await seedDirectTemplate({
-    title: 'Team direct template link 1',
-    userId: owner.id,
-    teamId: team.id,
-    createTemplateOptions,
-  });
-
-  // Run test for personal and team templates.
-  for (const template of [personalDirectTemplate, teamDirectTemplate]) {
-    // Check that the direct template link is accessible.
-    await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
-    await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
-
-    await page.waitForTimeout(1000);
-    await page.getByPlaceholder('recipient@documenso.com').fill(seedTestEmail());
-
-    await page.getByRole('button', { name: 'Continue' }).click();
-    await page.getByRole('button', { name: 'Complete' }).click();
-    await page.getByRole('button', { name: 'Sign' }).click();
-    await page.waitForURL(/\/sign/);
-    await expect(page.getByText('Waiting for others to sign')).toBeVisible();
-  }
-
-  await apiSignin({
-    page,
-    email: owner.email,
-  });
-
-  // Check that the owner has the documents.
-  for (const template of [personalDirectTemplate, teamDirectTemplate]) {
-    await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}${formatDocumentsPath(template.team?.url)}`);
-
-    // Check that the document is in the 'All' tab.
-    await checkDocumentTabCount(page, 'All', 1);
-    await checkDocumentTabCount(page, 'Pending', 1);
-  }
-
-  // Check that the second recipient has the 2 pending documents.
-  await apiSignin({
-    page,
-    email: secondRecipient.email,
-  });
-
-  await page.goto('/documents');
-
-  await checkDocumentTabCount(page, 'All', 2);
-  await checkDocumentTabCount(page, 'Inbox', 2);
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await page.getByRole('button', { name: 'Complete' }).click();
+  await page.getByRole('button', { name: 'Sign' }).click();
+  await page.waitForURL(/\/sign/);
+  await expect(page.getByRole('heading', { name: 'Document Signed' })).toBeVisible();
 });
diff --git a/packages/app-tests/e2e/templates/manage-templates.spec.ts b/packages/app-tests/e2e/templates/manage-templates.spec.ts
index 3c0f2fef6..f8489a3d7 100644
--- a/packages/app-tests/e2e/templates/manage-templates.spec.ts
+++ b/packages/app-tests/e2e/templates/manage-templates.spec.ts
@@ -1,23 +1,19 @@
 import { expect, test } from '@playwright/test';
+import { TeamMemberRole } from '@prisma/client';
 
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { seedTeam } from '@documenso/prisma/seed/teams';
+import { seedTeam, seedTeamMember } from '@documenso/prisma/seed/teams';
 import { seedTemplate } from '@documenso/prisma/seed/templates';
 
 import { apiSignin } from '../fixtures/authentication';
 
 test('[TEMPLATES]: view templates', async ({ page }) => {
-  const team = await seedTeam({
+  const { team, owner, organisation } = await seedTeam({
     createTeamMembers: 1,
   });
 
-  const owner = team.owner;
-  const teamMemberUser = team.members[1].user;
-
-  // Should only be visible to the owner in personal templates.
-  await seedTemplate({
-    title: 'Personal template',
-    userId: owner.id,
+  const teamMemberUser = await seedTeamMember({
+    teamId: team.id,
+    role: TeamMemberRole.MEMBER,
   });
 
   // Should be visible to team members.
@@ -37,29 +33,21 @@ test('[TEMPLATES]: view templates', async ({ page }) => {
   await apiSignin({
     page,
     email: owner.email,
-    redirectPath: '/templates',
+    redirectPath: `/t/${team.url}/templates`,
   });
 
-  // Only should only see their personal template.
-  await expect(page.getByTestId('data-table-count')).toContainText('Showing 1 result');
-
   // Owner should see both team templates.
-  await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/t/${team.url}/templates`);
   await expect(page.getByTestId('data-table-count')).toContainText('Showing 2 results');
 });
 
 test('[TEMPLATES]: delete template', async ({ page }) => {
-  const team = await seedTeam({
+  const { team, owner, organisation } = await seedTeam({
     createTeamMembers: 1,
   });
 
-  const owner = team.owner;
-  const teamMemberUser = team.members[1].user;
-
-  // Should only be visible to the owner in personal templates.
-  await seedTemplate({
-    title: 'Personal template',
-    userId: owner.id,
+  const teamMemberUser = await seedTeamMember({
+    teamId: team.id,
+    role: TeamMemberRole.MEMBER,
   });
 
   // Should be visible to team members.
@@ -79,18 +67,9 @@ test('[TEMPLATES]: delete template', async ({ page }) => {
   await apiSignin({
     page,
     email: owner.email,
-    redirectPath: '/templates',
+    redirectPath: `/t/${team.url}/templates`,
   });
 
-  // Owner should be able to delete their personal template.
-  await page.getByRole('cell', { name: 'Use Template' }).getByRole('button').nth(1).click();
-  await page.getByRole('menuitem', { name: 'Delete' }).click();
-  await page.getByRole('button', { name: 'Delete' }).click();
-  await expect(page.getByText('Template deleted').first()).toBeVisible();
-
-  // Team member should be able to delete all templates.
-  await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/t/${team.url}/templates`);
-
   for (const template of ['Team template 1', 'Team template 2']) {
     await page
       .getByRole('row', { name: template })
@@ -108,17 +87,13 @@ test('[TEMPLATES]: delete template', async ({ page }) => {
 });
 
 test('[TEMPLATES]: duplicate template', async ({ page }) => {
-  const team = await seedTeam({
+  const { team, owner, organisation } = await seedTeam({
     createTeamMembers: 1,
   });
 
-  const owner = team.owner;
-  const teamMemberUser = team.members[1].user;
-
-  // Should only be visible to the owner in personal templates.
-  await seedTemplate({
-    title: 'Personal template',
-    userId: owner.id,
+  const teamMemberUser = await seedTeamMember({
+    teamId: team.id,
+    role: TeamMemberRole.MEMBER,
   });
 
   // Should be visible to team members.
@@ -131,18 +106,9 @@ test('[TEMPLATES]: duplicate template', async ({ page }) => {
   await apiSignin({
     page,
     email: owner.email,
-    redirectPath: '/templates',
+    redirectPath: `/t/${team.url}/templates`,
   });
 
-  // Duplicate personal template.
-  await page.getByRole('cell', { name: 'Use Template' }).getByRole('button').nth(1).click();
-  await page.getByRole('menuitem', { name: 'Duplicate' }).click();
-  await page.getByRole('button', { name: 'Duplicate' }).click();
-  await expect(page.getByText('Template duplicated').first()).toBeVisible();
-  await expect(page.getByTestId('data-table-count')).toContainText('Showing 2 results');
-
-  await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/t/${team.url}/templates`);
-
   // Duplicate team template.
   await page.getByRole('cell', { name: 'Use Template' }).getByRole('button').nth(1).click();
   await page.getByRole('menuitem', { name: 'Duplicate' }).click();
@@ -152,17 +118,13 @@ test('[TEMPLATES]: duplicate template', async ({ page }) => {
 });
 
 test('[TEMPLATES]: use template', async ({ page }) => {
-  const team = await seedTeam({
+  const { team, owner, organisation } = await seedTeam({
     createTeamMembers: 1,
   });
 
-  const owner = team.owner;
-  const teamMemberUser = team.members[1].user;
-
-  // Should only be visible to the owner in personal templates.
-  await seedTemplate({
-    title: 'Personal template',
-    userId: owner.id,
+  const teamMemberUser = await seedTeamMember({
+    teamId: team.id,
+    role: TeamMemberRole.MEMBER,
   });
 
   // Should be visible to team members.
@@ -175,27 +137,9 @@ test('[TEMPLATES]: use template', async ({ page }) => {
   await apiSignin({
     page,
     email: owner.email,
-    redirectPath: '/templates',
+    redirectPath: `/t/${team.url}/templates`,
   });
 
-  // Use personal template.
-  await page.getByRole('button', { name: 'Use Template' }).click();
-
-  // Enter template values.
-  await page.getByPlaceholder('recipient.1@documenso.com').click();
-  await page.getByPlaceholder('recipient.1@documenso.com').fill(teamMemberUser.email);
-  await page.getByPlaceholder('Recipient 1').click();
-  await page.getByPlaceholder('Recipient 1').fill('name');
-
-  await page.getByRole('button', { name: 'Create as draft' }).click();
-  await page.waitForURL(/documents/);
-  await page.getByRole('main').getByRole('link', { name: 'Documents' }).click();
-  await page.waitForURL('/documents');
-  await expect(page.getByTestId('data-table-count')).toContainText('Showing 1 result');
-
-  await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/t/${team.url}/templates`);
-  await page.waitForTimeout(1000);
-
   // Use team template.
   await page.getByRole('button', { name: 'Use Template' }).click();
 
diff --git a/packages/app-tests/e2e/user/auth-flow.spec.ts b/packages/app-tests/e2e/user/auth-flow.spec.ts
index a28ffac40..f78de8ef5 100644
--- a/packages/app-tests/e2e/user/auth-flow.spec.ts
+++ b/packages/app-tests/e2e/user/auth-flow.spec.ts
@@ -1,6 +1,6 @@
 import { type Page, expect, test } from '@playwright/test';
 
-import { alphaid } from '@documenso/lib/universal/id';
+import { prisma } from '@documenso/prisma';
 import {
   extractUserVerificationToken,
   seedTestEmail,
@@ -23,17 +23,26 @@ test('[USER] can sign up with email and password', async ({ page }: { page: Page
 
   await signSignaturePad(page);
 
-  await page.getByRole('button', { name: 'Next', exact: true }).click();
-
-  await page.getByLabel('Public profile username').fill(alphaid(10));
-  await page.getByLabel('Public profile username').blur();
-
-  await page.getByRole('button', { name: 'Complete' }).click();
+  await page.getByRole('button', { name: 'Complete', exact: true }).click();
 
   await page.waitForURL('/unverified-account');
 
   const { token } = await extractUserVerificationToken(email);
 
+  const team = await prisma.team.findFirstOrThrow({
+    where: {
+      organisation: {
+        members: {
+          some: {
+            user: {
+              email,
+            },
+          },
+        },
+      },
+    },
+  });
+
   await page.goto(`/verify-email/${token}`);
 
   await expect(page.getByRole('heading')).toContainText('Email Confirmed!');
@@ -41,19 +50,19 @@ test('[USER] can sign up with email and password', async ({ page }: { page: Page
   // We now automatically redirect to the home page
   await page.getByRole('link', { name: 'Continue' }).click();
 
-  await page.waitForURL('/documents');
-
-  await expect(page).toHaveURL('/documents');
+  // Expect to be redirected to their only team.
+  await page.waitForURL(`/t/${team.url}/documents`);
+  await expect(page).toHaveURL(`/t/${team.url}/documents`);
 });
 
 test('[USER] can sign in using email and password', async ({ page }: { page: Page }) => {
-  const user = await seedUser();
+  const { user, team } = await seedUser();
 
   await page.goto('/signin');
   await page.getByLabel('Email').fill(user.email);
   await page.getByLabel('Password', { exact: true }).fill('password');
   await page.getByRole('button', { name: 'Sign In' }).click();
 
-  await page.waitForURL('/documents');
-  await expect(page).toHaveURL('/documents');
+  await page.waitForURL(`/t/${team.url}/documents`);
+  await expect(page).toHaveURL(`/t/${team.url}/documents`);
 });
diff --git a/packages/app-tests/e2e/user/delete-account.spec.ts b/packages/app-tests/e2e/user/delete-account.spec.ts
index 40fee1125..044ea3ab6 100644
--- a/packages/app-tests/e2e/user/delete-account.spec.ts
+++ b/packages/app-tests/e2e/user/delete-account.spec.ts
@@ -7,7 +7,7 @@ import { seedUser } from '@documenso/prisma/seed/users';
 import { apiSignin } from '../fixtures/authentication';
 
 test('[USER] delete account', async ({ page }) => {
-  const user = await seedUser();
+  const { user } = await seedUser();
 
   await apiSignin({ page, email: user.email, redirectPath: '/settings' });
 
diff --git a/packages/app-tests/e2e/user/password.spec.ts b/packages/app-tests/e2e/user/password.spec.ts
index 6713a87a7..e989199f6 100644
--- a/packages/app-tests/e2e/user/password.spec.ts
+++ b/packages/app-tests/e2e/user/password.spec.ts
@@ -11,7 +11,7 @@ test('[USER] can reset password via forgot password', async ({ page }: { page: P
   const oldPassword = 'Test123!';
   const newPassword = 'Test124!';
 
-  const user = await seedUser({
+  const { user } = await seedUser({
     password: oldPassword,
   });
 
@@ -51,17 +51,18 @@ test('[USER] can reset password via forgot password', async ({ page }: { page: P
     page,
     email: user.email,
     password: newPassword,
+    redirectPath: '/settings/profile',
   });
 
-  await page.waitForURL('/documents');
-  await expect(page).toHaveURL('/documents');
+  await page.waitForURL('/settings/profile');
+  await expect(page).toHaveURL('/settings/profile');
 });
 
 test('[USER] can reset password via user settings', async ({ page }: { page: Page }) => {
   const oldPassword = 'Test123!';
   const newPassword = 'Test124!';
 
-  const user = await seedUser({
+  const { user } = await seedUser({
     password: oldPassword,
   });
 
@@ -87,8 +88,9 @@ test('[USER] can reset password via user settings', async ({ page }: { page: Pag
     page,
     email: user.email,
     password: newPassword,
+    redirectPath: '/settings/profile',
   });
 
-  await page.waitForURL('/documents');
-  await expect(page).toHaveURL('/documents');
+  await page.waitForURL('/settings/profile');
+  await expect(page).toHaveURL('/settings/profile');
 });
diff --git a/packages/app-tests/e2e/user/update-name.spec.ts b/packages/app-tests/e2e/user/update-name.spec.ts
index 29f6ff827..effb1dfd4 100644
--- a/packages/app-tests/e2e/user/update-name.spec.ts
+++ b/packages/app-tests/e2e/user/update-name.spec.ts
@@ -7,7 +7,7 @@ import { apiSignin } from '../fixtures/authentication';
 import { signSignaturePad } from '../fixtures/signature';
 
 test('[USER] update full name', async ({ page }) => {
-  const user = await seedUser();
+  const { user } = await seedUser();
 
   await apiSignin({ page, email: user.email, redirectPath: '/settings/profile' });
 
diff --git a/packages/auth/server/lib/session/session.ts b/packages/auth/server/lib/session/session.ts
index cd690be64..15e1cc04b 100644
--- a/packages/auth/server/lib/session/session.ts
+++ b/packages/auth/server/lib/session/session.ts
@@ -22,8 +22,6 @@ export type SessionUser = Pick<
   | 'twoFactorEnabled'
   | 'roles'
   | 'signature'
-  | 'url'
-  | 'customerId'
 >;
 
 export type SessionValidationResult =
@@ -99,8 +97,6 @@ export const validateSessionToken = async (token: string): Promise<SessionValida
           twoFactorEnabled: true,
           roles: true,
           signature: true,
-          url: true,
-          customerId: true,
         },
       },
     },
diff --git a/packages/auth/server/lib/utils/handle-oauth-callback-url.ts b/packages/auth/server/lib/utils/handle-oauth-callback-url.ts
index fec09b1b2..76ec6a607 100644
--- a/packages/auth/server/lib/utils/handle-oauth-callback-url.ts
+++ b/packages/auth/server/lib/utils/handle-oauth-callback-url.ts
@@ -2,7 +2,6 @@ import { UserSecurityAuditLogType } from '@prisma/client';
 import { OAuth2Client, decodeIdToken } from 'arctic';
 import type { Context } from 'hono';
 import { deleteCookie } from 'hono/cookie';
-import { nanoid } from 'nanoid';
 
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { onCreateUserHook } from '@documenso/lib/server-only/user/create-user';
@@ -54,7 +53,7 @@ export const handleOAuthCallbackUrl = async (options: HandleOAuthCallbackUrlOpti
   let [redirectState, redirectPath] = storedRedirectPath.split(' ');
 
   if (redirectState !== storedState || !redirectPath) {
-    redirectPath = '/documents';
+    redirectPath = '/';
   }
 
   const tokens = await oAuthClient.validateAuthorizationCode(
@@ -164,7 +163,6 @@ export const handleOAuthCallbackUrl = async (options: HandleOAuthCallbackUrlOpti
         email: email,
         name: name,
         emailVerified: new Date(),
-        url: nanoid(17),
       },
     });
 
diff --git a/packages/auth/server/lib/utils/redirect.ts b/packages/auth/server/lib/utils/redirect.ts
index c1a27779d..77be2d1b7 100644
--- a/packages/auth/server/lib/utils/redirect.ts
+++ b/packages/auth/server/lib/utils/redirect.ts
@@ -11,17 +11,17 @@ export const handleRequestRedirect = (redirectUrl?: string) => {
   const url = new URL(redirectUrl, NEXT_PUBLIC_WEBAPP_URL());
 
   if (url.origin !== NEXT_PUBLIC_WEBAPP_URL()) {
-    window.location.href = '/documents';
+    window.location.href = '/';
   } else {
     window.location.href = redirectUrl;
   }
 };
 
-export const handleSignInRedirect = (redirectUrl: string = '/documents') => {
+export const handleSignInRedirect = (redirectUrl: string = '/') => {
   const url = new URL(redirectUrl, NEXT_PUBLIC_WEBAPP_URL());
 
   if (url.origin !== NEXT_PUBLIC_WEBAPP_URL()) {
-    window.location.href = '/documents';
+    window.location.href = '/';
   } else {
     window.location.href = redirectUrl;
   }
diff --git a/packages/auth/server/routes/email-password.ts b/packages/auth/server/routes/email-password.ts
index fdaa80a10..2353cfd41 100644
--- a/packages/auth/server/routes/email-password.ts
+++ b/packages/auth/server/routes/email-password.ts
@@ -5,7 +5,6 @@ import { Hono } from 'hono';
 import { DateTime } from 'luxon';
 import { z } from 'zod';
 
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { EMAIL_VERIFICATION_STATE } from '@documenso/lib/constants/email';
 import { AppError } from '@documenso/lib/errors/app-error';
 import { jobsClient } from '@documenso/lib/jobs/client';
@@ -148,15 +147,12 @@ export const emailPasswordRoute = new Hono<HonoAuthContext>()
       });
     }
 
-    const { name, email, password, signature, url } = c.req.valid('json');
+    const { name, email, password, signature } = c.req.valid('json');
 
-    if (IS_BILLING_ENABLED() && url && url.length < 6) {
-      throw new AppError('PREMIUM_PROFILE_URL', {
-        message: 'Only subscribers can have a username shorter than 6 characters',
-      });
-    }
-
-    const user = await createUser({ name, email, password, signature, url });
+    const user = await createUser({ name, email, password, signature }).catch((err) => {
+      console.error(err);
+      throw err;
+    });
 
     await jobsClient.triggerJob({
       name: 'send.signup.confirmation.email',
diff --git a/packages/auth/server/routes/passkey.ts b/packages/auth/server/routes/passkey.ts
index 11f3981a7..0d0b43854 100644
--- a/packages/auth/server/routes/passkey.ts
+++ b/packages/auth/server/routes/passkey.ts
@@ -114,7 +114,7 @@ export const passkeyRoute = new Hono<HonoAuthContext>()
 
     return c.json(
       {
-        url: '/documents',
+        url: '/',
       },
       200,
     );
diff --git a/packages/auth/server/types/email-password.ts b/packages/auth/server/types/email-password.ts
index aeaae5a02..e8d2edcdd 100644
--- a/packages/auth/server/types/email-password.ts
+++ b/packages/auth/server/types/email-password.ts
@@ -37,15 +37,6 @@ export const ZSignUpSchema = z.object({
   email: z.string().email(),
   password: ZPasswordSchema,
   signature: z.string().nullish(),
-  url: z
-    .string()
-    .trim()
-    .toLowerCase()
-    .min(1)
-    .regex(/^[a-z0-9-]+$/, {
-      message: 'Username can only container alphanumeric characters and dashes.',
-    })
-    .optional(),
 });
 
 export type TSignUpSchema = z.infer<typeof ZSignUpSchema>;
diff --git a/packages/ee/server-only/limits/client.ts b/packages/ee/server-only/limits/client.ts
index 0a7f6bd49..1bffe1337 100644
--- a/packages/ee/server-only/limits/client.ts
+++ b/packages/ee/server-only/limits/client.ts
@@ -6,10 +6,10 @@ import { ZLimitsResponseSchema } from './schema';
 
 export type GetLimitsOptions = {
   headers?: Record<string, string>;
-  teamId?: number | null;
+  teamId: number;
 };
 
-export const getLimits = async ({ headers, teamId }: GetLimitsOptions = {}) => {
+export const getLimits = async ({ headers, teamId }: GetLimitsOptions) => {
   const requestHeaders = headers ?? {};
 
   const url = new URL('/api/limits', NEXT_PUBLIC_WEBAPP_URL());
diff --git a/packages/ee/server-only/limits/constants.ts b/packages/ee/server-only/limits/constants.ts
index b3ca4c81b..436645685 100644
--- a/packages/ee/server-only/limits/constants.ts
+++ b/packages/ee/server-only/limits/constants.ts
@@ -6,7 +6,13 @@ export const FREE_PLAN_LIMITS: TLimitsSchema = {
   directTemplates: 3,
 };
 
-export const TEAM_PLAN_LIMITS: TLimitsSchema = {
+export const INACTIVE_PLAN_LIMITS: TLimitsSchema = {
+  documents: 0,
+  recipients: 0,
+  directTemplates: 0,
+};
+
+export const PAID_PLAN_LIMITS: TLimitsSchema = {
   documents: Infinity,
   recipients: Infinity,
   directTemplates: Infinity,
diff --git a/packages/ee/server-only/limits/handler.ts b/packages/ee/server-only/limits/handler.ts
index e75259ced..2f10a5044 100644
--- a/packages/ee/server-only/limits/handler.ts
+++ b/packages/ee/server-only/limits/handler.ts
@@ -17,11 +17,11 @@ export const limitsHandler = async (req: Request) => {
       teamId = parseInt(rawTeamId, 10);
     }
 
-    if (!teamId && rawTeamId) {
+    if (!teamId) {
       throw new Error(ERROR_CODES.INVALID_TEAM_ID);
     }
 
-    const limits = await getServerLimits({ email: user.email, teamId });
+    const limits = await getServerLimits({ userId: user.id, teamId });
 
     return Response.json(limits, {
       status: 200,
diff --git a/packages/ee/server-only/limits/provider/client.tsx b/packages/ee/server-only/limits/provider/client.tsx
index 6c3d68554..261c8bb07 100644
--- a/packages/ee/server-only/limits/provider/client.tsx
+++ b/packages/ee/server-only/limits/provider/client.tsx
@@ -22,7 +22,7 @@ export const useLimits = () => {
 
 export type LimitsProviderProps = {
   initialValue?: TLimitsResponseSchema;
-  teamId?: number;
+  teamId: number;
   children?: React.ReactNode;
 };
 
diff --git a/packages/ee/server-only/limits/server.ts b/packages/ee/server-only/limits/server.ts
index 8d7326246..f39646f1c 100644
--- a/packages/ee/server-only/limits/server.ts
+++ b/packages/ee/server-only/limits/server.ts
@@ -2,21 +2,25 @@ import { DocumentSource, SubscriptionStatus } from '@prisma/client';
 import { DateTime } from 'luxon';
 
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { INTERNAL_CLAIM_ID } from '@documenso/lib/types/subscription';
 import { prisma } from '@documenso/prisma';
 
-import { getDocumentRelatedPrices } from '../stripe/get-document-related-prices.ts';
-import { FREE_PLAN_LIMITS, SELFHOSTED_PLAN_LIMITS, TEAM_PLAN_LIMITS } from './constants';
+import {
+  FREE_PLAN_LIMITS,
+  INACTIVE_PLAN_LIMITS,
+  PAID_PLAN_LIMITS,
+  SELFHOSTED_PLAN_LIMITS,
+} from './constants';
 import { ERROR_CODES } from './errors';
 import type { TLimitsResponseSchema } from './schema';
-import { ZLimitsSchema } from './schema';
 
 export type GetServerLimitsOptions = {
-  email: string;
-  teamId?: number | null;
+  userId: number;
+  teamId: number;
 };
 
 export const getServerLimits = async ({
-  email,
+  userId,
   teamId,
 }: GetServerLimitsOptions): Promise<TLimitsResponseSchema> => {
   if (!IS_BILLING_ENABLED()) {
@@ -26,141 +30,96 @@ export const getServerLimits = async ({
     };
   }
 
-  if (!email) {
-    throw new Error(ERROR_CODES.UNAUTHORIZED);
-  }
-
-  return teamId ? handleTeamLimits({ email, teamId }) : handleUserLimits({ email });
-};
-
-type HandleUserLimitsOptions = {
-  email: string;
-};
-
-const handleUserLimits = async ({ email }: HandleUserLimitsOptions) => {
-  const user = await prisma.user.findFirst({
+  const organisation = await prisma.organisation.findFirst({
     where: {
-      email,
-    },
-    include: {
-      subscriptions: true,
-    },
-  });
-
-  if (!user) {
-    throw new Error(ERROR_CODES.USER_FETCH_FAILED);
-  }
-
-  let quota = structuredClone(FREE_PLAN_LIMITS);
-  let remaining = structuredClone(FREE_PLAN_LIMITS);
-
-  const activeSubscriptions = user.subscriptions.filter(
-    ({ status }) => status === SubscriptionStatus.ACTIVE,
-  );
-
-  if (activeSubscriptions.length > 0) {
-    const documentPlanPrices = await getDocumentRelatedPrices();
-
-    for (const subscription of activeSubscriptions) {
-      const price = documentPlanPrices.find((price) => price.id === subscription.priceId);
-
-      if (!price || typeof price.product === 'string' || price.product.deleted) {
-        continue;
-      }
-
-      const currentQuota = ZLimitsSchema.parse(
-        'metadata' in price.product ? price.product.metadata : {},
-      );
-
-      // Use the subscription with the highest quota.
-      if (currentQuota.documents > quota.documents && currentQuota.recipients > quota.recipients) {
-        quota = currentQuota;
-        remaining = structuredClone(quota);
-      }
-    }
-
-    // Assume all active subscriptions provide unlimited direct templates.
-    remaining.directTemplates = Infinity;
-  }
-
-  const [documents, directTemplates] = await Promise.all([
-    prisma.document.count({
-      where: {
-        userId: user.id,
-        teamId: null,
-        createdAt: {
-          gte: DateTime.utc().startOf('month').toJSDate(),
-        },
-        source: {
-          not: DocumentSource.TEMPLATE_DIRECT_LINK,
+      teams: {
+        some: {
+          id: teamId,
         },
       },
-    }),
-    prisma.template.count({
-      where: {
-        userId: user.id,
-        teamId: null,
-        directLink: {
-          isNot: null,
-        },
-      },
-    }),
-  ]);
-
-  remaining.documents = Math.max(remaining.documents - documents, 0);
-  remaining.directTemplates = Math.max(remaining.directTemplates - directTemplates, 0);
-
-  return {
-    quota,
-    remaining,
-  };
-};
-
-type HandleTeamLimitsOptions = {
-  email: string;
-  teamId: number;
-};
-
-const handleTeamLimits = async ({ email, teamId }: HandleTeamLimitsOptions) => {
-  const team = await prisma.team.findFirst({
-    where: {
-      id: teamId,
       members: {
         some: {
-          user: {
-            email,
-          },
+          userId,
         },
       },
     },
     include: {
       subscription: true,
+      organisationClaim: true,
     },
   });
 
-  if (!team) {
-    throw new Error('Team not found');
+  if (!organisation) {
+    throw new Error(ERROR_CODES.USER_FETCH_FAILED);
   }
 
-  const { subscription } = team;
+  const quota = structuredClone(FREE_PLAN_LIMITS);
+  const remaining = structuredClone(FREE_PLAN_LIMITS);
 
-  if (subscription && subscription.status === SubscriptionStatus.INACTIVE) {
+  const subscription = organisation.subscription;
+
+  // Bypass all limits even if plan expired for ENTERPRISE.
+  if (organisation.organisationClaimId === INTERNAL_CLAIM_ID.ENTERPRISE) {
     return {
-      quota: {
-        documents: 0,
-        recipients: 0,
-        directTemplates: 0,
-      },
-      remaining: {
-        documents: 0,
-        recipients: 0,
-        directTemplates: 0,
-      },
+      quota: PAID_PLAN_LIMITS,
+      remaining: PAID_PLAN_LIMITS,
+    };
+  }
+
+  // If plan expired.
+  if (subscription && subscription.status !== SubscriptionStatus.ACTIVE) {
+    return {
+      quota: INACTIVE_PLAN_LIMITS,
+      remaining: INACTIVE_PLAN_LIMITS,
+    };
+  }
+
+  if (subscription && organisation.organisationClaim.flags.unlimitedDocuments) {
+    return {
+      quota: PAID_PLAN_LIMITS,
+      remaining: PAID_PLAN_LIMITS,
+    };
+  }
+
+  // If free tier or plan does not have unlimited documents.
+  if (!subscription || !organisation.organisationClaim.flags.unlimitedDocuments) {
+    const [documents, directTemplates] = await Promise.all([
+      prisma.document.count({
+        where: {
+          team: {
+            organisationId: organisation.id,
+          },
+          createdAt: {
+            gte: DateTime.utc().startOf('month').toJSDate(),
+          },
+          source: {
+            not: DocumentSource.TEMPLATE_DIRECT_LINK,
+          },
+        },
+      }),
+      prisma.template.count({
+        where: {
+          team: {
+            organisationId: organisation.id,
+          },
+          directLink: {
+            isNot: null,
+          },
+        },
+      }),
+    ]);
+
+    remaining.documents = Math.max(remaining.documents - documents, 0);
+    remaining.directTemplates = Math.max(remaining.directTemplates - directTemplates, 0);
+
+    return {
+      quota,
+      remaining,
     };
   }
 
   return {
-    quota: structuredClone(TEAM_PLAN_LIMITS),
-    remaining: structuredClone(TEAM_PLAN_LIMITS),
+    quota: PAID_PLAN_LIMITS,
+    remaining: PAID_PLAN_LIMITS,
   };
 };
diff --git a/packages/ee/server-only/stripe/get-checkout-session.ts b/packages/ee/server-only/stripe/create-checkout-session.ts
similarity index 65%
rename from packages/ee/server-only/stripe/get-checkout-session.ts
rename to packages/ee/server-only/stripe/create-checkout-session.ts
index 5633b642d..1af679b4e 100644
--- a/packages/ee/server-only/stripe/get-checkout-session.ts
+++ b/packages/ee/server-only/stripe/create-checkout-session.ts
@@ -1,20 +1,21 @@
 import type Stripe from 'stripe';
 
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { stripe } from '@documenso/lib/server-only/stripe';
 
-export type GetCheckoutSessionOptions = {
+export type CreateCheckoutSessionOptions = {
   customerId: string;
   priceId: string;
   returnUrl: string;
   subscriptionMetadata?: Stripe.Metadata;
 };
 
-export const getCheckoutSession = async ({
+export const createCheckoutSession = async ({
   customerId,
   priceId,
   returnUrl,
   subscriptionMetadata,
-}: GetCheckoutSessionOptions) => {
+}: CreateCheckoutSessionOptions) => {
   const session = await stripe.checkout.sessions.create({
     customer: customerId,
     mode: 'subscription',
@@ -31,5 +32,11 @@ export const getCheckoutSession = async ({
     },
   });
 
+  if (!session.url) {
+    throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+      message: 'Failed to create checkout session',
+    });
+  }
+
   return session.url;
 };
diff --git a/packages/ee/server-only/stripe/create-customer.ts b/packages/ee/server-only/stripe/create-customer.ts
new file mode 100644
index 000000000..713796793
--- /dev/null
+++ b/packages/ee/server-only/stripe/create-customer.ts
@@ -0,0 +1,13 @@
+import { stripe } from '@documenso/lib/server-only/stripe';
+
+type CreateCustomerOptions = {
+  name: string;
+  email: string;
+};
+
+export const createCustomer = async ({ name, email }: CreateCustomerOptions) => {
+  return await stripe.customers.create({
+    name,
+    email,
+  });
+};
diff --git a/packages/ee/server-only/stripe/create-team-customer.ts b/packages/ee/server-only/stripe/create-team-customer.ts
deleted file mode 100644
index 591c445af..000000000
--- a/packages/ee/server-only/stripe/create-team-customer.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { STRIPE_CUSTOMER_TYPE } from '@documenso/lib/constants/billing';
-import { stripe } from '@documenso/lib/server-only/stripe';
-
-type CreateTeamCustomerOptions = {
-  name: string;
-  email: string;
-};
-
-/**
- * Create a Stripe customer for a given team.
- */
-export const createTeamCustomer = async ({ name, email }: CreateTeamCustomerOptions) => {
-  return await stripe.customers.create({
-    name,
-    email,
-    metadata: {
-      type: STRIPE_CUSTOMER_TYPE.TEAM,
-    },
-  });
-};
diff --git a/packages/ee/server-only/stripe/delete-customer-payment-methods.ts b/packages/ee/server-only/stripe/delete-customer-payment-methods.ts
deleted file mode 100644
index 749c15763..000000000
--- a/packages/ee/server-only/stripe/delete-customer-payment-methods.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { stripe } from '@documenso/lib/server-only/stripe';
-
-type DeleteCustomerPaymentMethodsOptions = {
-  customerId: string;
-};
-
-/**
- * Delete all attached payment methods for a given customer.
- */
-export const deleteCustomerPaymentMethods = async ({
-  customerId,
-}: DeleteCustomerPaymentMethodsOptions) => {
-  const paymentMethods = await stripe.paymentMethods.list({
-    customer: customerId,
-  });
-
-  await Promise.all(
-    paymentMethods.data.map(async (paymentMethod) =>
-      stripe.paymentMethods.detach(paymentMethod.id),
-    ),
-  );
-};
diff --git a/packages/ee/server-only/stripe/get-community-plan-prices.ts b/packages/ee/server-only/stripe/get-community-plan-prices.ts
deleted file mode 100644
index 86c7f61bd..000000000
--- a/packages/ee/server-only/stripe/get-community-plan-prices.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing';
-
-import { getPricesByPlan } from './get-prices-by-plan';
-
-export const getCommunityPlanPrices = async () => {
-  return await getPricesByPlan(STRIPE_PLAN_TYPE.COMMUNITY);
-};
-
-export const getCommunityPlanPriceIds = async () => {
-  const prices = await getCommunityPlanPrices();
-
-  return prices.map((price) => price.id);
-};
diff --git a/packages/ee/server-only/stripe/get-customer.ts b/packages/ee/server-only/stripe/get-customer.ts
index a8939b6a6..30739fe8c 100644
--- a/packages/ee/server-only/stripe/get-customer.ts
+++ b/packages/ee/server-only/stripe/get-customer.ts
@@ -1,21 +1,4 @@
-import type { User } from '@prisma/client';
-
-import { STRIPE_CUSTOMER_TYPE } from '@documenso/lib/constants/billing';
 import { stripe } from '@documenso/lib/server-only/stripe';
-import { prisma } from '@documenso/prisma';
-
-import { onSubscriptionUpdated } from './webhook/on-subscription-updated';
-
-/**
- * Get a non team Stripe customer by email.
- */
-export const getStripeCustomerByEmail = async (email: string) => {
-  const foundStripeCustomers = await stripe.customers.list({
-    email,
-  });
-
-  return foundStripeCustomers.data.find((customer) => customer.metadata.type !== 'team') ?? null;
-};
 
 export const getStripeCustomerById = async (stripeCustomerId: string) => {
   try {
@@ -26,85 +9,3 @@ export const getStripeCustomerById = async (stripeCustomerId: string) => {
     return null;
   }
 };
-
-/**
- * Get a stripe customer by user.
- *
- * Will create a Stripe customer and update the relevant user if one does not exist.
- */
-export const getStripeCustomerByUser = async (
-  user: Pick<User, 'id' | 'customerId' | 'email' | 'name'>,
-) => {
-  if (user.customerId) {
-    const stripeCustomer = await getStripeCustomerById(user.customerId);
-
-    if (!stripeCustomer) {
-      throw new Error('Missing Stripe customer');
-    }
-
-    return {
-      user,
-      stripeCustomer,
-    };
-  }
-
-  let stripeCustomer = await getStripeCustomerByEmail(user.email);
-
-  const isSyncRequired = Boolean(stripeCustomer && !stripeCustomer.deleted);
-
-  if (!stripeCustomer) {
-    stripeCustomer = await stripe.customers.create({
-      name: user.name ?? undefined,
-      email: user.email,
-      metadata: {
-        userId: user.id,
-        type: STRIPE_CUSTOMER_TYPE.INDIVIDUAL,
-      },
-    });
-  }
-
-  const updatedUser = await prisma.user.update({
-    where: {
-      id: user.id,
-    },
-    data: {
-      customerId: stripeCustomer.id,
-    },
-  });
-
-  // Sync subscriptions if the customer already exists for back filling the DB
-  // and local development.
-  if (isSyncRequired) {
-    await syncStripeCustomerSubscriptions(user.id, stripeCustomer.id).catch((e) => {
-      console.error(e);
-    });
-  }
-
-  return {
-    user: updatedUser,
-    stripeCustomer,
-  };
-};
-
-export const getStripeCustomerIdByUser = async (user: User) => {
-  if (user.customerId !== null) {
-    return user.customerId;
-  }
-
-  return await getStripeCustomerByUser(user).then((session) => session.stripeCustomer.id);
-};
-
-const syncStripeCustomerSubscriptions = async (userId: number, stripeCustomerId: string) => {
-  const stripeSubscriptions = await stripe.subscriptions.list({
-    customer: stripeCustomerId,
-  });
-
-  await Promise.all(
-    stripeSubscriptions.data.map(async (subscription) =>
-      onSubscriptionUpdated({
-        userId,
-        subscription,
-      }),
-    ),
-  );
-};
diff --git a/packages/ee/server-only/stripe/get-document-related-prices.ts.ts b/packages/ee/server-only/stripe/get-document-related-prices.ts.ts
deleted file mode 100644
index 682086734..000000000
--- a/packages/ee/server-only/stripe/get-document-related-prices.ts.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing';
-
-import { getPricesByPlan } from './get-prices-by-plan';
-
-/**
- * Returns the Stripe prices of items that affect the amount of documents a user can create.
- */
-export const getDocumentRelatedPrices = async () => {
-  return await getPricesByPlan([
-    STRIPE_PLAN_TYPE.REGULAR,
-    STRIPE_PLAN_TYPE.COMMUNITY,
-    STRIPE_PLAN_TYPE.PLATFORM,
-    STRIPE_PLAN_TYPE.ENTERPRISE,
-  ]);
-};
diff --git a/packages/ee/server-only/stripe/get-enterprise-plan-prices.ts b/packages/ee/server-only/stripe/get-enterprise-plan-prices.ts
deleted file mode 100644
index ec67fe163..000000000
--- a/packages/ee/server-only/stripe/get-enterprise-plan-prices.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing';
-
-import { getPricesByPlan } from './get-prices-by-plan';
-
-export const getEnterprisePlanPrices = async () => {
-  return await getPricesByPlan(STRIPE_PLAN_TYPE.ENTERPRISE);
-};
-
-export const getEnterprisePlanPriceIds = async () => {
-  const prices = await getEnterprisePlanPrices();
-
-  return prices.map((price) => price.id);
-};
diff --git a/packages/ee/server-only/stripe/get-internal-claim-plans.ts b/packages/ee/server-only/stripe/get-internal-claim-plans.ts
new file mode 100644
index 000000000..c3e4f626d
--- /dev/null
+++ b/packages/ee/server-only/stripe/get-internal-claim-plans.ts
@@ -0,0 +1,84 @@
+import { clone } from 'remeda';
+import type Stripe from 'stripe';
+
+import { stripe } from '@documenso/lib/server-only/stripe';
+import {
+  INTERNAL_CLAIM_ID,
+  type InternalClaim,
+  internalClaims,
+} from '@documenso/lib/types/subscription';
+import { toHumanPrice } from '@documenso/lib/universal/stripe/to-human-price';
+
+export type InternalClaimPlans = {
+  [key in INTERNAL_CLAIM_ID]: InternalClaim & {
+    monthlyPrice?: Stripe.Price & {
+      product: Stripe.Product;
+      isVisibleInApp: boolean;
+      friendlyPrice: string;
+    };
+    yearlyPrice?: Stripe.Price & {
+      product: Stripe.Product;
+      isVisibleInApp: boolean;
+      friendlyPrice: string;
+    };
+  };
+};
+
+/**
+ * Returns the main Documenso plans from Stripe.
+ */
+export const getInternalClaimPlans = async (): Promise<InternalClaimPlans> => {
+  const { data: prices } = await stripe.prices.search({
+    query: `active:'true' type:'recurring'`,
+    expand: ['data.product'],
+    limit: 100,
+  });
+
+  const plans: InternalClaimPlans = clone(internalClaims);
+
+  prices.forEach((price) => {
+    // We use `expand` to get the product, but it's not typed as part of the Price type.
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    const product = price.product as Stripe.Product;
+
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    const productClaimId = product.metadata.claimId as INTERNAL_CLAIM_ID | undefined;
+    const isVisibleInApp = price.metadata.visibleInApp === 'true';
+
+    if (!productClaimId || !Object.values(INTERNAL_CLAIM_ID).includes(productClaimId)) {
+      return;
+    }
+
+    let usdPrice = toHumanPrice(price.unit_amount ?? 0);
+
+    if (price.recurring?.interval === 'month') {
+      if (product.metadata['isSeatBased'] === 'true') {
+        usdPrice = '50';
+      }
+
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      plans[productClaimId].monthlyPrice = {
+        ...price,
+        isVisibleInApp,
+        product,
+        friendlyPrice: `$${usdPrice} ${price.currency.toUpperCase()}`.replace('.00', ''),
+      };
+    }
+
+    if (price.recurring?.interval === 'year') {
+      if (product.metadata['isSeatBased'] === 'true') {
+        usdPrice = '480';
+      }
+
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      plans[productClaimId].yearlyPrice = {
+        ...price,
+        isVisibleInApp,
+        product,
+        friendlyPrice: `$${usdPrice} ${price.currency.toUpperCase()}`.replace('.00', ''),
+      };
+    }
+  });
+
+  return plans;
+};
diff --git a/packages/ee/server-only/stripe/get-platform-plan-prices.ts b/packages/ee/server-only/stripe/get-platform-plan-prices.ts
deleted file mode 100644
index 7a55caa07..000000000
--- a/packages/ee/server-only/stripe/get-platform-plan-prices.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing';
-
-import { getPricesByPlan } from './get-prices-by-plan';
-
-export const getPlatformPlanPrices = async () => {
-  return await getPricesByPlan(STRIPE_PLAN_TYPE.PLATFORM);
-};
-
-export const getPlatformPlanPriceIds = async () => {
-  const prices = await getPlatformPlanPrices();
-
-  return prices.map((price) => price.id);
-};
diff --git a/packages/ee/server-only/stripe/get-prices-by-interval.ts b/packages/ee/server-only/stripe/get-prices-by-interval.ts
deleted file mode 100644
index 41bf88248..000000000
--- a/packages/ee/server-only/stripe/get-prices-by-interval.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import type Stripe from 'stripe';
-
-import type { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing';
-import { stripe } from '@documenso/lib/server-only/stripe';
-
-// Utility type to handle usage of the `expand` option.
-type PriceWithProduct = Stripe.Price & { product: Stripe.Product };
-
-export type PriceIntervals = Record<Stripe.Price.Recurring.Interval, PriceWithProduct[]>;
-
-export type GetPricesByIntervalOptions = {
-  /**
-   * Filter products by their meta 'plan' attribute.
-   */
-  plans?: STRIPE_PLAN_TYPE[];
-};
-
-export const getPricesByInterval = async ({ plans }: GetPricesByIntervalOptions = {}) => {
-  let { data: prices } = await stripe.prices.search({
-    query: `active:'true' type:'recurring'`,
-    expand: ['data.product'],
-    limit: 100,
-  });
-
-  prices = prices.filter((price) => {
-    // We use `expand` to get the product, but it's not typed as part of the Price type.
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const product = price.product as Stripe.Product;
-
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const filter = !plans || plans.includes(product.metadata?.plan as STRIPE_PLAN_TYPE);
-
-    // Filter out prices for products that are not active.
-    return product.active && filter;
-  });
-
-  const intervals: PriceIntervals = {
-    day: [],
-    week: [],
-    month: [],
-    year: [],
-  };
-
-  // Add each price to the correct interval.
-  for (const price of prices) {
-    if (price.recurring?.interval) {
-      // We use `expand` to get the product, but it's not typed as part of the Price type.
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      intervals[price.recurring.interval].push(price as PriceWithProduct);
-    }
-  }
-
-  // Order all prices by unit_amount.
-  intervals.day.sort((a, b) => Number(a.unit_amount) - Number(b.unit_amount));
-  intervals.week.sort((a, b) => Number(a.unit_amount) - Number(b.unit_amount));
-  intervals.month.sort((a, b) => Number(a.unit_amount) - Number(b.unit_amount));
-  intervals.year.sort((a, b) => Number(a.unit_amount) - Number(b.unit_amount));
-
-  return intervals;
-};
diff --git a/packages/ee/server-only/stripe/get-prices-by-plan.ts b/packages/ee/server-only/stripe/get-prices-by-plan.ts
deleted file mode 100644
index 52c9d1e5e..000000000
--- a/packages/ee/server-only/stripe/get-prices-by-plan.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing';
-import { stripe } from '@documenso/lib/server-only/stripe';
-
-type PlanType = (typeof STRIPE_PLAN_TYPE)[keyof typeof STRIPE_PLAN_TYPE];
-
-export const getPricesByPlan = async (plan: PlanType | PlanType[]) => {
-  const planTypes: string[] = typeof plan === 'string' ? [plan] : plan;
-
-  const prices = await stripe.prices.list({
-    expand: ['data.product'],
-    limit: 100,
-  });
-
-  return prices.data.filter(
-    (price) => price.type === 'recurring' && planTypes.includes(price.metadata.plan),
-  );
-};
diff --git a/packages/ee/server-only/stripe/get-primary-account-plan-prices.ts b/packages/ee/server-only/stripe/get-primary-account-plan-prices.ts
deleted file mode 100644
index 166f5c8ef..000000000
--- a/packages/ee/server-only/stripe/get-primary-account-plan-prices.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing';
-
-import { getPricesByPlan } from './get-prices-by-plan';
-
-/**
- * Returns the prices of items that count as the account's primary plan.
- */
-export const getPrimaryAccountPlanPrices = async () => {
-  return await getPricesByPlan([
-    STRIPE_PLAN_TYPE.REGULAR,
-    STRIPE_PLAN_TYPE.COMMUNITY,
-    STRIPE_PLAN_TYPE.PLATFORM,
-    STRIPE_PLAN_TYPE.ENTERPRISE,
-  ]);
-};
diff --git a/packages/ee/server-only/stripe/get-product-by-price-id.ts b/packages/ee/server-only/stripe/get-product-by-price-id.ts
deleted file mode 100644
index 621c918f2..000000000
--- a/packages/ee/server-only/stripe/get-product-by-price-id.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { stripe } from '@documenso/lib/server-only/stripe';
-
-export type GetProductByPriceIdOptions = {
-  priceId: string;
-};
-
-export const getProductByPriceId = async ({ priceId }: GetProductByPriceIdOptions) => {
-  const { product } = await stripe.prices.retrieve(priceId, {
-    expand: ['product'],
-  });
-
-  if (typeof product === 'string' || 'deleted' in product) {
-    throw new Error('Product not found');
-  }
-
-  return product;
-};
diff --git a/packages/ee/server-only/stripe/get-subscription.ts b/packages/ee/server-only/stripe/get-subscription.ts
new file mode 100644
index 000000000..744f263a7
--- /dev/null
+++ b/packages/ee/server-only/stripe/get-subscription.ts
@@ -0,0 +1,42 @@
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { stripe } from '@documenso/lib/server-only/stripe';
+import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+export type GetSubscriptionOptions = {
+  userId: number;
+  organisationId: string;
+};
+
+export const getSubscription = async ({ organisationId, userId }: GetSubscriptionOptions) => {
+  const organisation = await prisma.organisation.findFirst({
+    where: buildOrganisationWhereQuery({
+      organisationId,
+      userId,
+      roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+    }),
+    include: {
+      subscription: true,
+    },
+  });
+
+  if (!organisation) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Organisation not found',
+    });
+  }
+
+  if (!organisation.subscription) {
+    return null;
+  }
+
+  const stripeSubscription = await stripe.subscriptions.retrieve(organisation.subscription.planId, {
+    expand: ['items.data.price.product'],
+  });
+
+  return {
+    organisationSubscription: organisation.subscription,
+    stripeSubscription,
+  };
+};
diff --git a/packages/ee/server-only/stripe/get-team-prices.ts b/packages/ee/server-only/stripe/get-team-prices.ts
deleted file mode 100644
index 03fc65b5f..000000000
--- a/packages/ee/server-only/stripe/get-team-prices.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import type Stripe from 'stripe';
-
-import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing';
-import { AppError } from '@documenso/lib/errors/app-error';
-
-import { getPricesByPlan } from './get-prices-by-plan';
-
-export const getTeamPrices = async () => {
-  const prices = (await getPricesByPlan(STRIPE_PLAN_TYPE.TEAM)).filter((price) => price.active);
-
-  const monthlyPrice = prices.find((price) => price.recurring?.interval === 'month');
-  const yearlyPrice = prices.find((price) => price.recurring?.interval === 'year');
-  const priceIds = prices.map((price) => price.id);
-
-  if (!monthlyPrice || !yearlyPrice) {
-    throw new AppError('INVALID_CONFIG', {
-      message: 'Missing monthly or yearly price',
-    });
-  }
-
-  return {
-    monthly: {
-      friendlyInterval: 'Monthly',
-      interval: 'monthly',
-      ...extractPriceData(monthlyPrice),
-    },
-    yearly: {
-      friendlyInterval: 'Yearly',
-      interval: 'yearly',
-      ...extractPriceData(yearlyPrice),
-    },
-    priceIds,
-  } as const;
-};
-
-const extractPriceData = (price: Stripe.Price) => {
-  const product =
-    typeof price.product !== 'string' && !price.product.deleted ? price.product : null;
-
-  return {
-    priceId: price.id,
-    description: product?.description ?? '',
-    features: product?.features ?? [],
-  };
-};
diff --git a/packages/ee/server-only/stripe/get-team-related-prices.ts b/packages/ee/server-only/stripe/get-team-related-prices.ts
deleted file mode 100644
index debbac6ea..000000000
--- a/packages/ee/server-only/stripe/get-team-related-prices.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing';
-
-import { getPricesByPlan } from './get-prices-by-plan';
-
-/**
- * Returns the Stripe prices of items that affect the amount of teams a user can create.
- */
-export const getTeamRelatedPrices = async () => {
-  return await getPricesByPlan([
-    STRIPE_PLAN_TYPE.COMMUNITY,
-    STRIPE_PLAN_TYPE.PLATFORM,
-    STRIPE_PLAN_TYPE.ENTERPRISE,
-  ]);
-};
-
-/**
- * Returns the Stripe price IDs of items that affect the amount of teams a user can create.
- */
-export const getTeamRelatedPriceIds = async () => {
-  return await getTeamRelatedPrices().then((prices) => prices.map((price) => price.id));
-};
diff --git a/packages/ee/server-only/stripe/is-price-seats-based.ts b/packages/ee/server-only/stripe/is-price-seats-based.ts
new file mode 100644
index 000000000..422b35f38
--- /dev/null
+++ b/packages/ee/server-only/stripe/is-price-seats-based.ts
@@ -0,0 +1,13 @@
+import type { Stripe } from '@documenso/lib/server-only/stripe';
+import { stripe } from '@documenso/lib/server-only/stripe';
+
+export const isPriceSeatsBased = async (priceId: string) => {
+  const foundStripePrice = await stripe.prices.retrieve(priceId, {
+    expand: ['product'],
+  });
+
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  const product = foundStripePrice.product as Stripe.Product;
+
+  return product.metadata.isSeatBased === 'true';
+};
diff --git a/packages/ee/server-only/stripe/transfer-team-subscription.ts b/packages/ee/server-only/stripe/transfer-team-subscription.ts
deleted file mode 100644
index 1917c8180..000000000
--- a/packages/ee/server-only/stripe/transfer-team-subscription.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import { type Subscription, type Team, type User } from '@prisma/client';
-import type Stripe from 'stripe';
-
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { stripe } from '@documenso/lib/server-only/stripe';
-import { subscriptionsContainsActivePlan } from '@documenso/lib/utils/billing';
-import { prisma } from '@documenso/prisma';
-
-import { deleteCustomerPaymentMethods } from './delete-customer-payment-methods';
-import { getTeamPrices } from './get-team-prices';
-import { getTeamRelatedPriceIds } from './get-team-related-prices';
-
-type TransferStripeSubscriptionOptions = {
-  /**
-   * The user to transfer the subscription to.
-   */
-  user: User & { subscriptions: Subscription[] };
-
-  /**
-   * The team the subscription is associated with.
-   */
-  team: Team & { subscription?: Subscription | null };
-
-  /**
-   * Whether to clear any current payment methods attached to the team.
-   */
-  clearPaymentMethods: boolean;
-};
-
-/**
- * Transfer the Stripe Team seats subscription from one user to another.
- *
- * Will create a new subscription for the new owner and cancel the old one.
- *
- * Returns the subscription that should be associated with the team, null if
- * no subscription is needed (for early adopter plan).
- */
-export const transferTeamSubscription = async ({
-  user,
-  team,
-  clearPaymentMethods,
-}: TransferStripeSubscriptionOptions) => {
-  const teamCustomerId = team.customerId;
-
-  if (!teamCustomerId) {
-    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'Missing customer ID.',
-    });
-  }
-
-  const [teamRelatedPlanPriceIds, teamSeatPrices] = await Promise.all([
-    getTeamRelatedPriceIds(),
-    getTeamPrices(),
-  ]);
-
-  const teamSubscriptionRequired = !subscriptionsContainsActivePlan(
-    user.subscriptions,
-    teamRelatedPlanPriceIds,
-  );
-
-  let teamSubscription: Stripe.Subscription | null = null;
-
-  if (team.subscription) {
-    teamSubscription = await stripe.subscriptions.retrieve(team.subscription.planId);
-
-    if (!teamSubscription) {
-      throw new Error('Could not find the current subscription.');
-    }
-
-    if (clearPaymentMethods) {
-      await deleteCustomerPaymentMethods({ customerId: teamCustomerId });
-    }
-  }
-
-  await stripe.customers.update(teamCustomerId, {
-    name: user.name ?? team.name,
-    email: user.email,
-  });
-
-  // If team subscription is required and the team does not have a subscription, create one.
-  if (teamSubscriptionRequired && !teamSubscription) {
-    const numberOfSeats = await prisma.teamMember.count({
-      where: {
-        teamId: team.id,
-      },
-    });
-
-    const teamSeatPriceId = teamSeatPrices.monthly.priceId;
-
-    teamSubscription = await stripe.subscriptions.create({
-      customer: teamCustomerId,
-      items: [
-        {
-          price: teamSeatPriceId,
-          quantity: numberOfSeats,
-        },
-      ],
-      metadata: {
-        teamId: team.id.toString(),
-      },
-    });
-  }
-
-  // If no team subscription is required, cancel the current team subscription if it exists.
-  if (!teamSubscriptionRequired && teamSubscription) {
-    try {
-      // Set the quantity to 0 so we can refund/charge the old Stripe customer the prorated amount.
-      await stripe.subscriptions.update(teamSubscription.id, {
-        items: teamSubscription.items.data.map((item) => ({
-          id: item.id,
-          quantity: 0,
-        })),
-      });
-
-      await stripe.subscriptions.cancel(teamSubscription.id, {
-        invoice_now: true,
-        prorate: false,
-      });
-    } catch (e) {
-      // Do not error out since we can't easily undo the transfer.
-      // Todo: Teams - Alert us.
-    }
-
-    return null;
-  }
-
-  return teamSubscription;
-};
diff --git a/packages/ee/server-only/stripe/update-subscription-item-quantity.ts b/packages/ee/server-only/stripe/update-subscription-item-quantity.ts
index e0fa95f3d..a089c8ce6 100644
--- a/packages/ee/server-only/stripe/update-subscription-item-quantity.ts
+++ b/packages/ee/server-only/stripe/update-subscription-item-quantity.ts
@@ -1,6 +1,12 @@
+import type { OrganisationClaim, Subscription } from '@prisma/client';
 import type Stripe from 'stripe';
 
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { stripe } from '@documenso/lib/server-only/stripe';
+import { appLog } from '@documenso/lib/utils/debugger';
+import { prisma } from '@documenso/prisma';
+
+import { isPriceSeatsBased } from './is-price-seats-based';
 
 export type UpdateSubscriptionItemQuantityOptions = {
   subscriptionId: string;
@@ -42,3 +48,57 @@ export const updateSubscriptionItemQuantity = async ({
 
   await stripe.subscriptions.update(subscriptionId, subscriptionUpdatePayload);
 };
+
+/**
+ * Checks whether the member count should be synced with a given Stripe subscription.
+ *
+ * If the subscription is not "seat" based, it will be ignored.
+ *
+ * @param subscription - The subscription to sync the member count with.
+ * @param organisationClaim - The organisation claim
+ * @param quantity - The amount to sync the Stripe item with
+ * @returns
+ */
+export const syncMemberCountWithStripeSeatPlan = async (
+  subscription: Subscription,
+  organisationClaim: OrganisationClaim,
+  quantity: number,
+) => {
+  const maximumMemberCount = organisationClaim.memberCount;
+
+  // Infinite seats means no sync needed.
+  if (maximumMemberCount === 0) {
+    return;
+  }
+
+  const syncMemberCountWithStripe = await isPriceSeatsBased(subscription.priceId);
+
+  // Throw error if quantity exceeds maximum member count and the subscription is not seats based.
+  if (quantity > maximumMemberCount && !syncMemberCountWithStripe) {
+    throw new AppError(AppErrorCode.LIMIT_EXCEEDED, {
+      message: 'Maximum member count reached',
+    });
+  }
+
+  // Bill the user with the new quantity.
+  if (syncMemberCountWithStripe) {
+    appLog('BILLING', 'Updating seat based plan');
+
+    await updateSubscriptionItemQuantity({
+      priceId: subscription.priceId,
+      subscriptionId: subscription.planId,
+      quantity,
+    });
+
+    // This should be automatically updated after the Stripe webhook is fired
+    // but we just manually adjust it here as well to avoid any race conditions.
+    await prisma.organisationClaim.update({
+      where: {
+        id: organisationClaim.id,
+      },
+      data: {
+        memberCount: quantity,
+      },
+    });
+  }
+};
diff --git a/packages/ee/server-only/stripe/webhook/handler.ts b/packages/ee/server-only/stripe/webhook/handler.ts
index ce6e5b936..6ce377e02 100644
--- a/packages/ee/server-only/stripe/webhook/handler.ts
+++ b/packages/ee/server-only/stripe/webhook/handler.ts
@@ -1,13 +1,11 @@
 import { match } from 'ts-pattern';
 
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
-import { STRIPE_PLAN_TYPE } from '@documenso/lib/constants/billing';
 import type { Stripe } from '@documenso/lib/server-only/stripe';
 import { stripe } from '@documenso/lib/server-only/stripe';
-import { createTeamFromPendingTeam } from '@documenso/lib/server-only/team/create-team';
 import { env } from '@documenso/lib/utils/env';
-import { prisma } from '@documenso/prisma';
 
+import { onSubscriptionCreated } from './on-subscription-created';
 import { onSubscriptionDeleted } from './on-subscription-deleted';
 import { onSubscriptionUpdated } from './on-subscription-updated';
 
@@ -65,78 +63,18 @@ export const stripeWebhookHandler = async (req: Request): Promise<Response> => {
 
     const event = stripe.webhooks.constructEvent(payload, signature, webhookSecret);
 
+    /**
+     * Notes:
+     * - Dropped invoice.payment_succeeded
+     * - Dropped invoice.payment_failed
+     * - Dropped checkout-session.completed
+     */
     return await match(event.type)
-      .with('checkout.session.completed', async () => {
+      .with('customer.subscription.created', async () => {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const session = event.data.object as Stripe.Checkout.Session;
+        const subscription = event.data.object as Stripe.Subscription;
 
-        const customerId =
-          typeof session.customer === 'string' ? session.customer : session.customer?.id;
-
-        // Attempt to get the user ID from the client reference id.
-        let userId = Number(session.client_reference_id);
-
-        // If the user ID is not found, attempt to get it from the Stripe customer metadata.
-        if (!userId && customerId) {
-          const customer = await stripe.customers.retrieve(customerId);
-
-          if (!customer.deleted) {
-            userId = Number(customer.metadata.userId);
-          }
-        }
-
-        // Finally, attempt to get the user ID from the subscription within the database.
-        if (!userId && customerId) {
-          const result = await prisma.user.findFirst({
-            select: {
-              id: true,
-            },
-            where: {
-              customerId,
-            },
-          });
-
-          if (result?.id) {
-            userId = result.id;
-          }
-        }
-
-        const subscriptionId =
-          typeof session.subscription === 'string'
-            ? session.subscription
-            : session.subscription?.id;
-
-        if (!subscriptionId) {
-          return Response.json(
-            { success: false, message: 'Invalid session' } satisfies StripeWebhookResponse,
-            { status: 500 },
-          );
-        }
-
-        const subscription = await stripe.subscriptions.retrieve(subscriptionId);
-
-        // Handle team creation after seat checkout.
-        if (subscription.items.data[0].price.metadata.plan === STRIPE_PLAN_TYPE.TEAM) {
-          await handleTeamSeatCheckout({ subscription });
-
-          return Response.json(
-            { success: true, message: 'Webhook received' } satisfies StripeWebhookResponse,
-            { status: 200 },
-          );
-        }
-
-        // Validate user ID.
-        if (!userId || Number.isNaN(userId)) {
-          return Response.json(
-            {
-              success: false,
-              message: 'Invalid session or missing user ID',
-            } satisfies StripeWebhookResponse,
-            { status: 500 },
-          );
-        }
-
-        await onSubscriptionUpdated({ userId, subscription });
+        await onSubscriptionCreated({ subscription });
 
         return Response.json(
           { success: true, message: 'Webhook received' } satisfies StripeWebhookResponse,
@@ -147,254 +85,14 @@ export const stripeWebhookHandler = async (req: Request): Promise<Response> => {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         const subscription = event.data.object as Stripe.Subscription;
 
-        const customerId =
-          typeof subscription.customer === 'string'
-            ? subscription.customer
-            : subscription.customer.id;
-
-        if (subscription.items.data[0].price.metadata.plan === STRIPE_PLAN_TYPE.TEAM) {
-          const team = await prisma.team.findFirst({
-            where: {
-              customerId,
-            },
-          });
-
-          if (!team) {
-            return Response.json(
-              {
-                success: false,
-                message: 'No team associated with subscription found',
-              } satisfies StripeWebhookResponse,
-              { status: 500 },
-            );
-          }
-
-          await onSubscriptionUpdated({ teamId: team.id, subscription });
-
-          return Response.json(
-            { success: true, message: 'Webhook received' } satisfies StripeWebhookResponse,
-            { status: 200 },
-          );
-        }
-
-        const result = await prisma.user.findFirst({
-          select: {
-            id: true,
-          },
-          where: {
-            customerId,
-          },
-        });
-
-        if (!result?.id) {
-          return Response.json(
-            {
-              success: false,
-              message: 'User not found',
-            } satisfies StripeWebhookResponse,
-            { status: 500 },
-          );
-        }
-
-        await onSubscriptionUpdated({ userId: result.id, subscription });
-
-        return Response.json(
-          {
-            success: true,
-            message: 'Webhook received',
-          } satisfies StripeWebhookResponse,
-          { status: 200 },
-        );
-      })
-      .with('invoice.payment_succeeded', async () => {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const invoice = event.data.object as Stripe.Invoice;
+        const previousAttributes = event.data
+          .previous_attributes as Partial<Stripe.Subscription> | null;
 
-        if (invoice.billing_reason !== 'subscription_cycle') {
-          return Response.json(
-            {
-              success: true,
-              message: 'Webhook received',
-            } satisfies StripeWebhookResponse,
-            { status: 200 },
-          );
-        }
-
-        const customerId =
-          typeof invoice.customer === 'string' ? invoice.customer : invoice.customer?.id;
-
-        const subscriptionId =
-          typeof invoice.subscription === 'string'
-            ? invoice.subscription
-            : invoice.subscription?.id;
-
-        if (!customerId || !subscriptionId) {
-          return Response.json(
-            {
-              success: false,
-              message: 'Invalid invoice',
-            } satisfies StripeWebhookResponse,
-            { status: 500 },
-          );
-        }
-
-        const subscription = await stripe.subscriptions.retrieve(subscriptionId);
-
-        if (subscription.status === 'incomplete_expired') {
-          return Response.json(
-            {
-              success: true,
-              message: 'Webhook received',
-            } satisfies StripeWebhookResponse,
-            { status: 200 },
-          );
-        }
-
-        if (subscription.items.data[0].price.metadata.plan === STRIPE_PLAN_TYPE.TEAM) {
-          const team = await prisma.team.findFirst({
-            where: {
-              customerId,
-            },
-          });
-
-          if (!team) {
-            return Response.json(
-              {
-                success: false,
-                message: 'No team associated with subscription found',
-              } satisfies StripeWebhookResponse,
-              { status: 500 },
-            );
-          }
-
-          await onSubscriptionUpdated({ teamId: team.id, subscription });
-
-          return Response.json(
-            {
-              success: true,
-              message: 'Webhook received',
-            } satisfies StripeWebhookResponse,
-            { status: 200 },
-          );
-        }
-
-        const result = await prisma.user.findFirst({
-          select: {
-            id: true,
-          },
-          where: {
-            customerId,
-          },
-        });
-
-        if (!result?.id) {
-          return Response.json(
-            {
-              success: false,
-              message: 'User not found',
-            } satisfies StripeWebhookResponse,
-            { status: 500 },
-          );
-        }
-
-        await onSubscriptionUpdated({ userId: result.id, subscription });
+        await onSubscriptionUpdated({ subscription, previousAttributes });
 
         return Response.json(
-          {
-            success: true,
-            message: 'Webhook received',
-          } satisfies StripeWebhookResponse,
-          { status: 200 },
-        );
-      })
-      .with('invoice.payment_failed', async () => {
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        const invoice = event.data.object as Stripe.Invoice;
-
-        const customerId =
-          typeof invoice.customer === 'string' ? invoice.customer : invoice.customer?.id;
-
-        const subscriptionId =
-          typeof invoice.subscription === 'string'
-            ? invoice.subscription
-            : invoice.subscription?.id;
-
-        if (!customerId || !subscriptionId) {
-          return Response.json(
-            {
-              success: false,
-              message: 'Invalid invoice',
-            } satisfies StripeWebhookResponse,
-            { status: 500 },
-          );
-        }
-
-        const subscription = await stripe.subscriptions.retrieve(subscriptionId);
-
-        if (subscription.status === 'incomplete_expired') {
-          return Response.json(
-            {
-              success: true,
-              message: 'Webhook received',
-            } satisfies StripeWebhookResponse,
-            { status: 200 },
-          );
-        }
-
-        if (subscription.items.data[0].price.metadata.plan === STRIPE_PLAN_TYPE.TEAM) {
-          const team = await prisma.team.findFirst({
-            where: {
-              customerId,
-            },
-          });
-
-          if (!team) {
-            return Response.json(
-              {
-                success: false,
-                message: 'No team associated with subscription found',
-              } satisfies StripeWebhookResponse,
-              { status: 500 },
-            );
-          }
-
-          await onSubscriptionUpdated({ teamId: team.id, subscription });
-
-          return Response.json(
-            {
-              success: true,
-              message: 'Webhook received',
-            } satisfies StripeWebhookResponse,
-            { status: 200 },
-          );
-        }
-
-        const result = await prisma.user.findFirst({
-          select: {
-            id: true,
-          },
-          where: {
-            customerId,
-          },
-        });
-
-        if (!result?.id) {
-          return Response.json(
-            {
-              success: false,
-              message: 'User not found',
-            } satisfies StripeWebhookResponse,
-            { status: 500 },
-          );
-        }
-
-        await onSubscriptionUpdated({ userId: result.id, subscription });
-
-        return Response.json(
-          {
-            success: true,
-            message: 'Webhook received',
-          } satisfies StripeWebhookResponse,
+          { success: true, message: 'Webhook received' } satisfies StripeWebhookResponse,
           { status: 200 },
         );
       })
@@ -424,6 +122,13 @@ export const stripeWebhookHandler = async (req: Request): Promise<Response> => {
   } catch (err) {
     console.error(err);
 
+    if (err instanceof Response) {
+      const message = await err.json();
+      console.error(message);
+
+      return err;
+    }
+
     return Response.json(
       {
         success: false,
@@ -433,21 +138,3 @@ export const stripeWebhookHandler = async (req: Request): Promise<Response> => {
     );
   }
 };
-
-export type HandleTeamSeatCheckoutOptions = {
-  subscription: Stripe.Subscription;
-};
-
-const handleTeamSeatCheckout = async ({ subscription }: HandleTeamSeatCheckoutOptions) => {
-  if (subscription.metadata?.pendingTeamId === undefined) {
-    throw new Error('Missing pending team ID');
-  }
-
-  const pendingTeamId = Number(subscription.metadata.pendingTeamId);
-
-  if (Number.isNaN(pendingTeamId)) {
-    throw new Error('Invalid pending team ID');
-  }
-
-  return await createTeamFromPendingTeam({ pendingTeamId, subscription }).then((team) => team.id);
-};
diff --git a/packages/ee/server-only/stripe/webhook/on-subscription-created.ts b/packages/ee/server-only/stripe/webhook/on-subscription-created.ts
new file mode 100644
index 000000000..21e659518
--- /dev/null
+++ b/packages/ee/server-only/stripe/webhook/on-subscription-created.ts
@@ -0,0 +1,214 @@
+import { OrganisationType, SubscriptionStatus } from '@prisma/client';
+import { match } from 'ts-pattern';
+
+import {
+  createOrganisation,
+  createOrganisationClaimUpsertData,
+} from '@documenso/lib/server-only/organisation/create-organisation';
+import { type Stripe } from '@documenso/lib/server-only/stripe';
+import type {
+  InternalClaim,
+  StripeOrganisationCreateMetadata,
+} from '@documenso/lib/types/subscription';
+import {
+  INTERNAL_CLAIM_ID,
+  ZStripeOrganisationCreateMetadataSchema,
+} from '@documenso/lib/types/subscription';
+import { prisma } from '@documenso/prisma';
+
+import { extractStripeClaim } from './on-subscription-updated';
+
+export type OnSubscriptionCreatedOptions = {
+  subscription: Stripe.Subscription;
+};
+
+type StripeWebhookResponse = {
+  success: boolean;
+  message: string;
+};
+
+/**
+ * Todo: We might want to pull this into a job so we can do steps. Since if organisation creation passes but
+ * fails after this would be automatically rerun by Stripe, which means duplicate organisations can be
+ * potentially created.
+ */
+export const onSubscriptionCreated = async ({ subscription }: OnSubscriptionCreatedOptions) => {
+  const customerId =
+    typeof subscription.customer === 'string' ? subscription.customer : subscription.customer.id;
+
+  // Todo: logging
+  if (subscription.items.data.length !== 1) {
+    console.error('No support for multiple items');
+
+    throw Response.json(
+      {
+        success: false,
+        message: 'No support for multiple items',
+      } satisfies StripeWebhookResponse,
+      { status: 500 },
+    );
+  }
+
+  const subscriptionItem = subscription.items.data[0];
+  const claim = await extractStripeClaim(subscriptionItem.price);
+
+  // Todo: logging
+  if (!claim) {
+    console.error(`Subscription claim on ${subscriptionItem.price.id} not found`);
+
+    throw Response.json(
+      {
+        success: false,
+        message: `Subscription claim on ${subscriptionItem.price.id} not found`,
+      } satisfies StripeWebhookResponse,
+      { status: 500 },
+    );
+  }
+
+  const organisationCreateData = subscription.metadata?.organisationCreateData;
+
+  // A new subscription can be for an existing organisation or a new one.
+  const organisationId = organisationCreateData
+    ? await handleOrganisationCreate({
+        customerId,
+        claim,
+        unknownCreateData: organisationCreateData,
+      })
+    : await handleOrganisationUpdate({
+        customerId,
+        claim,
+      });
+
+  const status = match(subscription.status)
+    .with('active', () => SubscriptionStatus.ACTIVE)
+    .with('past_due', () => SubscriptionStatus.PAST_DUE)
+    .otherwise(() => SubscriptionStatus.INACTIVE);
+
+  await prisma.subscription.create({
+    data: {
+      organisationId,
+      status,
+      customerId,
+      planId: subscription.id,
+      priceId: subscription.items.data[0].price.id,
+      periodEnd: new Date(subscription.current_period_end * 1000),
+      cancelAtPeriodEnd: subscription.cancel_at_period_end,
+    },
+  });
+};
+
+type HandleOrganisationCreateOptions = {
+  customerId: string;
+  claim: InternalClaim;
+  unknownCreateData: string;
+};
+
+/**
+ * Handles the creation of an organisation.
+ */
+const handleOrganisationCreate = async ({
+  customerId,
+  claim,
+  unknownCreateData,
+}: HandleOrganisationCreateOptions) => {
+  let organisationCreateFlowData: StripeOrganisationCreateMetadata | null = null;
+
+  const parseResult = ZStripeOrganisationCreateMetadataSchema.safeParse(
+    JSON.parse(unknownCreateData),
+  );
+
+  if (!parseResult.success) {
+    console.error('Invalid organisation create flow data');
+
+    throw Response.json(
+      {
+        success: false,
+        message: 'Invalid organisation create flow data',
+      } satisfies StripeWebhookResponse,
+      { status: 500 },
+    );
+  }
+
+  organisationCreateFlowData = parseResult.data;
+
+  const createdOrganisation = await createOrganisation({
+    name: organisationCreateFlowData.organisationName,
+    userId: organisationCreateFlowData.userId,
+    type: OrganisationType.ORGANISATION,
+    customerId,
+    claim,
+  });
+
+  return createdOrganisation.id;
+};
+
+type HandleOrganisationUpdateOptions = {
+  customerId: string;
+  claim: InternalClaim;
+};
+
+/**
+ * Handles the updating an exist organisation claims.
+ */
+const handleOrganisationUpdate = async ({ customerId, claim }: HandleOrganisationUpdateOptions) => {
+  const organisation = await prisma.organisation.findFirst({
+    where: {
+      customerId,
+    },
+    include: {
+      subscription: true,
+      organisationClaim: true,
+    },
+  });
+
+  if (!organisation) {
+    throw Response.json(
+      {
+        success: false,
+        message: `Organisation not found`,
+      } satisfies StripeWebhookResponse,
+      { status: 500 },
+    );
+  }
+
+  // Todo: logging
+  if (organisation.subscription) {
+    console.error('Organisation already has a subscription');
+
+    // This should never happen
+    throw Response.json(
+      {
+        success: false,
+        message: `Organisation already has a subscription`,
+      } satisfies StripeWebhookResponse,
+      { status: 500 },
+    );
+  }
+
+  let newOrganisationType: OrganisationType = OrganisationType.ORGANISATION;
+
+  // Keep the organisation as personal if the claim is for an individual.
+  if (
+    organisation.type === OrganisationType.PERSONAL &&
+    claim.id === INTERNAL_CLAIM_ID.INDIVIDUAL
+  ) {
+    newOrganisationType = OrganisationType.PERSONAL;
+  }
+
+  await prisma.organisation.update({
+    where: {
+      id: organisation.id,
+    },
+    data: {
+      type: newOrganisationType,
+      organisationClaim: {
+        update: {
+          originalSubscriptionClaimId: claim.id,
+          ...createOrganisationClaimUpsertData(claim),
+        },
+      },
+    },
+  });
+
+  return organisation.id;
+};
diff --git a/packages/ee/server-only/stripe/webhook/on-subscription-updated.ts b/packages/ee/server-only/stripe/webhook/on-subscription-updated.ts
index 355a6375f..601adca51 100644
--- a/packages/ee/server-only/stripe/webhook/on-subscription-updated.ts
+++ b/packages/ee/server-only/stripe/webhook/on-subscription-updated.ts
@@ -1,59 +1,163 @@
-import type { Prisma } from '@prisma/client';
 import { SubscriptionStatus } from '@prisma/client';
 import { match } from 'ts-pattern';
 
-import type { Stripe } from '@documenso/lib/server-only/stripe';
+import { createOrganisationClaimUpsertData } from '@documenso/lib/server-only/organisation/create-organisation';
+import { type Stripe, stripe } from '@documenso/lib/server-only/stripe';
 import { prisma } from '@documenso/prisma';
 
 export type OnSubscriptionUpdatedOptions = {
-  userId?: number;
-  teamId?: number;
   subscription: Stripe.Subscription;
+  previousAttributes: Partial<Stripe.Subscription> | null;
+};
+
+type StripeWebhookResponse = {
+  success: boolean;
+  message: string;
 };
 
 export const onSubscriptionUpdated = async ({
-  userId,
-  teamId,
   subscription,
+  previousAttributes,
 }: OnSubscriptionUpdatedOptions) => {
-  await prisma.subscription.upsert(
-    mapStripeSubscriptionToPrismaUpsertAction(subscription, userId, teamId),
-  );
-};
+  const customerId =
+    typeof subscription.customer === 'string' ? subscription.customer : subscription.customer.id;
 
-export const mapStripeSubscriptionToPrismaUpsertAction = (
-  subscription: Stripe.Subscription,
-  userId?: number,
-  teamId?: number,
-): Prisma.SubscriptionUpsertArgs => {
-  if ((!userId && !teamId) || (userId && teamId)) {
-    throw new Error('Either userId or teamId must be provided.');
+  // Todo: logging
+  if (subscription.items.data.length !== 1) {
+    console.error('No support for multiple items');
+
+    throw Response.json(
+      {
+        success: false,
+        message: 'No support for multiple items',
+      } satisfies StripeWebhookResponse,
+      { status: 500 },
+    );
   }
 
+  const organisation = await prisma.organisation.findFirst({
+    where: {
+      customerId,
+    },
+    include: {
+      organisationClaim: true,
+      subscription: true,
+    },
+  });
+
+  if (!organisation) {
+    throw Response.json(
+      {
+        success: false,
+        message: `Organisation not found`,
+      } satisfies StripeWebhookResponse,
+      { status: 500 },
+    );
+  }
+
+  if (organisation.subscription?.planId !== subscription.id) {
+    console.error('[WARNING]: Organisation has two subscriptions');
+  }
+
+  const previousItem = previousAttributes?.items?.data[0];
+  const updatedItem = subscription.items.data[0];
+
+  const previousSubscriptionClaimId = previousItem
+    ? await extractStripeClaimId(previousItem.price)
+    : null;
+  const updatedSubscriptionClaim = await extractStripeClaim(updatedItem.price);
+
+  if (!updatedSubscriptionClaim) {
+    console.error(`Subscription claim on ${updatedItem.price.id} not found`);
+
+    throw Response.json(
+      {
+        success: false,
+        message: `Subscription claim on ${updatedItem.price.id} not found`,
+      } satisfies StripeWebhookResponse,
+      { status: 500 },
+    );
+  }
+
+  const newClaimFound = previousSubscriptionClaimId !== updatedSubscriptionClaim.id;
+
   const status = match(subscription.status)
     .with('active', () => SubscriptionStatus.ACTIVE)
     .with('past_due', () => SubscriptionStatus.PAST_DUE)
     .otherwise(() => SubscriptionStatus.INACTIVE);
 
-  return {
-    where: {
-      planId: subscription.id,
-    },
-    create: {
-      status: status,
-      planId: subscription.id,
-      priceId: subscription.items.data[0].price.id,
-      periodEnd: new Date(subscription.current_period_end * 1000),
-      userId: userId ?? null,
-      teamId: teamId ?? null,
-      cancelAtPeriodEnd: subscription.cancel_at_period_end,
-    },
-    update: {
-      status: status,
-      planId: subscription.id,
-      priceId: subscription.items.data[0].price.id,
-      periodEnd: new Date(subscription.current_period_end * 1000),
-      cancelAtPeriodEnd: subscription.cancel_at_period_end,
-    },
-  };
+  await prisma.$transaction(async (tx) => {
+    await tx.subscription.update({
+      where: {
+        planId: subscription.id,
+      },
+      data: {
+        organisationId: organisation.id,
+        status: status,
+        planId: subscription.id,
+        priceId: subscription.items.data[0].price.id,
+        periodEnd: new Date(subscription.current_period_end * 1000),
+        cancelAtPeriodEnd: subscription.cancel_at_period_end,
+      },
+    });
+
+    // Override current organisation claim if new one is found.
+    if (newClaimFound) {
+      await tx.organisationClaim.update({
+        where: {
+          id: organisation.organisationClaim.id,
+        },
+        data: {
+          originalSubscriptionClaimId: updatedSubscriptionClaim.id,
+          ...createOrganisationClaimUpsertData(updatedSubscriptionClaim),
+        },
+      });
+    }
+  });
+};
+
+/**
+ * Checks the price metadata for a claimId, if it is missing it will fetch
+ * and check the product metadata for a claimId.
+ *
+ * The order of priority is:
+ * 1. Price metadata
+ * 2. Product metadata
+ *
+ * @returns The claimId or null if no claimId is found.
+ */
+export const extractStripeClaimId = async (priceId: Stripe.Price) => {
+  if (priceId.metadata.claimId) {
+    return priceId.metadata.claimId;
+  }
+
+  const productId = typeof priceId.product === 'string' ? priceId.product : priceId.product.id;
+
+  const product = await stripe.products.retrieve(productId);
+
+  return product.metadata.claimId || null;
+};
+
+/**
+ * Checks the price metadata for a claimId, if it is missing it will fetch
+ * and check the product metadata for a claimId.
+ *
+ */
+export const extractStripeClaim = async (priceId: Stripe.Price) => {
+  const claimId = await extractStripeClaimId(priceId);
+
+  if (!claimId) {
+    return null;
+  }
+
+  const subscriptionClaim = await prisma.subscriptionClaim.findFirst({
+    where: { id: claimId },
+  });
+
+  if (!subscriptionClaim) {
+    console.error(`Subscription claim ${claimId} not found`);
+    return null;
+  }
+
+  return subscriptionClaim;
 };
diff --git a/packages/ee/server-only/util/is-community-plan.ts b/packages/ee/server-only/util/is-community-plan.ts
deleted file mode 100644
index c0774c09a..000000000
--- a/packages/ee/server-only/util/is-community-plan.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import type { Subscription } from '@prisma/client';
-
-import { subscriptionsContainsActivePlan } from '@documenso/lib/utils/billing';
-import { prisma } from '@documenso/prisma';
-
-import { getCommunityPlanPriceIds } from '../stripe/get-community-plan-prices';
-
-export type IsCommunityPlanOptions = {
-  userId: number;
-  teamId?: number;
-};
-
-/**
- * Whether the user or team is on the community plan.
- */
-export const isCommunityPlan = async ({
-  userId,
-  teamId,
-}: IsCommunityPlanOptions): Promise<boolean> => {
-  let subscriptions: Subscription[] = [];
-
-  if (teamId) {
-    subscriptions = await prisma.team
-      .findFirstOrThrow({
-        where: {
-          id: teamId,
-        },
-        select: {
-          owner: {
-            include: {
-              subscriptions: true,
-            },
-          },
-        },
-      })
-      .then((team) => team.owner.subscriptions);
-  } else {
-    subscriptions = await prisma.user
-      .findFirstOrThrow({
-        where: {
-          id: userId,
-        },
-        select: {
-          subscriptions: true,
-        },
-      })
-      .then((user) => user.subscriptions);
-  }
-
-  if (subscriptions.length === 0) {
-    return false;
-  }
-
-  const communityPlanPriceIds = await getCommunityPlanPriceIds();
-
-  return subscriptionsContainsActivePlan(subscriptions, communityPlanPriceIds);
-};
diff --git a/packages/ee/server-only/util/is-document-enterprise.ts b/packages/ee/server-only/util/is-document-enterprise.ts
deleted file mode 100644
index 256689069..000000000
--- a/packages/ee/server-only/util/is-document-enterprise.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import type { Subscription } from '@prisma/client';
-
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
-import { subscriptionsContainsActivePlan } from '@documenso/lib/utils/billing';
-import { prisma } from '@documenso/prisma';
-
-import { getEnterprisePlanPriceIds } from '../stripe/get-enterprise-plan-prices';
-
-export type IsUserEnterpriseOptions = {
-  userId: number;
-  teamId?: number;
-};
-
-/**
- * Whether the user is enterprise, or has permission to use enterprise features on
- * behalf of their team.
- *
- * It is assumed that the provided user is part of the provided team.
- */
-export const isUserEnterprise = async ({
-  userId,
-  teamId,
-}: IsUserEnterpriseOptions): Promise<boolean> => {
-  let subscriptions: Subscription[] = [];
-
-  if (!IS_BILLING_ENABLED()) {
-    return false;
-  }
-
-  if (teamId) {
-    subscriptions = await prisma.team
-      .findFirstOrThrow({
-        where: {
-          id: teamId,
-        },
-        select: {
-          owner: {
-            include: {
-              subscriptions: true,
-            },
-          },
-        },
-      })
-      .then((team) => team.owner.subscriptions);
-  } else {
-    subscriptions = await prisma.user
-      .findFirstOrThrow({
-        where: {
-          id: userId,
-        },
-        select: {
-          subscriptions: true,
-        },
-      })
-      .then((user) => user.subscriptions);
-  }
-
-  if (subscriptions.length === 0) {
-    return false;
-  }
-
-  const enterprisePlanPriceIds = await getEnterprisePlanPriceIds();
-
-  return subscriptionsContainsActivePlan(subscriptions, enterprisePlanPriceIds, true);
-};
diff --git a/packages/ee/server-only/util/is-document-platform.ts b/packages/ee/server-only/util/is-document-platform.ts
deleted file mode 100644
index e7d7b47af..000000000
--- a/packages/ee/server-only/util/is-document-platform.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import type { Document, Subscription } from '@prisma/client';
-
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
-import { subscriptionsContainsActivePlan } from '@documenso/lib/utils/billing';
-import { prisma } from '@documenso/prisma';
-
-import { getPlatformPlanPriceIds } from '../stripe/get-platform-plan-prices';
-
-export type IsDocumentPlatformOptions = Pick<Document, 'userId' | 'teamId'>;
-
-/**
- * Whether the user is platform, or has permission to use platform features on
- * behalf of their team.
- *
- * It is assumed that the provided user is part of the provided team.
- */
-export const isDocumentPlatform = async ({
-  userId,
-  teamId,
-}: IsDocumentPlatformOptions): Promise<boolean> => {
-  let subscriptions: Subscription[] = [];
-
-  if (!IS_BILLING_ENABLED()) {
-    return true;
-  }
-
-  if (teamId) {
-    subscriptions = await prisma.team
-      .findFirstOrThrow({
-        where: {
-          id: teamId,
-        },
-        select: {
-          owner: {
-            include: {
-              subscriptions: true,
-            },
-          },
-        },
-      })
-      .then((team) => team.owner.subscriptions);
-  } else {
-    subscriptions = await prisma.user
-      .findFirstOrThrow({
-        where: {
-          id: userId,
-        },
-        select: {
-          subscriptions: true,
-        },
-      })
-      .then((user) => user.subscriptions);
-  }
-
-  if (subscriptions.length === 0) {
-    return false;
-  }
-
-  const platformPlanPriceIds = await getPlatformPlanPriceIds();
-
-  return subscriptionsContainsActivePlan(subscriptions, platformPlanPriceIds);
-};
diff --git a/packages/email/template-components/template-document-invite.tsx b/packages/email/template-components/template-document-invite.tsx
index 887a3da29..2c52bf441 100644
--- a/packages/email/template-components/template-document-invite.tsx
+++ b/packages/email/template-components/template-document-invite.tsx
@@ -2,7 +2,7 @@ import { useMemo } from 'react';
 
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import { RecipientRole } from '@prisma/client';
+import { OrganisationType, RecipientRole } from '@prisma/client';
 import { P, match } from 'ts-pattern';
 
 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
@@ -18,9 +18,9 @@ export interface TemplateDocumentInviteProps {
   assetBaseUrl: string;
   role: RecipientRole;
   selfSigner: boolean;
-  isTeamInvite: boolean;
   teamName?: string;
   includeSenderDetails?: boolean;
+  organisationType?: OrganisationType;
 }
 
 export const TemplateDocumentInvite = ({
@@ -30,9 +30,9 @@ export const TemplateDocumentInvite = ({
   assetBaseUrl,
   role,
   selfSigner,
-  isTeamInvite,
   teamName,
   includeSenderDetails,
+  organisationType,
 }: TemplateDocumentInviteProps) => {
   const { _ } = useLingui();
 
@@ -50,21 +50,28 @@ export const TemplateDocumentInvite = ({
 
       <Section>
         <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
-          {match({ selfSigner, isTeamInvite, includeSenderDetails, teamName })
+          {match({ selfSigner, organisationType, includeSenderDetails, teamName })
             .with({ selfSigner: true }, () => (
               <Trans>
                 Please {_(actionVerb).toLowerCase()} your document
                 <br />"{documentName}"
               </Trans>
             ))
-            .with({ isTeamInvite: true, includeSenderDetails: true, teamName: P.string }, () => (
-              <Trans>
-                {inviterName} on behalf of "{teamName}" has invited you to{' '}
-                {_(actionVerb).toLowerCase()}
-                <br />"{documentName}"
-              </Trans>
-            ))
-            .with({ isTeamInvite: true, teamName: P.string }, () => (
+            .with(
+              {
+                organisationType: OrganisationType.ORGANISATION,
+                includeSenderDetails: true,
+                teamName: P.string,
+              },
+              () => (
+                <Trans>
+                  {inviterName} on behalf of "{teamName}" has invited you to{' '}
+                  {_(actionVerb).toLowerCase()}
+                  <br />"{documentName}"
+                </Trans>
+              ),
+            )
+            .with({ organisationType: OrganisationType.ORGANISATION, teamName: P.string }, () => (
               <Trans>
                 {teamName} has invited you to {_(actionVerb).toLowerCase()}
                 <br />"{documentName}"
diff --git a/packages/email/templates/document-invite.tsx b/packages/email/templates/document-invite.tsx
index 608d17b77..86cb4bc6d 100644
--- a/packages/email/templates/document-invite.tsx
+++ b/packages/email/templates/document-invite.tsx
@@ -2,6 +2,7 @@ import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import type { RecipientRole } from '@prisma/client';
+import { OrganisationType } from '@prisma/client';
 
 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
 
@@ -15,10 +16,10 @@ export type DocumentInviteEmailTemplateProps = Partial<TemplateDocumentInvitePro
   customBody?: string;
   role: RecipientRole;
   selfSigner?: boolean;
-  isTeamInvite?: boolean;
   teamName?: string;
   teamEmail?: string;
   includeSenderDetails?: boolean;
+  organisationType?: OrganisationType;
 };
 
 export const DocumentInviteEmailTemplate = ({
@@ -30,9 +31,9 @@ export const DocumentInviteEmailTemplate = ({
   customBody,
   role,
   selfSigner = false,
-  isTeamInvite = false,
   teamName = '',
   includeSenderDetails,
+  organisationType,
 }: DocumentInviteEmailTemplateProps) => {
   const { _ } = useLingui();
   const branding = useBranding();
@@ -41,7 +42,7 @@ export const DocumentInviteEmailTemplate = ({
 
   let previewText = msg`${inviterName} has invited you to ${action} ${documentName}`;
 
-  if (isTeamInvite) {
+  if (organisationType === OrganisationType.ORGANISATION) {
     previewText = includeSenderDetails
       ? msg`${inviterName} on behalf of "${teamName}" has invited you to ${action} ${documentName}`
       : msg`${teamName} has invited you to ${action} ${documentName}`;
@@ -82,7 +83,7 @@ export const DocumentInviteEmailTemplate = ({
                 assetBaseUrl={assetBaseUrl}
                 role={role}
                 selfSigner={selfSigner}
-                isTeamInvite={isTeamInvite}
+                organisationType={organisationType}
                 teamName={teamName}
                 includeSenderDetails={includeSenderDetails}
               />
@@ -91,7 +92,7 @@ export const DocumentInviteEmailTemplate = ({
 
           <Container className="mx-auto mt-12 max-w-xl">
             <Section>
-              {!isTeamInvite && (
+              {organisationType === OrganisationType.PERSONAL && (
                 <Text className="my-4 text-base font-semibold">
                   <Trans>
                     {inviterName}{' '}
diff --git a/packages/email/templates/team-invite.tsx b/packages/email/templates/organisation-invite.tsx
similarity index 83%
rename from packages/email/templates/team-invite.tsx
rename to packages/email/templates/organisation-invite.tsx
index d6007202b..e959023e0 100644
--- a/packages/email/templates/team-invite.tsx
+++ b/packages/email/templates/organisation-invite.tsx
@@ -2,8 +2,6 @@ import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 
-import { formatTeamUrl } from '@documenso/lib/utils/teams';
-
 import {
   Body,
   Button,
@@ -20,27 +18,25 @@ import { useBranding } from '../providers/branding';
 import { TemplateFooter } from '../template-components/template-footer';
 import TemplateImage from '../template-components/template-image';
 
-export type TeamInviteEmailProps = {
+export type OrganisationInviteEmailProps = {
   assetBaseUrl: string;
   baseUrl: string;
   senderName: string;
-  teamName: string;
-  teamUrl: string;
+  organisationName: string;
   token: string;
 };
 
-export const TeamInviteEmailTemplate = ({
+export const OrganisationInviteEmailTemplate = ({
   assetBaseUrl = 'http://localhost:3002',
   baseUrl = 'https://documenso.com',
   senderName = 'John Doe',
-  teamName = 'Team Name',
-  teamUrl = 'demo',
+  organisationName = 'Organisation Name',
   token = '',
-}: TeamInviteEmailProps) => {
+}: OrganisationInviteEmailProps) => {
   const { _ } = useLingui();
   const branding = useBranding();
 
-  const previewText = msg`Accept invitation to join a team on Documenso`;
+  const previewText = msg`Accept invitation to join an organisation on Documenso`;
 
   return (
     <Html>
@@ -70,15 +66,15 @@ export const TeamInviteEmailTemplate = ({
 
             <Section className="p-2 text-slate-500">
               <Text className="text-center text-lg font-medium text-black">
-                <Trans>Join {teamName} on Documenso</Trans>
+                <Trans>Join {organisationName} on Documenso</Trans>
               </Text>
 
               <Text className="my-1 text-center text-base">
-                <Trans>You have been invited to join the following team</Trans>
+                <Trans>You have been invited to join the following organisation</Trans>
               </Text>
 
               <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
-                {formatTeamUrl(teamUrl, baseUrl)}
+                {organisationName}
               </div>
 
               <Text className="my-1 text-center text-base">
@@ -90,13 +86,13 @@ export const TeamInviteEmailTemplate = ({
               <Section className="mb-6 mt-6 text-center">
                 <Button
                   className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
-                  href={`${baseUrl}/team/invite/${token}`}
+                  href={`${baseUrl}/organisation/invite/${token}`}
                 >
                   <Trans>Accept</Trans>
                 </Button>
                 <Button
                   className="ml-4 inline-flex items-center justify-center rounded-lg bg-gray-50 px-6 py-3 text-center text-sm font-medium text-slate-600 no-underline"
-                  href={`${baseUrl}/team/decline/${token}`}
+                  href={`${baseUrl}/organisation/decline/${token}`}
                 >
                   <Trans>Decline</Trans>
                 </Button>
@@ -115,4 +111,4 @@ export const TeamInviteEmailTemplate = ({
   );
 };
 
-export default TeamInviteEmailTemplate;
+export default OrganisationInviteEmailTemplate;
diff --git a/packages/email/templates/team-join.tsx b/packages/email/templates/organisation-join.tsx
similarity index 75%
rename from packages/email/templates/team-join.tsx
rename to packages/email/templates/organisation-join.tsx
index d9dbe7ff9..8690bd5c9 100644
--- a/packages/email/templates/team-join.tsx
+++ b/packages/email/templates/organisation-join.tsx
@@ -2,34 +2,32 @@ import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 
-import { formatTeamUrl } from '@documenso/lib/utils/teams';
-
 import { Body, Container, Head, Hr, Html, Img, Preview, Section, Text } from '../components';
 import { useBranding } from '../providers/branding';
 import { TemplateFooter } from '../template-components/template-footer';
 import TemplateImage from '../template-components/template-image';
 
-export type TeamJoinEmailProps = {
+export type OrganisationJoinEmailProps = {
   assetBaseUrl: string;
   baseUrl: string;
   memberName: string;
   memberEmail: string;
-  teamName: string;
-  teamUrl: string;
+  organisationName: string;
+  organisationUrl: string;
 };
 
-export const TeamJoinEmailTemplate = ({
+export const OrganisationJoinEmailTemplate = ({
   assetBaseUrl = 'http://localhost:3002',
   baseUrl = 'https://documenso.com',
   memberName = 'John Doe',
   memberEmail = 'johndoe@documenso.com',
-  teamName = 'Team Name',
-  teamUrl = 'demo',
-}: TeamJoinEmailProps) => {
+  organisationName = 'Organisation Name',
+  organisationUrl = 'demo',
+}: OrganisationJoinEmailProps) => {
   const { _ } = useLingui();
   const branding = useBranding();
 
-  const previewText = msg`A team member has joined a team on Documenso`;
+  const previewText = msg`A member has joined your organisation on Documenso`;
 
   return (
     <Html>
@@ -59,17 +57,11 @@ export const TeamJoinEmailTemplate = ({
 
             <Section className="p-2 text-slate-500">
               <Text className="text-center text-lg font-medium text-black">
-                <Trans>
-                  {memberName || memberEmail} joined the team {teamName} on Documenso
-                </Trans>
-              </Text>
-
-              <Text className="my-1 text-center text-base">
-                <Trans>{memberEmail} joined the following team</Trans>
+                <Trans>A new member has joined your organisation {organisationName}</Trans>
               </Text>
 
               <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
-                {formatTeamUrl(teamUrl, baseUrl)}
+                {memberName || memberEmail}
               </div>
             </Section>
           </Container>
@@ -85,4 +77,4 @@ export const TeamJoinEmailTemplate = ({
   );
 };
 
-export default TeamJoinEmailTemplate;
+export default OrganisationJoinEmailTemplate;
diff --git a/packages/email/templates/team-leave.tsx b/packages/email/templates/organisation-leave.tsx
similarity index 75%
rename from packages/email/templates/team-leave.tsx
rename to packages/email/templates/organisation-leave.tsx
index b26016f93..bdc565aa5 100644
--- a/packages/email/templates/team-leave.tsx
+++ b/packages/email/templates/organisation-leave.tsx
@@ -2,34 +2,32 @@ import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 
-import { formatTeamUrl } from '@documenso/lib/utils/teams';
-
 import { Body, Container, Head, Hr, Html, Img, Preview, Section, Text } from '../components';
 import { useBranding } from '../providers/branding';
 import { TemplateFooter } from '../template-components/template-footer';
 import TemplateImage from '../template-components/template-image';
 
-export type TeamLeaveEmailProps = {
+export type OrganisationLeaveEmailProps = {
   assetBaseUrl: string;
   baseUrl: string;
   memberName: string;
   memberEmail: string;
-  teamName: string;
-  teamUrl: string;
+  organisationName: string;
+  organisationUrl: string;
 };
 
-export const TeamLeaveEmailTemplate = ({
+export const OrganisationLeaveEmailTemplate = ({
   assetBaseUrl = 'http://localhost:3002',
   baseUrl = 'https://documenso.com',
   memberName = 'John Doe',
   memberEmail = 'johndoe@documenso.com',
-  teamName = 'Team Name',
-  teamUrl = 'demo',
-}: TeamLeaveEmailProps) => {
+  organisationName = 'Organisation Name',
+  organisationUrl = 'demo',
+}: OrganisationLeaveEmailProps) => {
   const { _ } = useLingui();
   const branding = useBranding();
 
-  const previewText = msg`A team member has left a team on Documenso`;
+  const previewText = msg`A member has left your organisation on Documenso`;
 
   return (
     <Html>
@@ -59,17 +57,11 @@ export const TeamLeaveEmailTemplate = ({
 
             <Section className="p-2 text-slate-500">
               <Text className="text-center text-lg font-medium text-black">
-                <Trans>
-                  {memberName || memberEmail} left the team {teamName} on Documenso
-                </Trans>
-              </Text>
-
-              <Text className="my-1 text-center text-base">
-                <Trans>{memberEmail} left the following team</Trans>
+                <Trans>A member has left your organisation {organisationName}</Trans>
               </Text>
 
               <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
-                {formatTeamUrl(teamUrl, baseUrl)}
+                {memberName || memberEmail}
               </div>
             </Section>
           </Container>
@@ -85,4 +77,4 @@ export const TeamLeaveEmailTemplate = ({
   );
 };
 
-export default TeamLeaveEmailTemplate;
+export default OrganisationLeaveEmailTemplate;
diff --git a/packages/email/templates/team-delete.tsx b/packages/email/templates/team-delete.tsx
index 029ec821a..32b71032a 100644
--- a/packages/email/templates/team-delete.tsx
+++ b/packages/email/templates/team-delete.tsx
@@ -12,29 +12,21 @@ export type TeamDeleteEmailProps = {
   assetBaseUrl: string;
   baseUrl: string;
   teamUrl: string;
-  isOwner: boolean;
 };
 
 export const TeamDeleteEmailTemplate = ({
   assetBaseUrl = 'http://localhost:3002',
   baseUrl = 'https://documenso.com',
   teamUrl = 'demo',
-  isOwner = false,
 }: TeamDeleteEmailProps) => {
   const { _ } = useLingui();
   const branding = useBranding();
 
-  const previewText = isOwner
-    ? msg`Your team has been deleted`
-    : msg`A team you were a part of has been deleted`;
+  const previewText = msg`A team you were a part of has been deleted`;
 
-  const title = isOwner
-    ? msg`Your team has been deleted`
-    : msg`A team you were a part of has been deleted`;
+  const title = msg`A team you were a part of has been deleted`;
 
-  const description = isOwner
-    ? msg`The following team has been deleted by you`
-    : msg`The following team has been deleted by its owner. You will no longer be able to access this team and its documents`;
+  const description = msg`The following team has been deleted. You will no longer be able to access this team and its documents`;
 
   return (
     <Html>
diff --git a/packages/email/templates/team-transfer-request.tsx b/packages/email/templates/team-transfer-request.tsx
deleted file mode 100644
index 83a428189..000000000
--- a/packages/email/templates/team-transfer-request.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-
-import { formatTeamUrl } from '@documenso/lib/utils/teams';
-
-import { Body, Button, Container, Head, Hr, Html, Preview, Section, Text } from '../components';
-import { TemplateFooter } from '../template-components/template-footer';
-import TemplateImage from '../template-components/template-image';
-
-export type TeamTransferRequestTemplateProps = {
-  assetBaseUrl: string;
-  baseUrl: string;
-  senderName: string;
-  teamName: string;
-  teamUrl: string;
-  token: string;
-};
-
-export const TeamTransferRequestTemplate = ({
-  assetBaseUrl = 'http://localhost:3002',
-  baseUrl = 'https://documenso.com',
-  senderName = 'John Doe',
-  teamName = 'Team Name',
-  teamUrl = 'demo',
-  token = '',
-}: TeamTransferRequestTemplateProps) => {
-  const { _ } = useLingui();
-
-  const previewText = msg`Accept team transfer request on Documenso`;
-
-  return (
-    <Html>
-      <Head />
-      <Preview>{_(previewText)}</Preview>
-
-      <Body className="mx-auto my-auto font-sans">
-        <Section className="bg-white text-slate-500">
-          <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 px-2 pt-2 backdrop-blur-sm">
-            <TemplateImage
-              assetBaseUrl={assetBaseUrl}
-              className="mb-4 h-6 p-2"
-              staticAsset="logo.png"
-            />
-
-            <Section>
-              <TemplateImage
-                className="mx-auto"
-                assetBaseUrl={assetBaseUrl}
-                staticAsset="add-user.png"
-              />
-            </Section>
-
-            <Section className="p-2 text-slate-500">
-              <Text className="text-center text-lg font-medium text-black">
-                <Trans>{teamName} ownership transfer request</Trans>
-              </Text>
-
-              <Text className="my-1 text-center text-base">
-                <Trans>
-                  <span className="font-bold">{senderName}</span> has requested that you take
-                  ownership of the following team
-                </Trans>
-              </Text>
-
-              <div className="mx-auto my-2 w-fit rounded-lg bg-gray-50 px-4 py-2 text-base font-medium text-slate-600">
-                {formatTeamUrl(teamUrl, baseUrl)}
-              </div>
-
-              <Text className="text-center text-sm">
-                <Trans>
-                  By accepting this request, you will take responsibility for any billing items
-                  associated with this team.
-                </Trans>
-              </Text>
-
-              <Section className="mb-6 mt-6 text-center">
-                <Button
-                  className="bg-documenso-500 ml-2 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
-                  href={`${baseUrl}/team/verify/transfer/${token}`}
-                >
-                  <Trans>Accept</Trans>
-                </Button>
-              </Section>
-            </Section>
-
-            <Text className="text-center text-xs">
-              <Trans>Link expires in 1 hour.</Trans>
-            </Text>
-          </Container>
-
-          <Hr className="mx-auto mt-12 max-w-xl" />
-
-          <Container className="mx-auto max-w-xl">
-            <TemplateFooter isDocument={false} />
-          </Container>
-        </Section>
-      </Body>
-    </Html>
-  );
-};
-
-export default TeamTransferRequestTemplate;
diff --git a/packages/lib/client-only/providers/organisation.tsx b/packages/lib/client-only/providers/organisation.tsx
new file mode 100644
index 000000000..fc6b966c6
--- /dev/null
+++ b/packages/lib/client-only/providers/organisation.tsx
@@ -0,0 +1,33 @@
+import { createContext, useContext } from 'react';
+import React from 'react';
+
+import type { OrganisationSession } from '@documenso/trpc/server/organisation-router/get-organisation-session.types';
+
+type OrganisationProviderValue = OrganisationSession;
+
+interface OrganisationProviderProps {
+  children: React.ReactNode;
+  organisation: OrganisationProviderValue | null;
+}
+
+const OrganisationContext = createContext<OrganisationProviderValue | null>(null);
+
+export const useCurrentOrganisation = () => {
+  const context = useContext(OrganisationContext);
+
+  if (!context) {
+    throw new Error('useCurrentOrganisation must be used within a OrganisationProvider');
+  }
+
+  return context;
+};
+
+export const useOptionalCurrentOrganisation = () => {
+  return useContext(OrganisationContext);
+};
+
+export const OrganisationProvider = ({ children, organisation }: OrganisationProviderProps) => {
+  return (
+    <OrganisationContext.Provider value={organisation}>{children}</OrganisationContext.Provider>
+  );
+};
diff --git a/packages/lib/client-only/providers/session.tsx b/packages/lib/client-only/providers/session.tsx
index 88d653a13..493dce7b1 100644
--- a/packages/lib/client-only/providers/session.tsx
+++ b/packages/lib/client-only/providers/session.tsx
@@ -6,13 +6,15 @@ import { useLocation } from 'react-router';
 
 import { authClient } from '@documenso/auth/client';
 import type { SessionUser } from '@documenso/auth/server/lib/session/session';
-import { type TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
 import { trpc } from '@documenso/trpc/client';
+import type { TGetOrganisationSessionResponse } from '@documenso/trpc/server/organisation-router/get-organisation-session.types';
+
+import { SKIP_QUERY_BATCH_META } from '../../constants/trpc';
 
 export type AppSession = {
   session: Session;
   user: SessionUser;
-  teams: TGetTeamsResponse;
+  organisations: TGetOrganisationSessionResponse;
 };
 
 interface SessionProviderProps {
@@ -67,15 +69,17 @@ export const SessionProvider = ({ children, initialSession }: SessionProviderPro
       return;
     }
 
-    const teams = await trpc.team.getTeams.query().catch(() => {
-      // Todo: (RR7) Log
-      return [];
-    });
+    const organisations = await trpc.organisation.internal.getOrganisationSession
+      .query(undefined, SKIP_QUERY_BATCH_META.trpc)
+      .catch(() => {
+        // Todo: (RR7) Log
+        return [];
+      });
 
     setSession({
       session: newSession.session,
       user: newSession.user,
-      teams,
+      organisations,
     });
   }, []);
 
diff --git a/packages/lib/constants/billing.ts b/packages/lib/constants/billing.ts
index f552479a1..48c16802d 100644
--- a/packages/lib/constants/billing.ts
+++ b/packages/lib/constants/billing.ts
@@ -1,12 +1,18 @@
-export enum STRIPE_CUSTOMER_TYPE {
-  INDIVIDUAL = 'individual',
-  TEAM = 'team',
-}
+import { SubscriptionStatus } from '@prisma/client';
 
 export enum STRIPE_PLAN_TYPE {
-  REGULAR = 'regular',
-  TEAM = 'team',
-  COMMUNITY = 'community',
+  FREE = 'free',
+  INDIVIDUAL = 'individual',
+  PRO = 'pro',
+  EARLY_ADOPTER = 'earlyAdopter',
   PLATFORM = 'platform',
   ENTERPRISE = 'enterprise',
 }
+
+export const FREE_TIER_DOCUMENT_QUOTA = 5;
+
+export const SUBSCRIPTION_STATUS_MAP = {
+  [SubscriptionStatus.ACTIVE]: 'Active',
+  [SubscriptionStatus.INACTIVE]: 'Inactive',
+  [SubscriptionStatus.PAST_DUE]: 'Past Due',
+};
diff --git a/packages/lib/constants/document.ts b/packages/lib/constants/document.ts
index 670c68ed7..d8e010f74 100644
--- a/packages/lib/constants/document.ts
+++ b/packages/lib/constants/document.ts
@@ -2,6 +2,13 @@ import type { MessageDescriptor } from '@lingui/core';
 import { msg } from '@lingui/core/macro';
 import { DocumentDistributionMethod, DocumentStatus } from '@prisma/client';
 
+/**
+ * Workaround for E2E tests to not import `msg`.
+ */
+import { DocumentSignatureType } from '@documenso/lib/utils/teams';
+
+export { DocumentSignatureType };
+
 export const DOCUMENT_STATUS: {
   [status in DocumentStatus]: { description: MessageDescriptor };
 } = {
@@ -35,12 +42,6 @@ export const DOCUMENT_DISTRIBUTION_METHODS: Record<string, DocumentDistributionM
   },
 } satisfies Record<DocumentDistributionMethod, DocumentDistributionMethodTypeData>;
 
-export enum DocumentSignatureType {
-  DRAW = 'draw',
-  TYPE = 'type',
-  UPLOAD = 'upload',
-}
-
 type DocumentSignatureTypeData = {
   label: MessageDescriptor;
   value: DocumentSignatureType;
diff --git a/packages/lib/constants/feature-flags.ts b/packages/lib/constants/feature-flags.ts
index 50d1ff6b5..f5b6a406a 100644
--- a/packages/lib/constants/feature-flags.ts
+++ b/packages/lib/constants/feature-flags.ts
@@ -2,7 +2,6 @@ import { env } from '@documenso/lib/utils/env';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from './app';
 
-const NEXT_PUBLIC_FEATURE_BILLING_ENABLED = () => env('NEXT_PUBLIC_FEATURE_BILLING_ENABLED');
 const NEXT_PUBLIC_POSTHOG_KEY = () => env('NEXT_PUBLIC_POSTHOG_KEY');
 
 /**
@@ -10,26 +9,6 @@ const NEXT_PUBLIC_POSTHOG_KEY = () => env('NEXT_PUBLIC_POSTHOG_KEY');
  */
 export const FEATURE_FLAG_GLOBAL_SESSION_RECORDING = 'global_session_recording';
 
-/**
- * How frequent to poll for new feature flags in milliseconds.
- */
-export const FEATURE_FLAG_POLL_INTERVAL = 30000;
-
-/**
- * Feature flags that will be used when PostHog is disabled.
- *
- * Does not take any person or group properties into account.
- */
-export const LOCAL_FEATURE_FLAGS: Record<string, boolean> = {
-  app_allow_encrypted_documents: false,
-  app_billing: NEXT_PUBLIC_FEATURE_BILLING_ENABLED() === 'true',
-  app_document_page_view_history_sheet: false,
-  app_passkey: true,
-  app_public_profile: true,
-  marketing_header_single_player_mode: false,
-  marketing_profiles_announcement_bar: true,
-} as const;
-
 /**
  * Extract the PostHog configuration from the environment.
  */
@@ -46,10 +25,3 @@ export function extractPostHogConfig(): { key: string; host: string } | null {
     host: postHogHost,
   };
 }
-
-/**
- * Whether feature flags are enabled for the current instance.
- */
-export function isFeatureFlagEnabled(): boolean {
-  return extractPostHogConfig() !== null;
-}
diff --git a/packages/lib/constants/organisations-translations.ts b/packages/lib/constants/organisations-translations.ts
new file mode 100644
index 000000000..8bf1346fb
--- /dev/null
+++ b/packages/lib/constants/organisations-translations.ts
@@ -0,0 +1,25 @@
+/**
+ * These constants are in a different file to avoid E2E tests from importing `msg`
+ * which will break it.
+ */
+import type { MessageDescriptor } from '@lingui/core';
+import { msg } from '@lingui/core/macro';
+import type { OrganisationMemberRole } from '@prisma/client';
+
+export const ORGANISATION_MEMBER_ROLE_MAP: Record<
+  keyof typeof OrganisationMemberRole,
+  MessageDescriptor
+> = {
+  ADMIN: msg`Admin`,
+  MANAGER: msg`Manager`,
+  MEMBER: msg`Member`,
+};
+
+export const EXTENDED_ORGANISATION_MEMBER_ROLE_MAP: Record<
+  keyof typeof OrganisationMemberRole,
+  MessageDescriptor
+> = {
+  ADMIN: msg`Organisation Admin`,
+  MANAGER: msg`Organisation Manager`,
+  MEMBER: msg`Organisation Member`,
+};
diff --git a/packages/lib/constants/organisations.ts b/packages/lib/constants/organisations.ts
new file mode 100644
index 000000000..cd5bdb43b
--- /dev/null
+++ b/packages/lib/constants/organisations.ts
@@ -0,0 +1,128 @@
+import { OrganisationGroupType, OrganisationMemberRole } from '@prisma/client';
+
+export const ORGANISATION_URL_ROOT_REGEX = new RegExp('^/t/[^/]+/?$');
+export const ORGANISATION_URL_REGEX = new RegExp('^/t/[^/]+');
+
+export const ORGANISATION_INTERNAL_GROUPS: {
+  organisationRole: OrganisationMemberRole;
+  type: OrganisationGroupType;
+}[] = [
+  {
+    organisationRole: OrganisationMemberRole.ADMIN,
+    type: OrganisationGroupType.INTERNAL_ORGANISATION,
+  },
+  {
+    organisationRole: OrganisationMemberRole.MANAGER,
+    type: OrganisationGroupType.INTERNAL_ORGANISATION,
+  },
+  {
+    organisationRole: OrganisationMemberRole.MEMBER,
+    type: OrganisationGroupType.INTERNAL_ORGANISATION,
+  },
+] as const;
+
+export const ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP = {
+  /**
+   * Includes permissions to:
+   * - Manage organisation members
+   * - Manage organisation settings, changing name, url, etc.
+   */
+  DELETE_ORGANISATION: [OrganisationMemberRole.ADMIN],
+  MANAGE_BILLING: [OrganisationMemberRole.ADMIN],
+  DELETE_ORGANISATION_TRANSFER_REQUEST: [OrganisationMemberRole.ADMIN],
+  MANAGE_ORGANISATION: [OrganisationMemberRole.ADMIN, OrganisationMemberRole.MANAGER],
+} satisfies Record<string, OrganisationMemberRole[]>;
+
+/**
+ * A hierarchy of organisation member roles to determine which role has higher permission than another.
+ *
+ * Warning: The length of the array is used to determine the priority of the role.
+ * See `getHighestOrganisationRoleInGroup`
+ */
+export const ORGANISATION_MEMBER_ROLE_HIERARCHY = {
+  [OrganisationMemberRole.ADMIN]: [
+    OrganisationMemberRole.ADMIN,
+    OrganisationMemberRole.MANAGER,
+    OrganisationMemberRole.MEMBER,
+  ],
+  [OrganisationMemberRole.MANAGER]: [OrganisationMemberRole.MANAGER, OrganisationMemberRole.MEMBER],
+  [OrganisationMemberRole.MEMBER]: [OrganisationMemberRole.MEMBER],
+} satisfies Record<OrganisationMemberRole, OrganisationMemberRole[]>;
+
+export const LOWEST_ORGANISATION_ROLE = OrganisationMemberRole.MEMBER;
+
+export const PROTECTED_ORGANISATION_URLS = [
+  '403',
+  '404',
+  '500',
+  '502',
+  '503',
+  '504',
+  'about',
+  'account',
+  'admin',
+  'administrator',
+  'api',
+  'app',
+  'archive',
+  'auth',
+  'backup',
+  'config',
+  'configure',
+  'contact',
+  'contact-us',
+  'copyright',
+  'crime',
+  'criminal',
+  'dashboard',
+  'docs',
+  'documentation',
+  'document',
+  'documents',
+  'error',
+  'exploit',
+  'exploitation',
+  'exploiter',
+  'feedback',
+  'finance',
+  'forgot-password',
+  'fraud',
+  'fraudulent',
+  'hack',
+  'hacker',
+  'harassment',
+  'help',
+  'helpdesk',
+  'illegal',
+  'internal',
+  'legal',
+  'login',
+  'logout',
+  'maintenance',
+  'malware',
+  'newsletter',
+  'policy',
+  'privacy',
+  'profile',
+  'public',
+  'reset-password',
+  'scam',
+  'scammer',
+  'settings',
+  'setup',
+  'sign',
+  'signin',
+  'signout',
+  'signup',
+  'spam',
+  'support',
+  'system',
+  'organisation',
+  'terms',
+  'virus',
+  'webhook',
+];
+
+export const isOrganisationUrlProtected = (url: string) => {
+  return PROTECTED_ORGANISATION_URLS.some((protectedUrl) => url.startsWith(`/${protectedUrl}`));
+};
diff --git a/packages/lib/constants/teams-translations.ts b/packages/lib/constants/teams-translations.ts
new file mode 100644
index 000000000..65678afa7
--- /dev/null
+++ b/packages/lib/constants/teams-translations.ts
@@ -0,0 +1,16 @@
+import type { MessageDescriptor } from '@lingui/core';
+import { msg } from '@lingui/core/macro';
+import type { TeamMemberRole } from '@prisma/client';
+
+export const TEAM_MEMBER_ROLE_MAP: Record<keyof typeof TeamMemberRole, MessageDescriptor> = {
+  ADMIN: msg`Admin`,
+  MANAGER: msg`Manager`,
+  MEMBER: msg`Member`,
+};
+
+export const EXTENDED_TEAM_MEMBER_ROLE_MAP: Record<keyof typeof TeamMemberRole, MessageDescriptor> =
+  {
+    ADMIN: msg`Team Admin`,
+    MANAGER: msg`Team Manager`,
+    MEMBER: msg`Team Member`,
+  };
diff --git a/packages/lib/constants/teams.ts b/packages/lib/constants/teams.ts
index 3c0cc3046..3a2fecbc1 100644
--- a/packages/lib/constants/teams.ts
+++ b/packages/lib/constants/teams.ts
@@ -1,29 +1,43 @@
-import type { MessageDescriptor } from '@lingui/core';
-import { msg } from '@lingui/core/macro';
-import { TeamMemberRole } from '@prisma/client';
+import { OrganisationGroupType, TeamMemberRole } from '@prisma/client';
 
 export const TEAM_URL_ROOT_REGEX = new RegExp('^/t/[^/]+/?$');
 export const TEAM_URL_REGEX = new RegExp('^/t/[^/]+');
 
-export const TEAM_MEMBER_ROLE_MAP: Record<keyof typeof TeamMemberRole, MessageDescriptor> = {
-  ADMIN: msg`Admin`,
-  MANAGER: msg`Manager`,
-  MEMBER: msg`Member`,
-};
+export const LOWEST_TEAM_ROLE = TeamMemberRole.MEMBER;
+
+export const ALLOWED_TEAM_GROUP_TYPES: OrganisationGroupType[] = [
+  OrganisationGroupType.CUSTOM,
+  OrganisationGroupType.INTERNAL_ORGANISATION,
+];
+
+export const TEAM_INTERNAL_GROUPS: {
+  teamRole: TeamMemberRole;
+  type: OrganisationGroupType;
+}[] = [
+  {
+    teamRole: TeamMemberRole.ADMIN,
+    type: OrganisationGroupType.INTERNAL_TEAM,
+  },
+  {
+    teamRole: TeamMemberRole.MANAGER,
+    type: OrganisationGroupType.INTERNAL_TEAM,
+  },
+  {
+    teamRole: TeamMemberRole.MEMBER,
+    type: OrganisationGroupType.INTERNAL_TEAM,
+  },
+] as const;
 
 export const TEAM_MEMBER_ROLE_PERMISSIONS_MAP = {
-  /**
-   * Includes permissions to:
-   * - Manage team members
-   * - Manage team settings, changing name, url, etc.
-   */
+  DELETE_TEAM: [TeamMemberRole.ADMIN],
   MANAGE_TEAM: [TeamMemberRole.ADMIN, TeamMemberRole.MANAGER],
-  MANAGE_BILLING: [TeamMemberRole.ADMIN],
-  DELETE_TEAM_TRANSFER_REQUEST: [TeamMemberRole.ADMIN],
 } satisfies Record<string, TeamMemberRole[]>;
 
 /**
  * A hierarchy of team member roles to determine which role has higher permission than another.
+ *
+ * Warning: The length of the array is used to determine the priority of the role.
+ * See `getHighestTeamRoleInGroup`
  */
 export const TEAM_MEMBER_ROLE_HIERARCHY = {
   [TeamMemberRole.ADMIN]: [TeamMemberRole.ADMIN, TeamMemberRole.MANAGER, TeamMemberRole.MEMBER],
diff --git a/packages/lib/jobs/client.ts b/packages/lib/jobs/client.ts
index 8b857b66f..857ed20cd 100644
--- a/packages/lib/jobs/client.ts
+++ b/packages/lib/jobs/client.ts
@@ -1,13 +1,14 @@
 import { JobClient } from './client/client';
 import { SEND_CONFIRMATION_EMAIL_JOB_DEFINITION } from './definitions/emails/send-confirmation-email';
 import { SEND_DOCUMENT_CANCELLED_EMAILS_JOB_DEFINITION } from './definitions/emails/send-document-cancelled-emails';
+import { SEND_ORGANISATION_MEMBER_JOINED_EMAIL_JOB_DEFINITION } from './definitions/emails/send-organisation-member-joined-email';
+import { SEND_ORGANISATION_MEMBER_LEFT_EMAIL_JOB_DEFINITION } from './definitions/emails/send-organisation-member-left-email';
 import { SEND_PASSWORD_RESET_SUCCESS_EMAIL_JOB_DEFINITION } from './definitions/emails/send-password-reset-success-email';
 import { SEND_RECIPIENT_SIGNED_EMAIL_JOB_DEFINITION } from './definitions/emails/send-recipient-signed-email';
 import { SEND_SIGNING_REJECTION_EMAILS_JOB_DEFINITION } from './definitions/emails/send-rejection-emails';
 import { SEND_SIGNING_EMAIL_JOB_DEFINITION } from './definitions/emails/send-signing-email';
 import { SEND_TEAM_DELETED_EMAIL_JOB_DEFINITION } from './definitions/emails/send-team-deleted-email';
-import { SEND_TEAM_MEMBER_JOINED_EMAIL_JOB_DEFINITION } from './definitions/emails/send-team-member-joined-email';
-import { SEND_TEAM_MEMBER_LEFT_EMAIL_JOB_DEFINITION } from './definitions/emails/send-team-member-left-email';
+import { BACKPORT_SUBSCRIPTION_CLAIM_JOB_DEFINITION } from './definitions/internal/backport-subscription-claims';
 import { BULK_SEND_TEMPLATE_JOB_DEFINITION } from './definitions/internal/bulk-send-template';
 import { EXECUTE_WEBHOOK_JOB_DEFINITION } from './definitions/internal/execute-webhook';
 import { SEAL_DOCUMENT_JOB_DEFINITION } from './definitions/internal/seal-document';
@@ -19,14 +20,15 @@ import { SEAL_DOCUMENT_JOB_DEFINITION } from './definitions/internal/seal-docume
 export const jobsClient = new JobClient([
   SEND_SIGNING_EMAIL_JOB_DEFINITION,
   SEND_CONFIRMATION_EMAIL_JOB_DEFINITION,
-  SEND_TEAM_MEMBER_JOINED_EMAIL_JOB_DEFINITION,
-  SEND_TEAM_MEMBER_LEFT_EMAIL_JOB_DEFINITION,
+  SEND_ORGANISATION_MEMBER_JOINED_EMAIL_JOB_DEFINITION,
+  SEND_ORGANISATION_MEMBER_LEFT_EMAIL_JOB_DEFINITION,
   SEND_TEAM_DELETED_EMAIL_JOB_DEFINITION,
   SEAL_DOCUMENT_JOB_DEFINITION,
   SEND_PASSWORD_RESET_SUCCESS_EMAIL_JOB_DEFINITION,
   SEND_SIGNING_REJECTION_EMAILS_JOB_DEFINITION,
   SEND_RECIPIENT_SIGNED_EMAIL_JOB_DEFINITION,
   SEND_DOCUMENT_CANCELLED_EMAILS_JOB_DEFINITION,
+  BACKPORT_SUBSCRIPTION_CLAIM_JOB_DEFINITION,
   BULK_SEND_TEMPLATE_JOB_DEFINITION,
   EXECUTE_WEBHOOK_JOB_DEFINITION,
 ] as const);
diff --git a/packages/lib/jobs/definitions/emails/send-bulk-complete-email.ts b/packages/lib/jobs/definitions/emails/send-bulk-complete-email.ts
deleted file mode 100644
index a16def8cf..000000000
--- a/packages/lib/jobs/definitions/emails/send-bulk-complete-email.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { z } from 'zod';
-
-import { ZRequestMetadataSchema } from '../../../universal/extract-request-metadata';
-import { type JobDefinition } from '../../client/_internal/job';
-
-const SEND_BULK_COMPLETE_EMAIL_JOB_DEFINITION_ID = 'send.bulk.complete.email';
-
-const SEND_BULK_COMPLETE_EMAIL_JOB_DEFINITION_SCHEMA = z.object({
-  userId: z.number(),
-  templateId: z.number(),
-  templateName: z.string(),
-  totalProcessed: z.number(),
-  successCount: z.number(),
-  failedCount: z.number(),
-  errors: z.array(z.string()),
-  requestMetadata: ZRequestMetadataSchema.optional(),
-});
-
-export type TSendBulkCompleteEmailJobDefinition = z.infer<
-  typeof SEND_BULK_COMPLETE_EMAIL_JOB_DEFINITION_SCHEMA
->;
-
-export const SEND_BULK_COMPLETE_EMAIL_JOB_DEFINITION = {
-  id: SEND_BULK_COMPLETE_EMAIL_JOB_DEFINITION_ID,
-  name: 'Send Bulk Complete Email',
-  version: '1.0.0',
-  trigger: {
-    name: SEND_BULK_COMPLETE_EMAIL_JOB_DEFINITION_ID,
-    schema: SEND_BULK_COMPLETE_EMAIL_JOB_DEFINITION_SCHEMA,
-  },
-  handler: async ({ payload, io }) => {
-    const handler = await import('./send-bulk-complete-email.handler');
-
-    await handler.run({ payload, io });
-  },
-} as const satisfies JobDefinition<
-  typeof SEND_BULK_COMPLETE_EMAIL_JOB_DEFINITION_ID,
-  TSendBulkCompleteEmailJobDefinition
->;
diff --git a/packages/lib/jobs/definitions/emails/send-document-cancelled-emails.handler.ts b/packages/lib/jobs/definitions/emails/send-document-cancelled-emails.handler.ts
index 93194a2e1..245d34463 100644
--- a/packages/lib/jobs/definitions/emails/send-document-cancelled-emails.handler.ts
+++ b/packages/lib/jobs/definitions/emails/send-document-cancelled-emails.handler.ts
@@ -10,9 +10,9 @@ import { prisma } from '@documenso/prisma';
 import { getI18nInstance } from '../../../client-only/providers/i18n-server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
+import { getEmailContext } from '../../../server-only/email/get-email-context';
 import { extractDerivedDocumentEmailSettings } from '../../../types/document-email';
 import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
 import type { JobRunIO } from '../../client/_internal/job';
 import type { TSendDocumentCancelledEmailsJobDefinition } from './send-document-cancelled-emails';
 
@@ -38,12 +38,18 @@ export const run = async ({
           teamEmail: true,
           name: true,
           url: true,
-          teamGlobalSettings: true,
         },
       },
     },
   });
 
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'team',
+      teamId: document.teamId,
+    },
+  });
+
   const { documentMeta, user: documentOwner } = document;
 
   // Check if document cancellation emails are enabled
@@ -53,7 +59,9 @@ export const run = async ({
     return;
   }
 
-  const i18n = await getI18nInstance(documentMeta?.language);
+  const lang = documentMeta?.language ?? settings.documentLanguage;
+
+  const i18n = await getI18nInstance(lang);
 
   // Send cancellation emails to all recipients who have been sent the document or viewed it
   const recipientsToNotify = document.recipients.filter(
@@ -73,14 +81,10 @@ export const run = async ({
           cancellationReason: cancellationReason || 'The document has been cancelled.',
         });
 
-        const branding = document.team?.teamGlobalSettings
-          ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-          : undefined;
-
         const [html, text] = await Promise.all([
-          renderEmailWithI18N(template, { lang: documentMeta?.language, branding }),
+          renderEmailWithI18N(template, { lang, branding }),
           renderEmailWithI18N(template, {
-            lang: documentMeta?.language,
+            lang,
             branding,
             plainText: true,
           }),
diff --git a/packages/lib/jobs/definitions/emails/send-team-member-joined-email.handler.ts b/packages/lib/jobs/definitions/emails/send-organisation-member-joined-email.handler.ts
similarity index 54%
rename from packages/lib/jobs/definitions/emails/send-team-member-joined-email.handler.ts
rename to packages/lib/jobs/definitions/emails/send-organisation-member-joined-email.handler.ts
index 08281fd2e..37b1db387 100644
--- a/packages/lib/jobs/definitions/emails/send-team-member-joined-email.handler.ts
+++ b/packages/lib/jobs/definitions/emails/send-organisation-member-joined-email.handler.ts
@@ -1,78 +1,86 @@
 import { createElement } from 'react';
 
 import { msg } from '@lingui/core/macro';
-import { TeamMemberRole } from '@prisma/client';
 
 import { mailer } from '@documenso/email/mailer';
-import TeamJoinEmailTemplate from '@documenso/email/templates/team-join';
+import OrganisationJoinEmailTemplate from '@documenso/email/templates/organisation-join';
 import { prisma } from '@documenso/prisma';
 
 import { getI18nInstance } from '../../../client-only/providers/i18n-server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '../../../constants/organisations';
+import { getEmailContext } from '../../../server-only/email/get-email-context';
 import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
 import type { JobRunIO } from '../../client/_internal/job';
-import type { TSendTeamMemberJoinedEmailJobDefinition } from './send-team-member-joined-email';
+import type { TSendOrganisationMemberJoinedEmailJobDefinition } from './send-organisation-member-joined-email';
 
 export const run = async ({
   payload,
   io,
 }: {
-  payload: TSendTeamMemberJoinedEmailJobDefinition;
+  payload: TSendOrganisationMemberJoinedEmailJobDefinition;
   io: JobRunIO;
 }) => {
-  const team = await prisma.team.findFirstOrThrow({
+  const organisation = await prisma.organisation.findFirstOrThrow({
     where: {
-      id: payload.teamId,
+      id: payload.organisationId,
     },
     include: {
       members: {
         where: {
-          role: {
-            in: [TeamMemberRole.ADMIN, TeamMemberRole.MANAGER],
+          organisationGroupMembers: {
+            some: {
+              group: {
+                organisationRole: {
+                  in: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+                },
+              },
+            },
           },
         },
         include: {
           user: true,
         },
       },
-      teamGlobalSettings: true,
     },
   });
 
-  const invitedMember = await prisma.teamMember.findFirstOrThrow({
+  const invitedMember = await prisma.organisationMember.findFirstOrThrow({
     where: {
-      id: payload.memberId,
-      teamId: payload.teamId,
+      userId: payload.memberUserId,
+      organisationId: payload.organisationId,
     },
     include: {
       user: true,
     },
   });
 
-  for (const member of team.members) {
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'organisation',
+      organisationId: organisation.id,
+    },
+  });
+
+  for (const member of organisation.members) {
     if (member.id === invitedMember.id) {
       continue;
     }
 
     await io.runTask(
-      `send-team-member-joined-email--${invitedMember.id}_${member.id}`,
+      `send-organisation-member-joined-email--${invitedMember.id}_${member.id}`,
       async () => {
-        const emailContent = createElement(TeamJoinEmailTemplate, {
+        const emailContent = createElement(OrganisationJoinEmailTemplate, {
           assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
           baseUrl: NEXT_PUBLIC_WEBAPP_URL(),
           memberName: invitedMember.user.name || '',
           memberEmail: invitedMember.user.email,
-          teamName: team.name,
-          teamUrl: team.url,
+          organisationName: organisation.name,
+          organisationUrl: organisation.url,
         });
 
-        const branding = team.teamGlobalSettings
-          ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
-          : undefined;
-
-        const lang = team.teamGlobalSettings?.documentLanguage;
+        const lang = settings.documentLanguage;
 
         // !: Replace with the actual language of the recipient later
         const [html, text] = await Promise.all([
@@ -95,7 +103,7 @@ export const run = async ({
             name: FROM_NAME,
             address: FROM_ADDRESS,
           },
-          subject: i18n._(msg`A new member has joined your team`),
+          subject: i18n._(msg`A new member has joined your organisation`),
           html,
           text,
         });
diff --git a/packages/lib/jobs/definitions/emails/send-organisation-member-joined-email.ts b/packages/lib/jobs/definitions/emails/send-organisation-member-joined-email.ts
new file mode 100644
index 000000000..851ee6b5f
--- /dev/null
+++ b/packages/lib/jobs/definitions/emails/send-organisation-member-joined-email.ts
@@ -0,0 +1,33 @@
+import { z } from 'zod';
+
+import type { JobDefinition } from '../../client/_internal/job';
+
+const SEND_ORGANISATION_MEMBER_JOINED_EMAIL_JOB_DEFINITION_ID =
+  'send.organisation-member-joined.email';
+
+const SEND_ORGANISATION_MEMBER_JOINED_EMAIL_JOB_DEFINITION_SCHEMA = z.object({
+  organisationId: z.string(),
+  memberUserId: z.number(),
+});
+
+export type TSendOrganisationMemberJoinedEmailJobDefinition = z.infer<
+  typeof SEND_ORGANISATION_MEMBER_JOINED_EMAIL_JOB_DEFINITION_SCHEMA
+>;
+
+export const SEND_ORGANISATION_MEMBER_JOINED_EMAIL_JOB_DEFINITION = {
+  id: SEND_ORGANISATION_MEMBER_JOINED_EMAIL_JOB_DEFINITION_ID,
+  name: 'Send Organisation Member Joined Email',
+  version: '1.0.0',
+  trigger: {
+    name: SEND_ORGANISATION_MEMBER_JOINED_EMAIL_JOB_DEFINITION_ID,
+    schema: SEND_ORGANISATION_MEMBER_JOINED_EMAIL_JOB_DEFINITION_SCHEMA,
+  },
+  handler: async ({ payload, io }) => {
+    const handler = await import('./send-organisation-member-joined-email.handler');
+
+    await handler.run({ payload, io });
+  },
+} as const satisfies JobDefinition<
+  typeof SEND_ORGANISATION_MEMBER_JOINED_EMAIL_JOB_DEFINITION_ID,
+  TSendOrganisationMemberJoinedEmailJobDefinition
+>;
diff --git a/packages/lib/jobs/definitions/emails/send-organisation-member-left-email.handler.ts b/packages/lib/jobs/definitions/emails/send-organisation-member-left-email.handler.ts
new file mode 100644
index 000000000..9ce4162ab
--- /dev/null
+++ b/packages/lib/jobs/definitions/emails/send-organisation-member-left-email.handler.ts
@@ -0,0 +1,108 @@
+import { createElement } from 'react';
+
+import { msg } from '@lingui/core/macro';
+
+import { mailer } from '@documenso/email/mailer';
+import OrganisationLeaveEmailTemplate from '@documenso/email/templates/organisation-leave';
+import { prisma } from '@documenso/prisma';
+
+import { getI18nInstance } from '../../../client-only/providers/i18n-server';
+import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
+import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '../../../constants/organisations';
+import { getEmailContext } from '../../../server-only/email/get-email-context';
+import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
+import type { JobRunIO } from '../../client/_internal/job';
+import type { TSendOrganisationMemberLeftEmailJobDefinition } from './send-organisation-member-left-email';
+
+export const run = async ({
+  payload,
+  io,
+}: {
+  payload: TSendOrganisationMemberLeftEmailJobDefinition;
+  io: JobRunIO;
+}) => {
+  const organisation = await prisma.organisation.findFirstOrThrow({
+    where: {
+      id: payload.organisationId,
+    },
+    include: {
+      members: {
+        where: {
+          organisationGroupMembers: {
+            some: {
+              group: {
+                organisationRole: {
+                  in: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+                },
+              },
+            },
+          },
+        },
+        include: {
+          user: true,
+        },
+      },
+    },
+  });
+
+  const oldMember = await prisma.user.findFirstOrThrow({
+    where: {
+      id: payload.memberUserId,
+    },
+  });
+
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'organisation',
+      organisationId: organisation.id,
+    },
+  });
+
+  for (const member of organisation.members) {
+    if (member.userId === oldMember.id) {
+      continue;
+    }
+
+    await io.runTask(
+      `send-organisation-member-left-email--${oldMember.id}_${member.id}`,
+      async () => {
+        const emailContent = createElement(OrganisationLeaveEmailTemplate, {
+          assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
+          baseUrl: NEXT_PUBLIC_WEBAPP_URL(),
+          memberName: oldMember.name || '',
+          memberEmail: oldMember.email,
+          organisationName: organisation.name,
+          organisationUrl: organisation.url,
+        });
+
+        const lang = settings.documentLanguage;
+
+        const [html, text] = await Promise.all([
+          renderEmailWithI18N(emailContent, {
+            lang,
+            branding,
+          }),
+          renderEmailWithI18N(emailContent, {
+            lang,
+            branding,
+            plainText: true,
+          }),
+        ]);
+
+        const i18n = await getI18nInstance(lang);
+
+        await mailer.sendMail({
+          to: member.user.email,
+          from: {
+            name: FROM_NAME,
+            address: FROM_ADDRESS,
+          },
+          subject: i18n._(msg`A member has left your organisation`),
+          html,
+          text,
+        });
+      },
+    );
+  }
+};
diff --git a/packages/lib/jobs/definitions/emails/send-organisation-member-left-email.ts b/packages/lib/jobs/definitions/emails/send-organisation-member-left-email.ts
new file mode 100644
index 000000000..f9278688e
--- /dev/null
+++ b/packages/lib/jobs/definitions/emails/send-organisation-member-left-email.ts
@@ -0,0 +1,32 @@
+import { z } from 'zod';
+
+import type { JobDefinition } from '../../client/_internal/job';
+
+const SEND_ORGANISATION_MEMBER_LEFT_EMAIL_JOB_DEFINITION_ID = 'send.organisation-member-left.email';
+
+const SEND_ORGANISATION_MEMBER_LEFT_EMAIL_JOB_DEFINITION_SCHEMA = z.object({
+  organisationId: z.string(),
+  memberUserId: z.number(),
+});
+
+export type TSendOrganisationMemberLeftEmailJobDefinition = z.infer<
+  typeof SEND_ORGANISATION_MEMBER_LEFT_EMAIL_JOB_DEFINITION_SCHEMA
+>;
+
+export const SEND_ORGANISATION_MEMBER_LEFT_EMAIL_JOB_DEFINITION = {
+  id: SEND_ORGANISATION_MEMBER_LEFT_EMAIL_JOB_DEFINITION_ID,
+  name: 'Send Organisation Member Left Email',
+  version: '1.0.0',
+  trigger: {
+    name: SEND_ORGANISATION_MEMBER_LEFT_EMAIL_JOB_DEFINITION_ID,
+    schema: SEND_ORGANISATION_MEMBER_LEFT_EMAIL_JOB_DEFINITION_SCHEMA,
+  },
+  handler: async ({ payload, io }) => {
+    const handler = await import('./send-organisation-member-left-email.handler');
+
+    await handler.run({ payload, io });
+  },
+} as const satisfies JobDefinition<
+  typeof SEND_ORGANISATION_MEMBER_LEFT_EMAIL_JOB_DEFINITION_ID,
+  TSendOrganisationMemberLeftEmailJobDefinition
+>;
diff --git a/packages/lib/jobs/definitions/emails/send-recipient-signed-email.handler.ts b/packages/lib/jobs/definitions/emails/send-recipient-signed-email.handler.ts
index e32e9b306..6c094c606 100644
--- a/packages/lib/jobs/definitions/emails/send-recipient-signed-email.handler.ts
+++ b/packages/lib/jobs/definitions/emails/send-recipient-signed-email.handler.ts
@@ -9,9 +9,9 @@ import { prisma } from '@documenso/prisma';
 import { getI18nInstance } from '../../../client-only/providers/i18n-server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
+import { getEmailContext } from '../../../server-only/email/get-email-context';
 import { extractDerivedDocumentEmailSettings } from '../../../types/document-email';
 import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
 import type { JobRunIO } from '../../client/_internal/job';
 import type { TSendRecipientSignedEmailJobDefinition } from './send-recipient-signed-email';
 
@@ -41,11 +41,6 @@ export const run = async ({
       },
       user: true,
       documentMeta: true,
-      team: {
-        include: {
-          teamGlobalSettings: true,
-        },
-      },
     },
   });
 
@@ -76,8 +71,17 @@ export const run = async ({
     return;
   }
 
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'team',
+      teamId: document.teamId,
+    },
+  });
+
   const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';
-  const i18n = await getI18nInstance(document.documentMeta?.language);
+
+  const lang = document.documentMeta?.language ?? settings.documentLanguage;
+  const i18n = await getI18nInstance(lang);
 
   const template = createElement(DocumentRecipientSignedEmailTemplate, {
     documentName: document.title,
@@ -87,14 +91,10 @@ export const run = async ({
   });
 
   await io.runTask('send-recipient-signed-email', async () => {
-    const branding = document.team?.teamGlobalSettings
-      ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-      : undefined;
-
     const [html, text] = await Promise.all([
-      renderEmailWithI18N(template, { lang: document.documentMeta?.language, branding }),
+      renderEmailWithI18N(template, { lang, branding }),
       renderEmailWithI18N(template, {
-        lang: document.documentMeta?.language,
+        lang,
         branding,
         plainText: true,
       }),
diff --git a/packages/lib/jobs/definitions/emails/send-rejection-emails.handler.ts b/packages/lib/jobs/definitions/emails/send-rejection-emails.handler.ts
index 958151638..25ff654a7 100644
--- a/packages/lib/jobs/definitions/emails/send-rejection-emails.handler.ts
+++ b/packages/lib/jobs/definitions/emails/send-rejection-emails.handler.ts
@@ -11,9 +11,9 @@ import { prisma } from '@documenso/prisma';
 import { getI18nInstance } from '../../../client-only/providers/i18n-server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
+import { getEmailContext } from '../../../server-only/email/get-email-context';
 import { extractDerivedDocumentEmailSettings } from '../../../types/document-email';
 import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
 import { formatDocumentsPath } from '../../../utils/teams';
 import type { JobRunIO } from '../../client/_internal/job';
 import type { TSendSigningRejectionEmailsJobDefinition } from './send-rejection-emails';
@@ -40,7 +40,6 @@ export const run = async ({
             teamEmail: true,
             name: true,
             url: true,
-            teamGlobalSettings: true,
           },
         },
       },
@@ -63,7 +62,16 @@ export const run = async ({
     return;
   }
 
-  const i18n = await getI18nInstance(documentMeta?.language);
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'team',
+      teamId: document.teamId,
+    },
+  });
+
+  const lang = documentMeta?.language ?? settings.documentLanguage;
+
+  const i18n = await getI18nInstance(lang);
 
   // Send confirmation email to the recipient who rejected
   await io.runTask('send-rejection-confirmation-email', async () => {
@@ -75,14 +83,10 @@ export const run = async ({
       assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
     });
 
-    const branding = document.team?.teamGlobalSettings
-      ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-      : undefined;
-
     const [html, text] = await Promise.all([
-      renderEmailWithI18N(recipientTemplate, { lang: documentMeta?.language, branding }),
+      renderEmailWithI18N(recipientTemplate, { lang, branding }),
       renderEmailWithI18N(recipientTemplate, {
-        lang: documentMeta?.language,
+        lang,
         branding,
         plainText: true,
       }),
@@ -115,14 +119,10 @@ export const run = async ({
       assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
     });
 
-    const branding = document.team?.teamGlobalSettings
-      ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-      : undefined;
-
     const [html, text] = await Promise.all([
-      renderEmailWithI18N(ownerTemplate, { lang: documentMeta?.language, branding }),
+      renderEmailWithI18N(ownerTemplate, { lang, branding }),
       renderEmailWithI18N(ownerTemplate, {
-        lang: documentMeta?.language,
+        lang,
         branding,
         plainText: true,
       }),
diff --git a/packages/lib/jobs/definitions/emails/send-signing-email.handler.ts b/packages/lib/jobs/definitions/emails/send-signing-email.handler.ts
index fc8ce2148..edc585a11 100644
--- a/packages/lib/jobs/definitions/emails/send-signing-email.handler.ts
+++ b/packages/lib/jobs/definitions/emails/send-signing-email.handler.ts
@@ -1,7 +1,13 @@
 import { createElement } from 'react';
 
 import { msg } from '@lingui/core/macro';
-import { DocumentSource, DocumentStatus, RecipientRole, SendStatus } from '@prisma/client';
+import {
+  DocumentSource,
+  DocumentStatus,
+  OrganisationType,
+  RecipientRole,
+  SendStatus,
+} from '@prisma/client';
 
 import { mailer } from '@documenso/email/mailer';
 import DocumentInviteEmailTemplate from '@documenso/email/templates/document-invite';
@@ -14,12 +20,12 @@ import {
   RECIPIENT_ROLES_DESCRIPTION,
   RECIPIENT_ROLE_TO_EMAIL_TYPE,
 } from '../../../constants/recipient-roles';
+import { getEmailContext } from '../../../server-only/email/get-email-context';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '../../../types/document-audit-logs';
 import { extractDerivedDocumentEmailSettings } from '../../../types/document-email';
 import { createDocumentAuditLogData } from '../../../utils/document-audit-logs';
 import { renderCustomEmailTemplate } from '../../../utils/render-custom-email-template';
 import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
 import type { JobRunIO } from '../../client/_internal/job';
 import type { TSendSigningEmailJobDefinition } from './send-signing-email';
 
@@ -49,7 +55,6 @@ export const run = async ({
           select: {
             teamEmail: true,
             name: true,
-            teamGlobalSettings: true,
           },
         },
       },
@@ -75,16 +80,24 @@ export const run = async ({
     return;
   }
 
+  const { branding, settings, organisationType } = await getEmailContext({
+    source: {
+      type: 'team',
+      teamId: document.teamId,
+    },
+  });
+
   const customEmail = document?.documentMeta;
   const isDirectTemplate = document.source === DocumentSource.TEMPLATE_DIRECT_LINK;
-  const isTeamDocument = document.teamId !== null;
 
   const recipientEmailType = RECIPIENT_ROLE_TO_EMAIL_TYPE[recipient.role];
 
   const { email, name } = recipient;
   const selfSigner = email === user.email;
 
-  const i18n = await getI18nInstance(documentMeta?.language);
+  const lang = documentMeta?.language ?? settings.documentLanguage;
+
+  const i18n = await getI18nInstance(lang);
 
   const recipientActionVerb = i18n
     ._(RECIPIENT_ROLES_DESCRIPTION[recipient.role].actionVerb)
@@ -109,7 +122,7 @@ export const run = async ({
     );
   }
 
-  if (isTeamDocument && team) {
+  if (organisationType === OrganisationType.ORGANISATION) {
     emailSubject = i18n._(msg`${team.name} invited you to ${recipientActionVerb} a document`);
     emailMessage = customEmail?.message ?? '';
 
@@ -117,7 +130,7 @@ export const run = async ({
       const inviterName = user.name || '';
 
       emailMessage = i18n._(
-        team.teamGlobalSettings?.includeSenderDetails
+        settings.includeSenderDetails
           ? msg`${inviterName} on behalf of "${team.name}" has invited you to ${recipientActionVerb} the document "${document.title}".`
           : msg`${team.name} has invited you to ${recipientActionVerb} the document "${document.title}".`,
       );
@@ -136,27 +149,26 @@ export const run = async ({
   const template = createElement(DocumentInviteEmailTemplate, {
     documentName: document.title,
     inviterName: user.name || undefined,
-    inviterEmail: isTeamDocument ? team?.teamEmail?.email || user.email : user.email,
+    inviterEmail:
+      organisationType === OrganisationType.ORGANISATION
+        ? team?.teamEmail?.email || user.email
+        : user.email,
     assetBaseUrl,
     signDocumentLink,
     customBody: renderCustomEmailTemplate(emailMessage, customEmailTemplate),
     role: recipient.role,
     selfSigner,
-    isTeamInvite: isTeamDocument,
+    organisationType,
     teamName: team?.name,
     teamEmail: team?.teamEmail?.email,
-    includeSenderDetails: team?.teamGlobalSettings?.includeSenderDetails,
+    includeSenderDetails: settings.includeSenderDetails,
   });
 
   await io.runTask('send-signing-email', async () => {
-    const branding = document.team?.teamGlobalSettings
-      ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-      : undefined;
-
     const [html, text] = await Promise.all([
-      renderEmailWithI18N(template, { lang: documentMeta?.language, branding }),
+      renderEmailWithI18N(template, { lang, branding }),
       renderEmailWithI18N(template, {
-        lang: documentMeta?.language,
+        lang,
         branding,
         plainText: true,
       }),
diff --git a/packages/lib/jobs/definitions/emails/send-team-deleted-email.handler.ts b/packages/lib/jobs/definitions/emails/send-team-deleted-email.handler.ts
index c3b98188d..0b304bc9b 100644
--- a/packages/lib/jobs/definitions/emails/send-team-deleted-email.handler.ts
+++ b/packages/lib/jobs/definitions/emails/send-team-deleted-email.handler.ts
@@ -9,14 +9,14 @@ export const run = async ({
   payload: TSendTeamDeletedEmailJobDefinition;
   io: JobRunIO;
 }) => {
-  const { team, members } = payload;
+  const { team, members, organisationId } = payload;
 
   for (const member of members) {
     await io.runTask(`send-team-deleted-email--${team.url}_${member.id}`, async () => {
       await sendTeamDeleteEmail({
         email: member.email,
         team,
-        isOwner: member.id === team.ownerUserId,
+        organisationId,
       });
     });
   }
diff --git a/packages/lib/jobs/definitions/emails/send-team-deleted-email.ts b/packages/lib/jobs/definitions/emails/send-team-deleted-email.ts
index 1475a531e..128f2c1c0 100644
--- a/packages/lib/jobs/definitions/emails/send-team-deleted-email.ts
+++ b/packages/lib/jobs/definitions/emails/send-team-deleted-email.ts
@@ -1,4 +1,3 @@
-import { DocumentVisibility } from '@prisma/client';
 import { z } from 'zod';
 
 import type { JobDefinition } from '../../client/_internal/job';
@@ -6,28 +5,10 @@ import type { JobDefinition } from '../../client/_internal/job';
 const SEND_TEAM_DELETED_EMAIL_JOB_DEFINITION_ID = 'send.team-deleted.email';
 
 const SEND_TEAM_DELETED_EMAIL_JOB_DEFINITION_SCHEMA = z.object({
+  organisationId: z.string(),
   team: z.object({
     name: z.string(),
     url: z.string(),
-    ownerUserId: z.number(),
-    teamGlobalSettings: z
-      .object({
-        documentVisibility: z.nativeEnum(DocumentVisibility),
-        documentLanguage: z.string(),
-        includeSenderDetails: z.boolean(),
-        includeSigningCertificate: z.boolean(),
-        brandingEnabled: z.boolean(),
-        brandingLogo: z.string(),
-        brandingUrl: z.string(),
-        brandingCompanyDetails: z.string(),
-        brandingHidePoweredBy: z.boolean(),
-        teamId: z.number(),
-        typedSignatureEnabled: z.boolean(),
-        uploadSignatureEnabled: z.boolean(),
-        drawSignatureEnabled: z.boolean(),
-        allowEmbeddedAuthoring: z.boolean(),
-      })
-      .nullish(),
   }),
   members: z.array(
     z.object({
diff --git a/packages/lib/jobs/definitions/emails/send-team-member-joined-email.ts b/packages/lib/jobs/definitions/emails/send-team-member-joined-email.ts
deleted file mode 100644
index 258e7a34e..000000000
--- a/packages/lib/jobs/definitions/emails/send-team-member-joined-email.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { z } from 'zod';
-
-import type { JobDefinition } from '../../client/_internal/job';
-
-const SEND_TEAM_MEMBER_JOINED_EMAIL_JOB_DEFINITION_ID = 'send.team-member-joined.email';
-
-const SEND_TEAM_MEMBER_JOINED_EMAIL_JOB_DEFINITION_SCHEMA = z.object({
-  teamId: z.number(),
-  memberId: z.number(),
-});
-
-export type TSendTeamMemberJoinedEmailJobDefinition = z.infer<
-  typeof SEND_TEAM_MEMBER_JOINED_EMAIL_JOB_DEFINITION_SCHEMA
->;
-
-export const SEND_TEAM_MEMBER_JOINED_EMAIL_JOB_DEFINITION = {
-  id: SEND_TEAM_MEMBER_JOINED_EMAIL_JOB_DEFINITION_ID,
-  name: 'Send Team Member Joined Email',
-  version: '1.0.0',
-  trigger: {
-    name: SEND_TEAM_MEMBER_JOINED_EMAIL_JOB_DEFINITION_ID,
-    schema: SEND_TEAM_MEMBER_JOINED_EMAIL_JOB_DEFINITION_SCHEMA,
-  },
-  handler: async ({ payload, io }) => {
-    const handler = await import('./send-team-member-joined-email.handler');
-
-    await handler.run({ payload, io });
-  },
-} as const satisfies JobDefinition<
-  typeof SEND_TEAM_MEMBER_JOINED_EMAIL_JOB_DEFINITION_ID,
-  TSendTeamMemberJoinedEmailJobDefinition
->;
diff --git a/packages/lib/jobs/definitions/emails/send-team-member-left-email.handler.ts b/packages/lib/jobs/definitions/emails/send-team-member-left-email.handler.ts
deleted file mode 100644
index 3f1a1806e..000000000
--- a/packages/lib/jobs/definitions/emails/send-team-member-left-email.handler.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { createElement } from 'react';
-
-import { msg } from '@lingui/core/macro';
-import { TeamMemberRole } from '@prisma/client';
-
-import { mailer } from '@documenso/email/mailer';
-import TeamJoinEmailTemplate from '@documenso/email/templates/team-join';
-import { prisma } from '@documenso/prisma';
-
-import { getI18nInstance } from '../../../client-only/providers/i18n-server';
-import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
-import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
-import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
-import type { JobRunIO } from '../../client/_internal/job';
-import type { TSendTeamMemberLeftEmailJobDefinition } from './send-team-member-left-email';
-
-export const run = async ({
-  payload,
-  io,
-}: {
-  payload: TSendTeamMemberLeftEmailJobDefinition;
-  io: JobRunIO;
-}) => {
-  const team = await prisma.team.findFirstOrThrow({
-    where: {
-      id: payload.teamId,
-    },
-    include: {
-      members: {
-        where: {
-          role: {
-            in: [TeamMemberRole.ADMIN, TeamMemberRole.MANAGER],
-          },
-        },
-        include: {
-          user: true,
-        },
-      },
-      teamGlobalSettings: true,
-    },
-  });
-
-  const oldMember = await prisma.user.findFirstOrThrow({
-    where: {
-      id: payload.memberUserId,
-    },
-  });
-
-  for (const member of team.members) {
-    await io.runTask(`send-team-member-left-email--${oldMember.id}_${member.id}`, async () => {
-      const emailContent = createElement(TeamJoinEmailTemplate, {
-        assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
-        baseUrl: NEXT_PUBLIC_WEBAPP_URL(),
-        memberName: oldMember.name || '',
-        memberEmail: oldMember.email,
-        teamName: team.name,
-        teamUrl: team.url,
-      });
-
-      const branding = team.teamGlobalSettings
-        ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
-        : undefined;
-
-      const lang = team.teamGlobalSettings?.documentLanguage;
-
-      const [html, text] = await Promise.all([
-        renderEmailWithI18N(emailContent, {
-          lang,
-          branding,
-        }),
-        renderEmailWithI18N(emailContent, {
-          lang,
-          branding,
-          plainText: true,
-        }),
-      ]);
-
-      const i18n = await getI18nInstance(lang);
-
-      await mailer.sendMail({
-        to: member.user.email,
-        from: {
-          name: FROM_NAME,
-          address: FROM_ADDRESS,
-        },
-        subject: i18n._(msg`A team member has left ${team.name}`),
-        html,
-        text,
-      });
-    });
-  }
-};
diff --git a/packages/lib/jobs/definitions/emails/send-team-member-left-email.ts b/packages/lib/jobs/definitions/emails/send-team-member-left-email.ts
deleted file mode 100644
index f940896a4..000000000
--- a/packages/lib/jobs/definitions/emails/send-team-member-left-email.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { z } from 'zod';
-
-import type { JobDefinition } from '../../client/_internal/job';
-
-const SEND_TEAM_MEMBER_LEFT_EMAIL_JOB_DEFINITION_ID = 'send.team-member-left.email';
-
-const SEND_TEAM_MEMBER_LEFT_EMAIL_JOB_DEFINITION_SCHEMA = z.object({
-  teamId: z.number(),
-  memberUserId: z.number(),
-});
-
-export type TSendTeamMemberLeftEmailJobDefinition = z.infer<
-  typeof SEND_TEAM_MEMBER_LEFT_EMAIL_JOB_DEFINITION_SCHEMA
->;
-
-export const SEND_TEAM_MEMBER_LEFT_EMAIL_JOB_DEFINITION = {
-  id: SEND_TEAM_MEMBER_LEFT_EMAIL_JOB_DEFINITION_ID,
-  name: 'Send Team Member Left Email',
-  version: '1.0.0',
-  trigger: {
-    name: SEND_TEAM_MEMBER_LEFT_EMAIL_JOB_DEFINITION_ID,
-    schema: SEND_TEAM_MEMBER_LEFT_EMAIL_JOB_DEFINITION_SCHEMA,
-  },
-  handler: async ({ payload, io }) => {
-    const handler = await import('./send-team-member-left-email.handler');
-
-    await handler.run({ payload, io });
-  },
-} as const satisfies JobDefinition<
-  typeof SEND_TEAM_MEMBER_LEFT_EMAIL_JOB_DEFINITION_ID,
-  TSendTeamMemberLeftEmailJobDefinition
->;
diff --git a/packages/lib/jobs/definitions/internal/backport-subscription-claims.handler.ts b/packages/lib/jobs/definitions/internal/backport-subscription-claims.handler.ts
new file mode 100644
index 000000000..2a21fc6d5
--- /dev/null
+++ b/packages/lib/jobs/definitions/internal/backport-subscription-claims.handler.ts
@@ -0,0 +1,35 @@
+import { prisma } from '@documenso/prisma';
+
+import { AppError, AppErrorCode } from '../../../errors/app-error';
+import type { JobRunIO } from '../../client/_internal/job';
+import type { TBackportSubscriptionClaimJobDefinition } from './backport-subscription-claims';
+
+export const run = async ({
+  payload,
+  io,
+}: {
+  payload: TBackportSubscriptionClaimJobDefinition;
+  io: JobRunIO;
+}) => {
+  const { subscriptionClaimId, flags } = payload;
+
+  const subscriptionClaim = await prisma.subscriptionClaim.findFirst({
+    where: {
+      id: subscriptionClaimId,
+    },
+  });
+
+  if (!subscriptionClaim) {
+    throw new AppError(AppErrorCode.NOT_FOUND, { message: 'Subscription claim not found' });
+  }
+
+  await io.runTask('backport-claims', async () => {
+    const newFlagsJson = JSON.stringify(flags);
+
+    await prisma.$executeRaw`
+      UPDATE "OrganisationClaim"
+      SET "flags" = "flags" || ${newFlagsJson}::jsonb
+      WHERE "originalSubscriptionClaimId" = ${subscriptionClaimId}
+    `;
+  });
+};
diff --git a/packages/lib/jobs/definitions/internal/backport-subscription-claims.ts b/packages/lib/jobs/definitions/internal/backport-subscription-claims.ts
new file mode 100644
index 000000000..026438c85
--- /dev/null
+++ b/packages/lib/jobs/definitions/internal/backport-subscription-claims.ts
@@ -0,0 +1,44 @@
+import { z } from 'zod';
+
+import { type JobDefinition } from '../../client/_internal/job';
+
+const BACKPORT_SUBSCRIPTION_CLAIM_JOB_DEFINITION_ID = 'internal.backport-subscription-claims';
+
+const BACKPORT_SUBSCRIPTION_CLAIM_JOB_DEFINITION_SCHEMA = z.object({
+  subscriptionClaimId: z.string(),
+  // I would prefer to fetch the subscription within the runner, but
+  // it seems the local job runs it asynchronously, so we can't get
+  // the updated values in the job.
+  flags: z.object({
+    unlimitedDocuments: z.literal(true).optional(),
+    allowCustomBranding: z.literal(true).optional(),
+    hidePoweredBy: z.literal(true).optional(),
+    embedAuthoring: z.literal(true).optional(),
+    embedAuthoringWhiteLabel: z.literal(true).optional(),
+    embedSigning: z.literal(true).optional(),
+    embedSigningWhiteLabel: z.literal(true).optional(),
+    cfr21: z.literal(true).optional(),
+  }),
+});
+
+export type TBackportSubscriptionClaimJobDefinition = z.infer<
+  typeof BACKPORT_SUBSCRIPTION_CLAIM_JOB_DEFINITION_SCHEMA
+>;
+
+export const BACKPORT_SUBSCRIPTION_CLAIM_JOB_DEFINITION = {
+  id: BACKPORT_SUBSCRIPTION_CLAIM_JOB_DEFINITION_ID,
+  name: 'Backport Subscription Claims',
+  version: '1.0.0',
+  trigger: {
+    name: BACKPORT_SUBSCRIPTION_CLAIM_JOB_DEFINITION_ID,
+    schema: BACKPORT_SUBSCRIPTION_CLAIM_JOB_DEFINITION_SCHEMA,
+  },
+  handler: async ({ payload, io }) => {
+    const handler = await import('./backport-subscription-claims.handler');
+
+    await handler.run({ payload, io });
+  },
+} as const satisfies JobDefinition<
+  typeof BACKPORT_SUBSCRIPTION_CLAIM_JOB_DEFINITION_ID,
+  TBackportSubscriptionClaimJobDefinition
+>;
diff --git a/packages/lib/jobs/definitions/internal/bulk-send-template.handler.ts b/packages/lib/jobs/definitions/internal/bulk-send-template.handler.ts
index 6e9f69032..a7ee7d6b2 100644
--- a/packages/lib/jobs/definitions/internal/bulk-send-template.handler.ts
+++ b/packages/lib/jobs/definitions/internal/bulk-send-template.handler.ts
@@ -1,7 +1,6 @@
 import { createElement } from 'react';
 
 import { msg } from '@lingui/macro';
-import type { TeamGlobalSettings } from '@prisma/client';
 import { parse } from 'csv-parse/sync';
 import { z } from 'zod';
 
@@ -16,8 +15,8 @@ import { getI18nInstance } from '../../../client-only/providers/i18n-server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '../../../constants/email';
 import { AppError } from '../../../errors/app-error';
+import { getEmailContext } from '../../../server-only/email/get-email-context';
 import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../../utils/team-global-settings-to-branding';
 import type { JobRunIO } from '../../client/_internal/job';
 import type { TBulkSendTemplateJobDefinition } from './bulk-send-template';
 
@@ -163,29 +162,24 @@ export const run = async ({
       assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
     });
 
-    let teamGlobalSettings: TeamGlobalSettings | undefined | null;
+    const { branding, settings } = await getEmailContext({
+      source: {
+        type: 'team',
+        teamId,
+      },
+    });
 
-    if (template.teamId) {
-      teamGlobalSettings = await prisma.teamGlobalSettings.findUnique({
-        where: {
-          teamId: template.teamId,
-        },
-      });
-    }
+    const lang = template.templateMeta?.language ?? settings.documentLanguage;
 
-    const branding = teamGlobalSettings
-      ? teamGlobalSettingsToBranding(teamGlobalSettings)
-      : undefined;
-
-    const i18n = await getI18nInstance(teamGlobalSettings?.documentLanguage);
+    const i18n = await getI18nInstance(lang);
 
     const [html, text] = await Promise.all([
       renderEmailWithI18N(completionTemplate, {
-        lang: teamGlobalSettings?.documentLanguage,
+        lang,
         branding,
       }),
       renderEmailWithI18N(completionTemplate, {
-        lang: teamGlobalSettings?.documentLanguage,
+        lang,
         branding,
         plainText: true,
       }),
diff --git a/packages/lib/jobs/definitions/internal/bulk-send-template.ts b/packages/lib/jobs/definitions/internal/bulk-send-template.ts
index c101e3c40..4ba99ba1a 100644
--- a/packages/lib/jobs/definitions/internal/bulk-send-template.ts
+++ b/packages/lib/jobs/definitions/internal/bulk-send-template.ts
@@ -7,7 +7,7 @@ const BULK_SEND_TEMPLATE_JOB_DEFINITION_ID = 'internal.bulk-send-template';
 
 const BULK_SEND_TEMPLATE_JOB_DEFINITION_SCHEMA = z.object({
   userId: z.number(),
-  teamId: z.number().optional(),
+  teamId: z.number(),
   templateId: z.number(),
   csvContent: z.string(),
   sendImmediately: z.boolean(),
diff --git a/packages/lib/jobs/definitions/internal/seal-document.handler.ts b/packages/lib/jobs/definitions/internal/seal-document.handler.ts
index 5903eab3c..edae27977 100644
--- a/packages/lib/jobs/definitions/internal/seal-document.handler.ts
+++ b/packages/lib/jobs/definitions/internal/seal-document.handler.ts
@@ -16,6 +16,7 @@ import { flattenForm } from '../../../server-only/pdf/flatten-form';
 import { insertFieldInPDF } from '../../../server-only/pdf/insert-field-in-pdf';
 import { legacy_insertFieldInPDF } from '../../../server-only/pdf/legacy-insert-field-in-pdf';
 import { normalizeSignatureAppearances } from '../../../server-only/pdf/normalize-signature-appearances';
+import { getTeamSettings } from '../../../server-only/team/get-team-settings';
 import { triggerWebhook } from '../../../server-only/webhooks/trigger/trigger-webhook';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '../../../types/document-audit-logs';
 import {
@@ -47,18 +48,14 @@ export const run = async ({
     include: {
       documentMeta: true,
       recipients: true,
-      team: {
-        select: {
-          teamGlobalSettings: {
-            select: {
-              includeSigningCertificate: true,
-            },
-          },
-        },
-      },
     },
   });
 
+  const settings = await getTeamSettings({
+    userId: document.userId,
+    teamId: document.teamId,
+  });
+
   const isComplete =
     document.recipients.some((recipient) => recipient.signingStatus === SigningStatus.REJECTED) ||
     document.recipients.every((recipient) => recipient.signingStatus === SigningStatus.SIGNED);
@@ -144,13 +141,12 @@ export const run = async ({
 
   const pdfData = await getFileServerSide(documentData);
 
-  const certificateData =
-    (document.team?.teamGlobalSettings?.includeSigningCertificate ?? true)
-      ? await getCertificatePdf({
-          documentId,
-          language: document.documentMeta?.language,
-        }).catch(() => null)
-      : null;
+  const certificateData = settings.includeSigningCertificate
+    ? await getCertificatePdf({
+        documentId,
+        language: document.documentMeta?.language,
+      }).catch(() => null)
+    : null;
 
   const newDataId = await io.runTask('decorate-and-sign-pdf', async () => {
     const pdfDoc = await PDFDocument.load(pdfData);
diff --git a/packages/lib/server-only/admin/get-all-subscriptions.ts b/packages/lib/server-only/admin/get-all-subscriptions.ts
deleted file mode 100644
index 5080c4c22..000000000
--- a/packages/lib/server-only/admin/get-all-subscriptions.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { prisma } from '@documenso/prisma';
-
-export const findSubscriptions = async () => {
-  return prisma.subscription.findMany({
-    select: {
-      id: true,
-      status: true,
-      createdAt: true,
-      periodEnd: true,
-      userId: true,
-    },
-  });
-};
diff --git a/packages/lib/server-only/admin/get-signing-volume.ts b/packages/lib/server-only/admin/get-signing-volume.ts
index 0d862c7d2..8ed734ecc 100644
--- a/packages/lib/server-only/admin/get-signing-volume.ts
+++ b/packages/lib/server-only/admin/get-signing-volume.ts
@@ -1,7 +1,16 @@
-import { prisma } from '@documenso/prisma';
-import { DocumentStatus, SubscriptionStatus } from '@documenso/prisma/client';
+import { DocumentStatus, SubscriptionStatus } from '@prisma/client';
 
-type GetSigningVolumeOptions = {
+import { kyselyPrisma, sql } from '@documenso/prisma';
+
+export type SigningVolume = {
+  id: number;
+  name: string;
+  signingVolume: number;
+  createdAt: Date;
+  planId: string;
+};
+
+export type GetSigningVolumeOptions = {
   search?: string;
   page?: number;
   perPage?: number;
@@ -9,187 +18,68 @@ type GetSigningVolumeOptions = {
   sortOrder?: 'asc' | 'desc';
 };
 
-export const getSigningVolume = async ({
+export async function getSigningVolume({
   search = '',
   page = 1,
   perPage = 10,
   sortBy = 'signingVolume',
   sortOrder = 'desc',
-}: GetSigningVolumeOptions) => {
-  const validPage = Math.max(1, page);
-  const validPerPage = Math.max(1, perPage);
-  const skip = (validPage - 1) * validPerPage;
+}: GetSigningVolumeOptions) {
+  const offset = Math.max(page - 1, 0) * perPage;
 
-  const activeSubscriptions = await prisma.subscription.findMany({
-    where: {
-      status: SubscriptionStatus.ACTIVE,
-    },
-    select: {
-      id: true,
-      planId: true,
-      userId: true,
-      teamId: true,
-      createdAt: true,
-      user: {
-        select: {
-          id: true,
-          name: true,
-          email: true,
-          createdAt: true,
-        },
-      },
-      team: {
-        select: {
-          id: true,
-          name: true,
-          teamEmail: {
-            select: {
-              email: true,
-            },
-          },
-          createdAt: true,
-        },
-      },
-    },
-  });
+  let findQuery = kyselyPrisma.$kysely
+    .selectFrom('Subscription as s')
+    .innerJoin('Organisation as o', 's.organisationId', 'o.id')
+    .leftJoin('Team as t', 'o.id', 't.organisationId')
+    .leftJoin('Document as d', (join) =>
+      join
+        .onRef('t.id', '=', 'd.teamId')
+        .on('d.status', '=', sql.lit(DocumentStatus.COMPLETED))
+        .on('d.deletedAt', 'is', null),
+    )
+    .where(sql`s.status = ${SubscriptionStatus.ACTIVE}::"SubscriptionStatus"`)
+    .where((eb) =>
+      eb.or([eb('o.name', 'ilike', `%${search}%`), eb('t.name', 'ilike', `%${search}%`)]),
+    )
+    .select([
+      's.id as id',
+      's.createdAt as createdAt',
+      's.planId as planId',
+      sql<string>`COALESCE(o.name, 'Unknown')`.as('name'),
+      sql<number>`COUNT(DISTINCT d.id)`.as('signingVolume'),
+    ])
+    .groupBy(['s.id', 'o.name']);
 
-  const userSubscriptionsMap = new Map();
-  const teamSubscriptionsMap = new Map();
+  switch (sortBy) {
+    case 'name':
+      findQuery = findQuery.orderBy('name', sortOrder);
+      break;
+    case 'createdAt':
+      findQuery = findQuery.orderBy('createdAt', sortOrder);
+      break;
+    case 'signingVolume':
+      findQuery = findQuery.orderBy('signingVolume', sortOrder);
+      break;
+    default:
+      findQuery = findQuery.orderBy('signingVolume', 'desc');
+  }
 
-  activeSubscriptions.forEach((subscription) => {
-    const isTeam = !!subscription.teamId;
+  findQuery = findQuery.limit(perPage).offset(offset);
 
-    if (isTeam && subscription.teamId) {
-      if (!teamSubscriptionsMap.has(subscription.teamId)) {
-        teamSubscriptionsMap.set(subscription.teamId, {
-          id: subscription.id,
-          planId: subscription.planId,
-          teamId: subscription.teamId,
-          name: subscription.team?.name || '',
-          email: subscription.team?.teamEmail?.email || `Team ${subscription.team?.id}`,
-          createdAt: subscription.team?.createdAt,
-          isTeam: true,
-          subscriptionIds: [subscription.id],
-        });
-      } else {
-        const existingTeam = teamSubscriptionsMap.get(subscription.teamId);
-        existingTeam.subscriptionIds.push(subscription.id);
-      }
-    } else if (subscription.userId) {
-      if (!userSubscriptionsMap.has(subscription.userId)) {
-        userSubscriptionsMap.set(subscription.userId, {
-          id: subscription.id,
-          planId: subscription.planId,
-          userId: subscription.userId,
-          name: subscription.user?.name || '',
-          email: subscription.user?.email || '',
-          createdAt: subscription.user?.createdAt,
-          isTeam: false,
-          subscriptionIds: [subscription.id],
-        });
-      } else {
-        const existingUser = userSubscriptionsMap.get(subscription.userId);
-        existingUser.subscriptionIds.push(subscription.id);
-      }
-    }
-  });
+  const countQuery = kyselyPrisma.$kysely
+    .selectFrom('Subscription as s')
+    .innerJoin('Organisation as o', 's.organisationId', 'o.id')
+    .leftJoin('Team as t', 'o.id', 't.organisationId')
+    .where(sql`s.status = ${SubscriptionStatus.ACTIVE}::"SubscriptionStatus"`)
+    .where((eb) =>
+      eb.or([eb('o.name', 'ilike', `%${search}%`), eb('t.name', 'ilike', `%${search}%`)]),
+    )
+    .select(({ fn }) => [fn.countAll().as('count')]);
 
-  const subscriptions = [
-    ...Array.from(userSubscriptionsMap.values()),
-    ...Array.from(teamSubscriptionsMap.values()),
-  ];
-
-  const filteredSubscriptions = search
-    ? subscriptions.filter((sub) => {
-        const searchLower = search.toLowerCase();
-        return (
-          sub.name?.toLowerCase().includes(searchLower) ||
-          sub.email?.toLowerCase().includes(searchLower)
-        );
-      })
-    : subscriptions;
-
-  const signingVolume = await Promise.all(
-    filteredSubscriptions.map(async (subscription) => {
-      let signingVolume = 0;
-
-      if (subscription.userId && !subscription.isTeam) {
-        const personalCount = await prisma.document.count({
-          where: {
-            userId: subscription.userId,
-            status: DocumentStatus.COMPLETED,
-            teamId: null,
-          },
-        });
-
-        signingVolume += personalCount;
-
-        const userTeams = await prisma.teamMember.findMany({
-          where: {
-            userId: subscription.userId,
-          },
-          select: {
-            teamId: true,
-          },
-        });
-
-        if (userTeams.length > 0) {
-          const teamIds = userTeams.map((team) => team.teamId);
-          const teamCount = await prisma.document.count({
-            where: {
-              teamId: {
-                in: teamIds,
-              },
-              status: DocumentStatus.COMPLETED,
-            },
-          });
-
-          signingVolume += teamCount;
-        }
-      }
-
-      if (subscription.teamId) {
-        const teamCount = await prisma.document.count({
-          where: {
-            teamId: subscription.teamId,
-            status: DocumentStatus.COMPLETED,
-          },
-        });
-
-        signingVolume += teamCount;
-      }
-
-      return {
-        ...subscription,
-        signingVolume,
-      };
-    }),
-  );
-
-  const sortedResults = [...signingVolume].sort((a, b) => {
-    if (sortBy === 'name') {
-      return sortOrder === 'asc'
-        ? (a.name || '').localeCompare(b.name || '')
-        : (b.name || '').localeCompare(a.name || '');
-    }
-
-    if (sortBy === 'createdAt') {
-      const dateA = a.createdAt ? new Date(a.createdAt).getTime() : 0;
-      const dateB = b.createdAt ? new Date(b.createdAt).getTime() : 0;
-      return sortOrder === 'asc' ? dateA - dateB : dateB - dateA;
-    }
-
-    return sortOrder === 'asc'
-      ? a.signingVolume - b.signingVolume
-      : b.signingVolume - a.signingVolume;
-  });
-
-  const paginatedResults = sortedResults.slice(skip, skip + validPerPage);
-
-  const totalPages = Math.ceil(sortedResults.length / validPerPage);
+  const [results, [{ count }]] = await Promise.all([findQuery.execute(), countQuery.execute()]);
 
   return {
-    leaderboard: paginatedResults,
-    totalPages,
+    leaderboard: results,
+    totalPages: Math.ceil(Number(count) / perPage),
   };
-};
+}
diff --git a/packages/lib/server-only/admin/get-users-stats.ts b/packages/lib/server-only/admin/get-users-stats.ts
index f44a1332e..229433803 100644
--- a/packages/lib/server-only/admin/get-users-stats.ts
+++ b/packages/lib/server-only/admin/get-users-stats.ts
@@ -7,13 +7,11 @@ export const getUsersCount = async () => {
   return await prisma.user.count();
 };
 
-export const getUsersWithSubscriptionsCount = async () => {
-  return await prisma.user.count({
+export const getOrganisationsWithSubscriptionsCount = async () => {
+  return await prisma.organisation.count({
     where: {
-      subscriptions: {
-        some: {
-          status: SubscriptionStatus.ACTIVE,
-        },
+      subscription: {
+        status: SubscriptionStatus.ACTIVE,
       },
     },
   });
diff --git a/packages/lib/server-only/document-meta/upsert-document-meta.ts b/packages/lib/server-only/document-meta/upsert-document-meta.ts
index 1d80bf8d6..a9edede98 100644
--- a/packages/lib/server-only/document-meta/upsert-document-meta.ts
+++ b/packages/lib/server-only/document-meta/upsert-document-meta.ts
@@ -11,10 +11,11 @@ import { prisma } from '@documenso/prisma';
 import type { SupportedLanguageCodes } from '../../constants/i18n';
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import type { TDocumentEmailSettings } from '../../types/document-email';
+import { getDocumentWhereInput } from '../document/get-document-by-id';
 
 export type CreateDocumentMetaOptions = {
   userId: number;
-  teamId?: number;
+  teamId: number;
   documentId: number;
   subject?: string;
   message?: string;
@@ -53,25 +54,14 @@ export const upsertDocumentMeta = async ({
   language,
   requestMetadata,
 }: CreateDocumentMetaOptions) => {
+  const { documentWhereInput } = await getDocumentWhereInput({
+    documentId,
+    userId,
+    teamId,
+  });
+
   const document = await prisma.document.findFirst({
-    where: {
-      id: documentId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
-    },
+    where: documentWhereInput,
     include: {
       documentMeta: true,
     },
diff --git a/packages/lib/server-only/document/create-document-v2.ts b/packages/lib/server-only/document/create-document-v2.ts
index 19719ca85..1fdb1f962 100644
--- a/packages/lib/server-only/document/create-document-v2.ts
+++ b/packages/lib/server-only/document/create-document-v2.ts
@@ -6,9 +6,7 @@ import {
   SigningStatus,
   WebhookTriggerEvents,
 } from '@prisma/client';
-import { TeamMemberRole } from '@prisma/client';
 
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { normalizePdf as makeNormalizedPdf } from '@documenso/lib/server-only/pdf/normalize-pdf';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
@@ -28,11 +26,14 @@ import { getFileServerSide } from '../../universal/upload/get-file.server';
 import { putPdfFileServerSide } from '../../universal/upload/put-file.server';
 import { createDocumentAuthOptions, createRecipientAuthOptions } from '../../utils/document-auth';
 import { determineDocumentVisibility } from '../../utils/document-visibility';
+import { buildTeamWhereQuery } from '../../utils/teams';
+import { getMemberRoles } from '../team/get-member-roles';
+import { getTeamSettings } from '../team/get-team-settings';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
 
 export type CreateDocumentOptions = {
   userId: number;
-  teamId?: number;
+  teamId: number;
   documentDataId: string;
   normalizePdf?: boolean;
   data: {
@@ -59,36 +60,28 @@ export const createDocumentV2 = async ({
 }: CreateDocumentOptions) => {
   const { title, formValues } = data;
 
-  const team = teamId
-    ? await prisma.team.findFirst({
-        where: {
-          id: teamId,
-          members: {
-            some: {
-              userId,
-            },
-          },
+  const team = await prisma.team.findFirst({
+    where: buildTeamWhereQuery({ teamId, userId }),
+    include: {
+      organisation: {
+        select: {
+          organisationClaim: true,
         },
-        include: {
-          teamGlobalSettings: true,
-          members: {
-            where: {
-              userId: userId,
-            },
-            select: {
-              role: true,
-            },
-          },
-        },
-      })
-    : null;
+      },
+    },
+  });
 
-  if (teamId !== undefined && !team) {
+  if (!team) {
     throw new AppError(AppErrorCode.NOT_FOUND, {
       message: 'Team not found',
     });
   }
 
+  const settings = await getTeamSettings({
+    userId,
+    teamId,
+  });
+
   if (normalizePdf) {
     const documentData = await prisma.documentData.findFirst({
       where: {
@@ -122,23 +115,24 @@ export const createDocumentV2 = async ({
   );
 
   // Check if user has permission to set the global action auth.
-  if (authOptions.globalActionAuth.length > 0 || recipientsHaveActionAuth) {
-    const isDocumentEnterprise = await isUserEnterprise({
-      userId,
-      teamId,
+  if (
+    (authOptions.globalActionAuth.length > 0 || recipientsHaveActionAuth) &&
+    !team.organisation.organisationClaim.flags.cfr21
+  ) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'You do not have permission to set the action auth',
     });
-
-    if (!isDocumentEnterprise) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You do not have permission to set the action auth',
-      });
-    }
   }
 
-  const visibility = determineDocumentVisibility(
-    team?.teamGlobalSettings?.documentVisibility,
-    team?.members[0].role ?? TeamMemberRole.MEMBER,
-  );
+  const { teamRole } = await getMemberRoles({
+    teamId,
+    reference: {
+      type: 'User',
+      id: userId,
+    },
+  });
+
+  const visibility = determineDocumentVisibility(settings.documentVisibility, teamRole);
 
   return await prisma.$transaction(async (tx) => {
     const document = await tx.document.create({
@@ -158,13 +152,10 @@ export const createDocumentV2 = async ({
             ...meta,
             signingOrder: meta?.signingOrder || undefined,
             emailSettings: meta?.emailSettings || undefined,
-            language: meta?.language || team?.teamGlobalSettings?.documentLanguage,
-            typedSignatureEnabled:
-              meta?.typedSignatureEnabled ?? team?.teamGlobalSettings?.typedSignatureEnabled,
-            uploadSignatureEnabled:
-              meta?.uploadSignatureEnabled ?? team?.teamGlobalSettings?.uploadSignatureEnabled,
-            drawSignatureEnabled:
-              meta?.drawSignatureEnabled ?? team?.teamGlobalSettings?.drawSignatureEnabled,
+            language: meta?.language || settings.documentLanguage,
+            typedSignatureEnabled: meta?.typedSignatureEnabled ?? settings.typedSignatureEnabled,
+            uploadSignatureEnabled: meta?.uploadSignatureEnabled ?? settings.uploadSignatureEnabled,
+            drawSignatureEnabled: meta?.drawSignatureEnabled ?? settings.drawSignatureEnabled,
           },
         },
       },
diff --git a/packages/lib/server-only/document/create-document.ts b/packages/lib/server-only/document/create-document.ts
index 866b0e2f9..c06654897 100644
--- a/packages/lib/server-only/document/create-document.ts
+++ b/packages/lib/server-only/document/create-document.ts
@@ -1,14 +1,13 @@
 import { DocumentSource, WebhookTriggerEvents } from '@prisma/client';
-import type { DocumentVisibility, Team, TeamGlobalSettings } from '@prisma/client';
-import { TeamMemberRole } from '@prisma/client';
+import type { DocumentVisibility } from '@prisma/client';
 
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { normalizePdf as makeNormalizedPdf } from '@documenso/lib/server-only/pdf/normalize-pdf';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
 import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
 import { prisma } from '@documenso/prisma';
 
+import { AppError, AppErrorCode } from '../../errors/app-error';
 import {
   ZWebhookDocumentSchema,
   mapDocumentToWebhookDocumentPayload,
@@ -17,13 +16,15 @@ import { prefixedId } from '../../universal/id';
 import { getFileServerSide } from '../../universal/upload/get-file.server';
 import { putPdfFileServerSide } from '../../universal/upload/put-file.server';
 import { determineDocumentVisibility } from '../../utils/document-visibility';
+import { getTeamById } from '../team/get-team';
+import { getTeamSettings } from '../team/get-team-settings';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
 
 export type CreateDocumentOptions = {
   title: string;
   externalId?: string | null;
   userId: number;
-  teamId?: number;
+  teamId: number;
   documentDataId: string;
   formValues?: Record<string, string | number | boolean>;
   normalizePdf?: boolean;
@@ -44,53 +45,13 @@ export const createDocument = async ({
   timezone,
   folderId,
 }: CreateDocumentOptions) => {
-  const user = await prisma.user.findFirstOrThrow({
-    where: {
-      id: userId,
-    },
-    include: {
-      teamMembers: {
-        select: {
-          teamId: true,
-        },
-      },
-    },
+  const team = await getTeamById({ userId, teamId });
+
+  const settings = await getTeamSettings({
+    userId,
+    teamId,
   });
 
-  if (
-    teamId !== undefined &&
-    !user.teamMembers.some((teamMember) => teamMember.teamId === teamId)
-  ) {
-    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'Team not found',
-    });
-  }
-
-  let team: (Team & { teamGlobalSettings: TeamGlobalSettings | null }) | null = null;
-  let userTeamRole: TeamMemberRole | undefined;
-
-  if (teamId) {
-    const teamWithUserRole = await prisma.team.findFirstOrThrow({
-      where: {
-        id: teamId,
-      },
-      include: {
-        teamGlobalSettings: true,
-        members: {
-          where: {
-            userId: userId,
-          },
-          select: {
-            role: true,
-          },
-        },
-      },
-    });
-
-    team = teamWithUserRole;
-    userTeamRole = teamWithUserRole.members[0]?.role;
-  }
-
   let folderVisibility: DocumentVisibility | undefined;
 
   if (folderId) {
@@ -149,19 +110,16 @@ export const createDocument = async ({
         folderId,
         visibility:
           folderVisibility ??
-          determineDocumentVisibility(
-            team?.teamGlobalSettings?.documentVisibility,
-            userTeamRole ?? TeamMemberRole.MEMBER,
-          ),
+          determineDocumentVisibility(settings.documentVisibility, team.currentTeamRole),
         formValues,
         source: DocumentSource.DOCUMENT,
         documentMeta: {
           create: {
-            language: team?.teamGlobalSettings?.documentLanguage,
+            language: settings.documentLanguage,
             timezone: timezone,
-            typedSignatureEnabled: team?.teamGlobalSettings?.typedSignatureEnabled ?? true,
-            uploadSignatureEnabled: team?.teamGlobalSettings?.uploadSignatureEnabled ?? true,
-            drawSignatureEnabled: team?.teamGlobalSettings?.drawSignatureEnabled ?? true,
+            typedSignatureEnabled: settings.typedSignatureEnabled,
+            uploadSignatureEnabled: settings.uploadSignatureEnabled,
+            drawSignatureEnabled: settings.drawSignatureEnabled,
           },
         },
       },
diff --git a/packages/lib/server-only/document/delete-document.ts b/packages/lib/server-only/document/delete-document.ts
index 36d8076bb..4aea1ec1c 100644
--- a/packages/lib/server-only/document/delete-document.ts
+++ b/packages/lib/server-only/document/delete-document.ts
@@ -1,14 +1,7 @@
 import { createElement } from 'react';
 
 import { msg } from '@lingui/core/macro';
-import type {
-  Document,
-  DocumentMeta,
-  Recipient,
-  Team,
-  TeamGlobalSettings,
-  User,
-} from '@prisma/client';
+import type { Document, DocumentMeta, Recipient, User } from '@prisma/client';
 import { DocumentStatus, SendStatus, WebhookTriggerEvents } from '@prisma/client';
 
 import { mailer } from '@documenso/email/mailer';
@@ -29,13 +22,14 @@ import type { ApiRequestMetadata } from '../../universal/extract-request-metadat
 import { isDocumentCompleted } from '../../utils/document';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
+import { getEmailContext } from '../email/get-email-context';
+import { getMemberRoles } from '../team/get-member-roles';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
 
 export type DeleteDocumentOptions = {
   id: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
   requestMetadata: ApiRequestMetadata;
 };
 
@@ -64,23 +58,26 @@ export const deleteDocument = async ({
     include: {
       recipients: true,
       documentMeta: true,
-      team: {
-        include: {
-          members: true,
-          teamGlobalSettings: true,
-        },
-      },
     },
   });
 
-  if (!document || (teamId !== undefined && teamId !== document.teamId)) {
+  if (!document) {
     throw new AppError(AppErrorCode.NOT_FOUND, {
       message: 'Document not found',
     });
   }
 
+  const isUserTeamMember = await getMemberRoles({
+    teamId: document.teamId,
+    reference: {
+      type: 'User',
+      id: userId,
+    },
+  })
+    .then(() => true)
+    .catch(() => false);
+
   const isUserOwner = document.userId === userId;
-  const isUserTeamMember = document.team?.members.some((member) => member.userId === userId);
   const userRecipient = document.recipients.find((recipient) => recipient.email === user.email);
 
   if (!isUserOwner && !isUserTeamMember && !userRecipient) {
@@ -94,7 +91,6 @@ export const deleteDocument = async ({
     await handleDocumentOwnerDelete({
       document,
       user,
-      team: document.team,
       requestMetadata,
     });
   }
@@ -142,11 +138,6 @@ type HandleDocumentOwnerDeleteOptions = {
     recipients: Recipient[];
     documentMeta: DocumentMeta | null;
   };
-  team?:
-    | (Team & {
-        teamGlobalSettings?: TeamGlobalSettings | null;
-      })
-    | null;
   user: User;
   requestMetadata: ApiRequestMetadata;
 };
@@ -154,13 +145,19 @@ type HandleDocumentOwnerDeleteOptions = {
 const handleDocumentOwnerDelete = async ({
   document,
   user,
-  team,
   requestMetadata,
 }: HandleDocumentOwnerDeleteOptions) => {
   if (document.deletedAt) {
     return;
   }
 
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'team',
+      teamId: document.teamId,
+    },
+  });
+
   // Soft delete completed documents.
   if (isDocumentCompleted(document.status)) {
     return await prisma.$transaction(async (tx) => {
@@ -235,20 +232,18 @@ const handleDocumentOwnerDelete = async ({
         assetBaseUrl,
       });
 
-      const branding = team?.teamGlobalSettings
-        ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
-        : undefined;
+      const lang = document.documentMeta?.language ?? settings.documentLanguage;
 
       const [html, text] = await Promise.all([
-        renderEmailWithI18N(template, { lang: document.documentMeta?.language, branding }),
+        renderEmailWithI18N(template, { lang, branding }),
         renderEmailWithI18N(template, {
-          lang: document.documentMeta?.language,
+          lang,
           branding,
           plainText: true,
         }),
       ]);
 
-      const i18n = await getI18nInstance(document.documentMeta?.language);
+      const i18n = await getI18nInstance(lang);
 
       await mailer.sendMail({
         to: {
diff --git a/packages/lib/server-only/document/duplicate-document-by-id.ts b/packages/lib/server-only/document/duplicate-document-by-id.ts
index 33ee8203b..6f1af4e12 100644
--- a/packages/lib/server-only/document/duplicate-document-by-id.ts
+++ b/packages/lib/server-only/document/duplicate-document-by-id.ts
@@ -14,7 +14,7 @@ import { getDocumentWhereInput } from './get-document-by-id';
 export interface DuplicateDocumentOptions {
   documentId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
 }
 
 export const duplicateDocument = async ({
@@ -22,7 +22,7 @@ export const duplicateDocument = async ({
   userId,
   teamId,
 }: DuplicateDocumentOptions) => {
-  const documentWhereInput = await getDocumentWhereInput({
+  const { documentWhereInput } = await getDocumentWhereInput({
     documentId,
     userId,
     teamId,
@@ -68,6 +68,11 @@ export const duplicateDocument = async ({
           id: document.userId,
         },
       },
+      team: {
+        connect: {
+          id: teamId,
+        },
+      },
       documentData: {
         create: {
           ...document.documentData,
diff --git a/packages/lib/server-only/document/find-document-audit-logs.ts b/packages/lib/server-only/document/find-document-audit-logs.ts
index 271f46e1d..0dc1fa305 100644
--- a/packages/lib/server-only/document/find-document-audit-logs.ts
+++ b/packages/lib/server-only/document/find-document-audit-logs.ts
@@ -6,10 +6,11 @@ import { AppError, AppErrorCode } from '../../errors/app-error';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
 import type { FindResultResponse } from '../../types/search-params';
 import { parseDocumentAuditLogData } from '../../utils/document-audit-logs';
+import { getDocumentWhereInput } from './get-document-by-id';
 
 export interface FindDocumentAuditLogsOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   documentId: number;
   page?: number;
   perPage?: number;
@@ -34,25 +35,14 @@ export const findDocumentAuditLogs = async ({
   const orderByColumn = orderBy?.column ?? 'createdAt';
   const orderByDirection = orderBy?.direction ?? 'desc';
 
+  const { documentWhereInput } = await getDocumentWhereInput({
+    documentId,
+    userId,
+    teamId,
+  });
+
   const document = await prisma.document.findFirst({
-    where: {
-      id: documentId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
-    },
+    where: documentWhereInput,
   });
 
   if (!document) {
diff --git a/packages/lib/server-only/document/find-documents.ts b/packages/lib/server-only/document/find-documents.ts
index cd5694d65..e6b2bde42 100644
--- a/packages/lib/server-only/document/find-documents.ts
+++ b/packages/lib/server-only/document/find-documents.ts
@@ -9,6 +9,7 @@ import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-documen
 import { DocumentVisibility } from '../../types/document-visibility';
 import { type FindResultResponse } from '../../types/search-params';
 import { maskRecipientTokensForDocument } from '../../utils/mask-recipient-tokens-for-document';
+import { getTeamById } from '../team/get-team';
 
 export type PeriodSelectorValue = '' | '7d' | '14d' | '30d';
 
@@ -53,32 +54,15 @@ export const findDocuments = async ({
   let team = null;
 
   if (teamId !== undefined) {
-    team = await prisma.team.findFirstOrThrow({
-      where: {
-        id: teamId,
-        members: {
-          some: {
-            userId,
-          },
-        },
-      },
-      include: {
-        teamEmail: true,
-        members: {
-          where: {
-            userId,
-          },
-          select: {
-            role: true,
-          },
-        },
-      },
+    team = await getTeamById({
+      userId,
+      teamId,
     });
   }
 
   const orderByColumn = orderBy?.column ?? 'createdAt';
   const orderByDirection = orderBy?.direction ?? 'desc';
-  const teamMemberRole = team?.members[0].role ?? null;
+  const teamMemberRole = team?.currentTeamRole ?? null;
 
   const searchFilter: Prisma.DocumentWhereInput = {
     OR: [
@@ -291,7 +275,6 @@ const findDocumentsFilter = (
       OR: [
         {
           userId: user.id,
-          teamId: null,
           folderId: folderId,
         },
         {
@@ -330,14 +313,12 @@ const findDocumentsFilter = (
     }))
     .with(ExtendedDocumentStatus.DRAFT, () => ({
       userId: user.id,
-      teamId: null,
       status: ExtendedDocumentStatus.DRAFT,
     }))
     .with(ExtendedDocumentStatus.PENDING, () => ({
       OR: [
         {
           userId: user.id,
-          teamId: null,
           status: ExtendedDocumentStatus.PENDING,
           folderId: folderId,
         },
@@ -360,7 +341,6 @@ const findDocumentsFilter = (
       OR: [
         {
           userId: user.id,
-          teamId: null,
           status: ExtendedDocumentStatus.COMPLETED,
           folderId: folderId,
         },
@@ -379,7 +359,6 @@ const findDocumentsFilter = (
       OR: [
         {
           userId: user.id,
-          teamId: null,
           status: ExtendedDocumentStatus.REJECTED,
           folderId: folderId,
         },
diff --git a/packages/lib/server-only/document/get-document-by-id.ts b/packages/lib/server-only/document/get-document-by-id.ts
index 8925a6915..34adacbd1 100644
--- a/packages/lib/server-only/document/get-document-by-id.ts
+++ b/packages/lib/server-only/document/get-document-by-id.ts
@@ -11,7 +11,7 @@ import { getTeamById } from '../team/get-team';
 export type GetDocumentByIdOptions = {
   documentId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
   folderId?: string;
 };
 
@@ -21,7 +21,7 @@ export const getDocumentById = async ({
   teamId,
   folderId,
 }: GetDocumentByIdOptions) => {
-  const documentWhereInput = await getDocumentWhereInput({
+  const { documentWhereInput } = await getDocumentWhereInput({
     documentId,
     userId,
     teamId,
@@ -68,18 +68,7 @@ export const getDocumentById = async ({
 export type GetDocumentWhereInputOptions = {
   documentId: number;
   userId: number;
-  teamId?: number;
-
-  /**
-   * Whether to return a filter that allows access to both the user and team documents.
-   * This only applies if `teamId` is passed in.
-   *
-   * If true, and `teamId` is passed in, the filter will allow both team and user documents.
-   * If false, and `teamId` is passed in, the filter will only allow team documents.
-   *
-   * Defaults to false.
-   */
-  overlapUserTeamScope?: boolean;
+  teamId: number;
 };
 
 /**
@@ -91,42 +80,18 @@ export const getDocumentWhereInput = async ({
   documentId,
   userId,
   teamId,
-  overlapUserTeamScope = false,
 }: GetDocumentWhereInputOptions) => {
-  const documentWhereInput: Prisma.DocumentWhereUniqueInput = {
-    id: documentId,
-    OR: [
-      {
-        userId,
-      },
-    ],
-  };
-
-  if (teamId === undefined || !documentWhereInput.OR) {
-    return documentWhereInput;
-  }
-
   const team = await getTeamById({ teamId, userId });
 
-  // Allow access to team and user documents.
-  if (overlapUserTeamScope) {
-    documentWhereInput.OR.push({
+  const documentOrInput: Prisma.DocumentWhereInput[] = [
+    {
       teamId: team.id,
-    });
-  }
-
-  // Allow access to only team documents.
-  if (!overlapUserTeamScope) {
-    documentWhereInput.OR = [
-      {
-        teamId: team.id,
-      },
-    ];
-  }
+    },
+  ];
 
   // Allow access to documents sent to or from the team email.
   if (team.teamEmail) {
-    documentWhereInput.OR.push(
+    documentOrInput.push(
       {
         recipients: {
           some: {
@@ -142,6 +107,11 @@ export const getDocumentWhereInput = async ({
     );
   }
 
+  const documentWhereInput: Prisma.DocumentWhereUniqueInput = {
+    id: documentId,
+    OR: documentOrInput,
+  };
+
   const user = await prisma.user.findFirstOrThrow({
     where: {
       id: userId,
@@ -149,7 +119,7 @@ export const getDocumentWhereInput = async ({
   });
 
   const visibilityFilters = [
-    ...match(team.currentTeamMember?.role)
+    ...match(team.currentTeamRole)
       .with(TeamMemberRole.ADMIN, () => [
         { visibility: DocumentVisibility.EVERYONE },
         { visibility: DocumentVisibility.MANAGER_AND_ABOVE },
@@ -177,7 +147,10 @@ export const getDocumentWhereInput = async ({
   ];
 
   return {
-    ...documentWhereInput,
-    OR: [...visibilityFilters],
+    documentWhereInput: {
+      ...documentWhereInput,
+      OR: [...visibilityFilters],
+    },
+    team,
   };
 };
diff --git a/packages/lib/server-only/document/get-document-by-token.ts b/packages/lib/server-only/document/get-document-by-token.ts
index f4d5615a3..b91427328 100644
--- a/packages/lib/server-only/document/get-document-by-token.ts
+++ b/packages/lib/server-only/document/get-document-by-token.ts
@@ -85,11 +85,6 @@ export const getDocumentAndSenderByToken = async ({
         select: {
           name: true,
           teamEmail: true,
-          teamGlobalSettings: {
-            select: {
-              includeSenderDetails: true,
-            },
-          },
         },
       },
     },
diff --git a/packages/lib/server-only/document/get-document-with-details-by-id.ts b/packages/lib/server-only/document/get-document-with-details-by-id.ts
index 1898ca29b..a889c410b 100644
--- a/packages/lib/server-only/document/get-document-with-details-by-id.ts
+++ b/packages/lib/server-only/document/get-document-with-details-by-id.ts
@@ -6,7 +6,7 @@ import { getDocumentWhereInput } from './get-document-by-id';
 export type GetDocumentWithDetailsByIdOptions = {
   documentId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
   folderId?: string;
 };
 
@@ -16,7 +16,7 @@ export const getDocumentWithDetailsById = async ({
   teamId,
   folderId,
 }: GetDocumentWithDetailsByIdOptions) => {
-  const documentWhereInput = await getDocumentWhereInput({
+  const { documentWhereInput } = await getDocumentWhereInput({
     documentId,
     userId,
     teamId,
@@ -31,8 +31,32 @@ export const getDocumentWithDetailsById = async ({
       documentData: true,
       documentMeta: true,
       recipients: true,
-      fields: true,
       folder: true,
+      fields: {
+        include: {
+          signature: true,
+          recipient: {
+            select: {
+              name: true,
+              email: true,
+              signingStatus: true,
+            },
+          },
+        },
+      },
+      team: {
+        select: {
+          id: true,
+          url: true,
+        },
+      },
+      user: {
+        select: {
+          id: true,
+          name: true,
+          email: true,
+        },
+      },
     },
   });
 
diff --git a/packages/lib/server-only/document/get-stats.ts b/packages/lib/server-only/document/get-stats.ts
index 754da367a..487e7a24a 100644
--- a/packages/lib/server-only/document/get-stats.ts
+++ b/packages/lib/server-only/document/get-stats.ts
@@ -11,7 +11,7 @@ import { isExtendedDocumentStatus } from '@documenso/prisma/guards/is-extended-d
 import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
 
 export type GetStatsInput = {
-  user: User;
+  user: Pick<User, 'id' | 'email'>;
   team?: Omit<GetTeamCountsOption, 'createdAt'>;
   period?: PeriodSelectorValue;
   search?: string;
@@ -89,7 +89,7 @@ export const getStats = async ({
 };
 
 type GetCountsOption = {
-  user: User;
+  user: Pick<User, 'id' | 'email'>;
   createdAt: Prisma.DocumentWhereInput['createdAt'];
   search?: string;
   folderId?: string | null;
@@ -116,7 +116,6 @@ const getCounts = async ({ user, createdAt, search, folderId }: GetCountsOption)
       where: {
         userId: user.id,
         createdAt,
-        teamId: null,
         deletedAt: null,
         AND: [searchFilter, rootPageFilter, folderId ? { folderId } : {}],
       },
@@ -334,7 +333,6 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
                 documentDeletedAt: null,
               },
             },
-            deletedAt: null,
           },
         ],
       },
diff --git a/packages/lib/server-only/document/move-document-to-team.ts b/packages/lib/server-only/document/move-document-to-team.ts
deleted file mode 100644
index 921b5ec77..000000000
--- a/packages/lib/server-only/document/move-document-to-team.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
-import { prisma } from '@documenso/prisma';
-
-import { AppError, AppErrorCode } from '../../errors/app-error';
-import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
-import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
-
-export type MoveDocumentToTeamOptions = {
-  documentId: number;
-  teamId: number;
-  userId: number;
-  requestMetadata: ApiRequestMetadata;
-};
-
-export const moveDocumentToTeam = async ({
-  documentId,
-  teamId,
-  userId,
-  requestMetadata,
-}: MoveDocumentToTeamOptions) => {
-  return await prisma.$transaction(async (tx) => {
-    const document = await tx.document.findFirst({
-      where: {
-        id: documentId,
-        userId,
-        teamId: null,
-      },
-    });
-
-    if (!document) {
-      throw new AppError(AppErrorCode.NOT_FOUND, {
-        message: 'Document not found or already associated with a team.',
-      });
-    }
-
-    const team = await tx.team.findFirst({
-      where: {
-        id: teamId,
-        members: {
-          some: {
-            userId,
-          },
-        },
-      },
-    });
-
-    if (!team) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'This team does not exist, or you are not a member of this team.',
-      });
-    }
-
-    const updatedDocument = await tx.document.update({
-      where: { id: documentId },
-      data: { teamId },
-    });
-
-    await tx.documentAuditLog.create({
-      data: createDocumentAuditLogData({
-        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_MOVED_TO_TEAM,
-        documentId: updatedDocument.id,
-        metadata: requestMetadata,
-        data: {
-          movedByUserId: userId,
-          fromPersonalAccount: true,
-          toTeamId: teamId,
-        },
-      }),
-    });
-
-    return updatedDocument;
-  });
-};
diff --git a/packages/lib/server-only/document/resend-document.tsx b/packages/lib/server-only/document/resend-document.tsx
index 94c056e45..32cf1a027 100644
--- a/packages/lib/server-only/document/resend-document.tsx
+++ b/packages/lib/server-only/document/resend-document.tsx
@@ -1,8 +1,7 @@
 import { createElement } from 'react';
 
 import { msg } from '@lingui/core/macro';
-import { DocumentStatus, RecipientRole, SigningStatus } from '@prisma/client';
-import type { Prisma } from '@prisma/client';
+import { DocumentStatus, OrganisationType, RecipientRole, SigningStatus } from '@prisma/client';
 
 import { mailer } from '@documenso/email/mailer';
 import { DocumentInviteEmailTemplate } from '@documenso/email/templates/document-invite';
@@ -22,14 +21,14 @@ import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import { isDocumentCompleted } from '../../utils/document';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
+import { getEmailContext } from '../email/get-email-context';
 import { getDocumentWhereInput } from './get-document-by-id';
 
 export type ResendDocumentOptions = {
   documentId: number;
   userId: number;
   recipients: number[];
-  teamId?: number;
+  teamId: number;
   requestMetadata: ApiRequestMetadata;
 };
 
@@ -46,7 +45,7 @@ export const resendDocument = async ({
     },
   });
 
-  const documentWhereInput: Prisma.DocumentWhereUniqueInput = await getDocumentWhereInput({
+  const { documentWhereInput } = await getDocumentWhereInput({
     documentId,
     userId,
     teamId,
@@ -68,14 +67,12 @@ export const resendDocument = async ({
         select: {
           teamEmail: true,
           name: true,
-          teamGlobalSettings: true,
         },
       },
     },
   });
 
   const customEmail = document?.documentMeta;
-  const isTeamDocument = document?.team !== null;
 
   if (!document) {
     throw new Error('Document not found');
@@ -101,13 +98,21 @@ export const resendDocument = async ({
     return;
   }
 
+  const { branding, settings, organisationType } = await getEmailContext({
+    source: {
+      type: 'team',
+      teamId: document.teamId,
+    },
+  });
+
   await Promise.all(
     document.recipients.map(async (recipient) => {
       if (recipient.role === RecipientRole.CC) {
         return;
       }
 
-      const i18n = await getI18nInstance(document.documentMeta?.language);
+      const lang = document.documentMeta?.language ?? settings.documentLanguage;
+      const i18n = await getI18nInstance(lang);
 
       const recipientEmailType = RECIPIENT_ROLE_TO_EMAIL_TYPE[recipient.role];
 
@@ -128,7 +133,7 @@ export const resendDocument = async ({
         emailSubject = i18n._(msg`Reminder: Please ${recipientActionVerb} your document`);
       }
 
-      if (isTeamDocument && document.team) {
+      if (organisationType === OrganisationType.ORGANISATION) {
         emailSubject = i18n._(
           msg`Reminder: ${document.team.name} invited you to ${recipientActionVerb} a document`,
         );
@@ -151,27 +156,26 @@ export const resendDocument = async ({
       const template = createElement(DocumentInviteEmailTemplate, {
         documentName: document.title,
         inviterName: user.name || undefined,
-        inviterEmail: isTeamDocument ? document.team?.teamEmail?.email || user.email : user.email,
+        inviterEmail:
+          organisationType === OrganisationType.ORGANISATION
+            ? document.team?.teamEmail?.email || user.email
+            : user.email,
         assetBaseUrl,
         signDocumentLink,
         customBody: renderCustomEmailTemplate(emailMessage, customEmailTemplate),
         role: recipient.role,
         selfSigner,
-        isTeamInvite: isTeamDocument,
+        organisationType,
         teamName: document.team?.name,
       });
 
-      const branding = document.team?.teamGlobalSettings
-        ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-        : undefined;
-
       const [html, text] = await Promise.all([
         renderEmailWithI18N(template, {
-          lang: document.documentMeta?.language,
+          lang,
           branding,
         }),
         renderEmailWithI18N(template, {
-          lang: document.documentMeta?.language,
+          lang,
           branding,
           plainText: true,
         }),
diff --git a/packages/lib/server-only/document/seal-document.ts b/packages/lib/server-only/document/seal-document.ts
index f28274e6d..17d4b0d52 100644
--- a/packages/lib/server-only/document/seal-document.ts
+++ b/packages/lib/server-only/document/seal-document.ts
@@ -24,6 +24,7 @@ import { flattenForm } from '../pdf/flatten-form';
 import { insertFieldInPDF } from '../pdf/insert-field-in-pdf';
 import { legacy_insertFieldInPDF } from '../pdf/legacy-insert-field-in-pdf';
 import { normalizeSignatureAppearances } from '../pdf/normalize-signature-appearances';
+import { getTeamSettings } from '../team/get-team-settings';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
 import { sendCompletedEmail } from './send-completed-email';
 
@@ -48,15 +49,6 @@ export const sealDocument = async ({
       documentData: true,
       documentMeta: true,
       recipients: true,
-      team: {
-        select: {
-          teamGlobalSettings: {
-            select: {
-              includeSigningCertificate: true,
-            },
-          },
-        },
-      },
     },
   });
 
@@ -66,6 +58,11 @@ export const sealDocument = async ({
     throw new Error(`Document ${document.id} has no document data`);
   }
 
+  const settings = await getTeamSettings({
+    userId: document.userId,
+    teamId: document.teamId,
+  });
+
   const recipients = await prisma.recipient.findMany({
     where: {
       documentId: document.id,
@@ -116,13 +113,12 @@ export const sealDocument = async ({
   // !: Need to write the fields onto the document as a hard copy
   const pdfData = await getFileServerSide(documentData);
 
-  const certificateData =
-    (document.team?.teamGlobalSettings?.includeSigningCertificate ?? true)
-      ? await getCertificatePdf({
-          documentId,
-          language: document.documentMeta?.language,
-        }).catch(() => null)
-      : null;
+  const certificateData = settings.includeSigningCertificate
+    ? await getCertificatePdf({
+        documentId,
+        language: document.documentMeta?.language,
+      }).catch(() => null)
+    : null;
 
   const doc = await PDFDocument.load(pdfData);
 
diff --git a/packages/lib/server-only/document/search-documents-with-keyword.ts b/packages/lib/server-only/document/search-documents-with-keyword.ts
index 8982188cd..fc9fed866 100644
--- a/packages/lib/server-only/document/search-documents-with-keyword.ts
+++ b/packages/lib/server-only/document/search-documents-with-keyword.ts
@@ -3,7 +3,11 @@ import type { Document, Recipient, User } from '@prisma/client';
 import { DocumentVisibility, TeamMemberRole } from '@prisma/client';
 import { match } from 'ts-pattern';
 
-import { formatDocumentsPath } from '@documenso/lib/utils/teams';
+import {
+  buildTeamWhereQuery,
+  formatDocumentsPath,
+  getHighestTeamRoleInGroup,
+} from '@documenso/lib/utils/teams';
 import { prisma } from '@documenso/prisma';
 
 export type SearchDocumentsWithKeywordOptions = {
@@ -84,16 +88,7 @@ export const searchDocumentsWithKeyword = async ({
             contains: query,
             mode: 'insensitive',
           },
-          teamId: {
-            not: null,
-          },
-          team: {
-            members: {
-              some: {
-                userId: userId,
-              },
-            },
-          },
+          team: buildTeamWhereQuery({ teamId: undefined, userId }),
           deletedAt: null,
         },
         {
@@ -101,16 +96,7 @@ export const searchDocumentsWithKeyword = async ({
             contains: query,
             mode: 'insensitive',
           },
-          teamId: {
-            not: null,
-          },
-          team: {
-            members: {
-              some: {
-                userId: userId,
-              },
-            },
-          },
+          team: buildTeamWhereQuery({ teamId: undefined, userId }),
           deletedAt: null,
         },
       ],
@@ -120,12 +106,17 @@ export const searchDocumentsWithKeyword = async ({
       team: {
         select: {
           url: true,
-          members: {
+          teamGroups: {
             where: {
-              userId: userId,
-            },
-            select: {
-              role: true,
+              organisationGroup: {
+                organisationGroupMembers: {
+                  some: {
+                    organisationMember: {
+                      userId,
+                    },
+                  },
+                },
+              },
             },
           },
         },
@@ -147,7 +138,9 @@ export const searchDocumentsWithKeyword = async ({
         return true;
       }
 
-      const teamMemberRole = document.team?.members[0]?.role;
+      const teamMemberRole = getHighestTeamRoleInGroup(
+        document.team.teamGroups.filter((tg) => tg.teamId === document.teamId),
+      );
 
       if (!teamMemberRole) {
         return false;
diff --git a/packages/lib/server-only/document/send-completed-email.ts b/packages/lib/server-only/document/send-completed-email.ts
index 2ec306962..38322f77c 100644
--- a/packages/lib/server-only/document/send-completed-email.ts
+++ b/packages/lib/server-only/document/send-completed-email.ts
@@ -17,8 +17,8 @@ import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
 import { env } from '../../utils/env';
 import { renderCustomEmailTemplate } from '../../utils/render-custom-email-template';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
 import { formatDocumentsPath } from '../../utils/teams';
+import { getEmailContext } from '../email/get-email-context';
 
 export interface SendDocumentOptions {
   documentId: number;
@@ -39,7 +39,6 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
         select: {
           id: true,
           url: true,
-          teamGlobalSettings: true,
         },
       },
     },
@@ -55,6 +54,13 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
     throw new Error('Document has no recipients');
   }
 
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'team',
+      teamId: document.teamId,
+    },
+  });
+
   const { user: owner } = document;
 
   const completedDocument = await getFileServerSide(document.documentData);
@@ -71,8 +77,6 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
     }`;
   }
 
-  const i18n = await getI18nInstance(document.documentMeta?.language);
-
   const emailSettings = extractDerivedDocumentEmailSettings(document.documentMeta);
   const isDocumentCompletedEmailEnabled = emailSettings.documentCompleted;
   const isOwnerDocumentCompletedEmailEnabled = emailSettings.ownerDocumentCompleted;
@@ -93,19 +97,19 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
       downloadLink: documentOwnerDownloadLink,
     });
 
-    const branding = document.team?.teamGlobalSettings
-      ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-      : undefined;
+    const lang = document.documentMeta?.language ?? settings.documentLanguage;
 
     const [html, text] = await Promise.all([
-      renderEmailWithI18N(template, { lang: document.documentMeta?.language, branding }),
+      renderEmailWithI18N(template, { lang, branding }),
       renderEmailWithI18N(template, {
-        lang: document.documentMeta?.language,
+        lang,
         branding,
         plainText: true,
       }),
     ]);
 
+    const i18n = await getI18nInstance(lang);
+
     await mailer.sendMail({
       to: [
         {
@@ -170,19 +174,19 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
             : undefined,
       });
 
-      const branding = document.team?.teamGlobalSettings
-        ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-        : undefined;
+      const lang = document.documentMeta?.language ?? settings.documentLanguage;
 
       const [html, text] = await Promise.all([
-        renderEmailWithI18N(template, { lang: document.documentMeta?.language, branding }),
+        renderEmailWithI18N(template, { lang, branding }),
         renderEmailWithI18N(template, {
-          lang: document.documentMeta?.language,
+          lang,
           branding,
           plainText: true,
         }),
       ]);
 
+      const i18n = await getI18nInstance(lang);
+
       await mailer.sendMail({
         to: [
           {
diff --git a/packages/lib/server-only/document/send-delete-email.ts b/packages/lib/server-only/document/send-delete-email.ts
index 61c82ed13..0c969574f 100644
--- a/packages/lib/server-only/document/send-delete-email.ts
+++ b/packages/lib/server-only/document/send-delete-email.ts
@@ -12,7 +12,7 @@ import { AppError, AppErrorCode } from '../../errors/app-error';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import { env } from '../../utils/env';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
+import { getEmailContext } from '../email/get-email-context';
 
 export interface SendDeleteEmailOptions {
   documentId: number;
@@ -27,11 +27,6 @@ export const sendDeleteEmail = async ({ documentId, reason }: SendDeleteEmailOpt
     include: {
       user: true,
       documentMeta: true,
-      team: {
-        include: {
-          teamGlobalSettings: true,
-        },
-      },
     },
   });
 
@@ -49,6 +44,13 @@ export const sendDeleteEmail = async ({ documentId, reason }: SendDeleteEmailOpt
     return;
   }
 
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'team',
+      teamId: document.teamId,
+    },
+  });
+
   const { email, name } = document.user;
 
   const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';
@@ -59,20 +61,18 @@ export const sendDeleteEmail = async ({ documentId, reason }: SendDeleteEmailOpt
     assetBaseUrl,
   });
 
-  const branding = document.team?.teamGlobalSettings
-    ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-    : undefined;
+  const lang = document.documentMeta?.language ?? settings.documentLanguage;
 
   const [html, text] = await Promise.all([
-    renderEmailWithI18N(template, { lang: document.documentMeta?.language, branding }),
+    renderEmailWithI18N(template, { lang, branding }),
     renderEmailWithI18N(template, {
-      lang: document.documentMeta?.language,
+      lang,
       branding,
       plainText: true,
     }),
   ]);
 
-  const i18n = await getI18nInstance();
+  const i18n = await getI18nInstance(lang);
 
   await mailer.sendMail({
     to: {
diff --git a/packages/lib/server-only/document/send-document.tsx b/packages/lib/server-only/document/send-document.tsx
index cf9f53bfa..b8a77ee7e 100644
--- a/packages/lib/server-only/document/send-document.tsx
+++ b/packages/lib/server-only/document/send-document.tsx
@@ -23,11 +23,12 @@ import { putPdfFileServerSide } from '../../universal/upload/put-file.server';
 import { isDocumentCompleted } from '../../utils/document';
 import { insertFormValuesInPdf } from '../pdf/insert-form-values-in-pdf';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
+import { getDocumentWhereInput } from './get-document-by-id';
 
 export type SendDocumentOptions = {
   documentId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
   sendEmail?: boolean;
   requestMetadata: ApiRequestMetadata;
 };
@@ -39,25 +40,14 @@ export const sendDocument = async ({
   sendEmail,
   requestMetadata,
 }: SendDocumentOptions) => {
-  const document = await prisma.document.findUnique({
-    where: {
-      id: documentId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
-    },
+  const { documentWhereInput } = await getDocumentWhereInput({
+    documentId,
+    userId,
+    teamId,
+  });
+
+  const document = await prisma.document.findFirst({
+    where: documentWhereInput,
     include: {
       recipients: {
         orderBy: [{ signingOrder: { sort: 'asc', nulls: 'last' } }, { id: 'asc' }],
diff --git a/packages/lib/server-only/document/send-pending-email.ts b/packages/lib/server-only/document/send-pending-email.ts
index ab9a74b79..9726cd5cc 100644
--- a/packages/lib/server-only/document/send-pending-email.ts
+++ b/packages/lib/server-only/document/send-pending-email.ts
@@ -11,7 +11,7 @@ import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import { env } from '../../utils/env';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
+import { getEmailContext } from '../email/get-email-context';
 
 export interface SendPendingEmailOptions {
   documentId: number;
@@ -35,11 +35,6 @@ export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingE
         },
       },
       documentMeta: true,
-      team: {
-        include: {
-          teamGlobalSettings: true,
-        },
-      },
     },
   });
 
@@ -51,6 +46,13 @@ export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingE
     throw new Error('Document has no recipients');
   }
 
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'team',
+      teamId: document.teamId,
+    },
+  });
+
   const isDocumentPendingEmailEnabled = extractDerivedDocumentEmailSettings(
     document.documentMeta,
   ).documentPending;
@@ -70,20 +72,18 @@ export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingE
     assetBaseUrl,
   });
 
-  const branding = document.team?.teamGlobalSettings
-    ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-    : undefined;
+  const lang = document.documentMeta?.language ?? settings.documentLanguage;
 
   const [html, text] = await Promise.all([
-    renderEmailWithI18N(template, { lang: document.documentMeta?.language, branding }),
+    renderEmailWithI18N(template, { lang, branding }),
     renderEmailWithI18N(template, {
-      lang: document.documentMeta?.language,
+      lang,
       branding,
       plainText: true,
     }),
   ]);
 
-  const i18n = await getI18nInstance(document.documentMeta?.language);
+  const i18n = await getI18nInstance(lang);
 
   await mailer.sendMail({
     to: {
diff --git a/packages/lib/server-only/document/super-delete-document.ts b/packages/lib/server-only/document/super-delete-document.ts
index 8be7df266..85dc5aab2 100644
--- a/packages/lib/server-only/document/super-delete-document.ts
+++ b/packages/lib/server-only/document/super-delete-document.ts
@@ -16,7 +16,7 @@ import { extractDerivedDocumentEmailSettings } from '../../types/document-email'
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
+import { getEmailContext } from '../email/get-email-context';
 
 export type SuperDeleteDocumentOptions = {
   id: number;
@@ -32,11 +32,6 @@ export const superDeleteDocument = async ({ id, requestMetadata }: SuperDeleteDo
       recipients: true,
       documentMeta: true,
       user: true,
-      team: {
-        include: {
-          teamGlobalSettings: true,
-        },
-      },
     },
   });
 
@@ -46,6 +41,13 @@ export const superDeleteDocument = async ({ id, requestMetadata }: SuperDeleteDo
     });
   }
 
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'team',
+      teamId: document.teamId,
+    },
+  });
+
   const { status, user } = document;
 
   const isDocumentDeletedEmailEnabled = extractDerivedDocumentEmailSettings(
@@ -72,20 +74,18 @@ export const superDeleteDocument = async ({ id, requestMetadata }: SuperDeleteDo
           assetBaseUrl,
         });
 
-        const branding = document.team?.teamGlobalSettings
-          ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-          : undefined;
+        const lang = document.documentMeta?.language ?? settings.documentLanguage;
 
         const [html, text] = await Promise.all([
-          renderEmailWithI18N(template, { lang: document.documentMeta?.language, branding }),
+          renderEmailWithI18N(template, { lang, branding }),
           renderEmailWithI18N(template, {
-            lang: document.documentMeta?.language,
+            lang,
             branding,
             plainText: true,
           }),
         ]);
 
-        const i18n = await getI18nInstance(document.documentMeta?.language);
+        const i18n = await getI18nInstance(lang);
 
         await mailer.sendMail({
           to: {
diff --git a/packages/lib/server-only/document/update-document.ts b/packages/lib/server-only/document/update-document.ts
index fe2f149a5..accb9fadf 100644
--- a/packages/lib/server-only/document/update-document.ts
+++ b/packages/lib/server-only/document/update-document.ts
@@ -2,7 +2,6 @@ import { DocumentVisibility } from '@prisma/client';
 import { DocumentStatus, TeamMemberRole } from '@prisma/client';
 import { match } from 'ts-pattern';
 
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
 import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import type { CreateDocumentAuditLogDataResponse } from '@documenso/lib/utils/document-audit-logs';
@@ -12,10 +11,11 @@ import { prisma } from '@documenso/prisma';
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import type { TDocumentAccessAuthTypes, TDocumentActionAuthTypes } from '../../types/document-auth';
 import { createDocumentAuthOptions, extractDocumentAuthMethods } from '../../utils/document-auth';
+import { getDocumentWhereInput } from './get-document-by-id';
 
 export type UpdateDocumentOptions = {
   userId: number;
-  teamId?: number;
+  teamId: number;
   documentId: number;
   data?: {
     title?: string;
@@ -35,34 +35,20 @@ export const updateDocument = async ({
   data,
   requestMetadata,
 }: UpdateDocumentOptions) => {
+  const { documentWhereInput, team } = await getDocumentWhereInput({
+    documentId,
+    userId,
+    teamId,
+  });
+
   const document = await prisma.document.findFirst({
-    where: {
-      id: documentId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
-    },
+    where: documentWhereInput,
     include: {
       team: {
         select: {
-          members: {
-            where: {
-              userId,
-            },
+          organisation: {
             select: {
-              role: true,
+              organisationClaim: true,
             },
           },
         },
@@ -76,45 +62,42 @@ export const updateDocument = async ({
     });
   }
 
-  if (teamId) {
-    const currentUserRole = document.team?.members[0]?.role;
-    const isDocumentOwner = document.userId === userId;
-    const requestedVisibility = data?.visibility;
+  const isDocumentOwner = document.userId === userId;
+  const requestedVisibility = data?.visibility;
 
-    if (!isDocumentOwner) {
-      match(currentUserRole)
-        .with(TeamMemberRole.ADMIN, () => true)
-        .with(TeamMemberRole.MANAGER, () => {
-          const allowedVisibilities: DocumentVisibility[] = [
-            DocumentVisibility.EVERYONE,
-            DocumentVisibility.MANAGER_AND_ABOVE,
-          ];
+  if (!isDocumentOwner) {
+    match(team.currentTeamRole)
+      .with(TeamMemberRole.ADMIN, () => true)
+      .with(TeamMemberRole.MANAGER, () => {
+        const allowedVisibilities: DocumentVisibility[] = [
+          DocumentVisibility.EVERYONE,
+          DocumentVisibility.MANAGER_AND_ABOVE,
+        ];
 
-          if (
-            !allowedVisibilities.includes(document.visibility) ||
-            (requestedVisibility && !allowedVisibilities.includes(requestedVisibility))
-          ) {
-            throw new AppError(AppErrorCode.UNAUTHORIZED, {
-              message: 'You do not have permission to update the document visibility',
-            });
-          }
-        })
-        .with(TeamMemberRole.MEMBER, () => {
-          if (
-            document.visibility !== DocumentVisibility.EVERYONE ||
-            (requestedVisibility && requestedVisibility !== DocumentVisibility.EVERYONE)
-          ) {
-            throw new AppError(AppErrorCode.UNAUTHORIZED, {
-              message: 'You do not have permission to update the document visibility',
-            });
-          }
-        })
-        .otherwise(() => {
+        if (
+          !allowedVisibilities.includes(document.visibility) ||
+          (requestedVisibility && !allowedVisibilities.includes(requestedVisibility))
+        ) {
           throw new AppError(AppErrorCode.UNAUTHORIZED, {
-            message: 'You do not have permission to update the document',
+            message: 'You do not have permission to update the document visibility',
           });
+        }
+      })
+      .with(TeamMemberRole.MEMBER, () => {
+        if (
+          document.visibility !== DocumentVisibility.EVERYONE ||
+          (requestedVisibility && requestedVisibility !== DocumentVisibility.EVERYONE)
+        ) {
+          throw new AppError(AppErrorCode.UNAUTHORIZED, {
+            message: 'You do not have permission to update the document visibility',
+          });
+        }
+      })
+      .otherwise(() => {
+        throw new AppError(AppErrorCode.UNAUTHORIZED, {
+          message: 'You do not have permission to update the document',
         });
-    }
+      });
   }
 
   // If no data just return the document since this function is normally chained after a meta update.
@@ -136,17 +119,10 @@ export const updateDocument = async ({
     data?.globalActionAuth === undefined ? documentGlobalActionAuth : data.globalActionAuth;
 
   // Check if user has permission to set the global action auth.
-  if (newGlobalActionAuth && newGlobalActionAuth.length > 0) {
-    const isDocumentEnterprise = await isUserEnterprise({
-      userId,
-      teamId,
+  if (newGlobalActionAuth.length > 0 && !document.team.organisation.organisationClaim.flags.cfr21) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'You do not have permission to set the action auth',
     });
-
-    if (!isDocumentEnterprise) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You do not have permission to set the action auth',
-      });
-    }
   }
 
   const isTitleSame = data.title === undefined || data.title === document.title;
diff --git a/packages/lib/server-only/document/update-title.ts b/packages/lib/server-only/document/update-title.ts
deleted file mode 100644
index 28389a473..000000000
--- a/packages/lib/server-only/document/update-title.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
-import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
-import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
-import { prisma } from '@documenso/prisma';
-
-export type UpdateTitleOptions = {
-  userId: number;
-  teamId?: number;
-  documentId: number;
-  title: string;
-  requestMetadata?: RequestMetadata;
-};
-
-export const updateTitle = async ({
-  userId,
-  teamId,
-  documentId,
-  title,
-  requestMetadata,
-}: UpdateTitleOptions) => {
-  const user = await prisma.user.findFirstOrThrow({
-    where: {
-      id: userId,
-    },
-  });
-
-  const document = await prisma.document.findFirstOrThrow({
-    where: {
-      id: documentId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
-    },
-  });
-
-  if (document.title === title) {
-    return document;
-  }
-
-  return await prisma.$transaction(async (tx) => {
-    // Instead of doing everything in a transaction we can use our knowledge
-    // of the current document title to ensure we aren't performing a conflicting
-    // update.
-    const updatedDocument = await tx.document.update({
-      where: {
-        id: documentId,
-        title: document.title,
-      },
-      data: {
-        title,
-      },
-    });
-
-    await tx.documentAuditLog.create({
-      data: createDocumentAuditLogData({
-        type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_TITLE_UPDATED,
-        documentId,
-        user,
-        requestMetadata,
-        data: {
-          from: document.title,
-          to: updatedDocument.title,
-        },
-      }),
-    });
-
-    return updatedDocument;
-  });
-};
diff --git a/packages/lib/server-only/email/get-email-context.ts b/packages/lib/server-only/email/get-email-context.ts
new file mode 100644
index 000000000..5b8961008
--- /dev/null
+++ b/packages/lib/server-only/email/get-email-context.ts
@@ -0,0 +1,90 @@
+import type { BrandingSettings } from '@documenso/email/providers/branding';
+import { prisma } from '@documenso/prisma';
+import type { OrganisationType } from '@documenso/prisma/client';
+import { type OrganisationClaim, type OrganisationGlobalSettings } from '@documenso/prisma/client';
+
+import { AppError, AppErrorCode } from '../../errors/app-error';
+import {
+  organisationGlobalSettingsToBranding,
+  teamGlobalSettingsToBranding,
+} from '../../utils/team-global-settings-to-branding';
+import { getTeamSettings } from '../team/get-team-settings';
+
+type GetEmailContextOptions = {
+  source:
+    | {
+        type: 'team';
+        teamId: number;
+      }
+    | {
+        type: 'organisation';
+        organisationId: string;
+      };
+};
+
+type EmailContextResponse = {
+  branding: BrandingSettings;
+  settings: Omit<OrganisationGlobalSettings, 'id'>;
+  claims: OrganisationClaim;
+  organisationType: OrganisationType;
+};
+
+export const getEmailContext = async (
+  options: GetEmailContextOptions,
+): Promise<EmailContextResponse> => {
+  const { source } = options;
+
+  const organisation = await prisma.organisation.findFirst({
+    where:
+      source.type === 'organisation'
+        ? {
+            id: source.organisationId,
+          }
+        : {
+            teams: {
+              some: {
+                id: source.teamId,
+              },
+            },
+          },
+    include: {
+      subscription: true,
+      organisationClaim: true,
+      organisationGlobalSettings: true,
+    },
+  });
+
+  if (!organisation) {
+    throw new AppError(AppErrorCode.NOT_FOUND);
+  }
+
+  const claims = organisation.organisationClaim;
+
+  if (source.type === 'organisation') {
+    return {
+      branding: organisationGlobalSettingsToBranding(
+        organisation.organisationGlobalSettings,
+        organisation.id,
+        claims.flags.hidePoweredBy ?? false,
+      ),
+      settings: organisation.organisationGlobalSettings,
+      claims,
+      organisationType: organisation.type,
+    };
+  }
+
+  const teamSettings = await getTeamSettings({
+    teamId: source.teamId,
+  });
+
+  return {
+    branding: teamGlobalSettingsToBranding(
+      teamSettings,
+      source.teamId,
+      claims.flags.hidePoweredBy ?? false,
+    ),
+    settings: teamSettings,
+    claims,
+    organisationType: organisation.type,
+  };
+};
diff --git a/packages/lib/server-only/field/create-document-fields.ts b/packages/lib/server-only/field/create-document-fields.ts
index dfe68f448..aa315625b 100644
--- a/packages/lib/server-only/field/create-document-fields.ts
+++ b/packages/lib/server-only/field/create-document-fields.ts
@@ -6,10 +6,11 @@ import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { canRecipientFieldsBeModified } from '../../utils/recipients';
+import { getDocumentWhereInput } from '../document/get-document-by-id';
 
 export interface CreateDocumentFieldsOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   documentId: number;
   fields: (TFieldAndMeta & {
     recipientId: number;
@@ -29,25 +30,14 @@ export const createDocumentFields = async ({
   fields,
   requestMetadata,
 }: CreateDocumentFieldsOptions) => {
+  const { documentWhereInput } = await getDocumentWhereInput({
+    documentId,
+    userId,
+    teamId,
+  });
+
   const document = await prisma.document.findFirst({
-    where: {
-      id: documentId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
-    },
+    where: documentWhereInput,
     include: {
       recipients: true,
       fields: true,
diff --git a/packages/lib/server-only/field/create-field.ts b/packages/lib/server-only/field/create-field.ts
index 5935ee1a2..7f0342677 100644
--- a/packages/lib/server-only/field/create-field.ts
+++ b/packages/lib/server-only/field/create-field.ts
@@ -1,4 +1,4 @@
-import type { FieldType, Team } from '@prisma/client';
+import type { FieldType } from '@prisma/client';
 import { match } from 'ts-pattern';
 
 import { prisma } from '@documenso/prisma';
@@ -13,11 +13,12 @@ import {
 import type { TFieldMetaSchema as FieldMeta } from '../../types/field-meta';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
+import { getDocumentWhereInput } from '../document/get-document-by-id';
 
 export type CreateFieldOptions = {
   documentId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
   recipientId: number;
   type: FieldType;
   pageNumber: number;
@@ -43,60 +44,23 @@ export const createField = async ({
   fieldMeta,
   requestMetadata,
 }: CreateFieldOptions) => {
+  const { documentWhereInput, team } = await getDocumentWhereInput({
+    documentId,
+    userId,
+    teamId,
+  });
+
   const document = await prisma.document.findFirst({
+    where: documentWhereInput,
     select: {
       id: true,
     },
-    where: {
-      id: documentId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
-    },
   });
 
   if (!document) {
     throw new Error('Document not found');
   }
 
-  const user = await prisma.user.findFirstOrThrow({
-    where: {
-      id: userId,
-    },
-    select: {
-      id: true,
-      name: true,
-      email: true,
-    },
-  });
-
-  let team: Team | null = null;
-
-  if (teamId) {
-    team = await prisma.team.findFirst({
-      where: {
-        id: teamId,
-        members: {
-          some: {
-            userId,
-          },
-        },
-      },
-    });
-  }
-
   const advancedField = ['NUMBER', 'RADIO', 'CHECKBOX', 'DROPDOWN', 'TEXT'].includes(type);
 
   if (advancedField && !fieldMeta) {
@@ -154,9 +118,9 @@ export const createField = async ({
       type: 'FIELD_CREATED',
       documentId,
       user: {
-        id: team?.id ?? user.id,
-        email: team?.name ?? user.email,
-        name: team ? '' : user.name,
+        id: team.id,
+        email: team.name,
+        name: '',
       },
       data: {
         fieldId: field.secondaryId,
diff --git a/packages/lib/server-only/field/create-template-fields.ts b/packages/lib/server-only/field/create-template-fields.ts
index a9c03eae2..69faf7e17 100644
--- a/packages/lib/server-only/field/create-template-fields.ts
+++ b/packages/lib/server-only/field/create-template-fields.ts
@@ -5,10 +5,11 @@ import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { canRecipientFieldsBeModified } from '../../utils/recipients';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export interface CreateTemplateFieldsOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   templateId: number;
   fields: {
     recipientId: number;
@@ -31,21 +32,7 @@ export const createTemplateFields = async ({
   const template = await prisma.template.findFirst({
     where: {
       id: templateId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
     include: {
       recipients: true,
diff --git a/packages/lib/server-only/field/delete-document-field.ts b/packages/lib/server-only/field/delete-document-field.ts
index 97c6659a1..eea449fa9 100644
--- a/packages/lib/server-only/field/delete-document-field.ts
+++ b/packages/lib/server-only/field/delete-document-field.ts
@@ -5,10 +5,11 @@ import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { canRecipientFieldsBeModified } from '../../utils/recipients';
+import { getDocumentWhereInput } from '../document/get-document-by-id';
 
 export interface DeleteDocumentFieldOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   fieldId: number;
   requestMetadata: ApiRequestMetadata;
 }
@@ -39,25 +40,14 @@ export const deleteDocumentField = async ({
     });
   }
 
+  const { documentWhereInput } = await getDocumentWhereInput({
+    documentId,
+    userId,
+    teamId,
+  });
+
   const document = await prisma.document.findFirst({
-    where: {
-      id: documentId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
-    },
+    where: documentWhereInput,
     include: {
       recipients: {
         where: {
diff --git a/packages/lib/server-only/field/delete-field.ts b/packages/lib/server-only/field/delete-field.ts
index fcd05d9a7..363fc8f27 100644
--- a/packages/lib/server-only/field/delete-field.ts
+++ b/packages/lib/server-only/field/delete-field.ts
@@ -4,12 +4,13 @@ import { prisma } from '@documenso/prisma';
 
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export type DeleteFieldOptions = {
   fieldId: number;
   documentId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
   requestMetadata?: RequestMetadata;
 };
 
@@ -25,21 +26,8 @@ export const deleteField = async ({
       id: fieldId,
       document: {
         id: documentId,
-        ...(teamId
-          ? {
-              team: {
-                id: teamId,
-                members: {
-                  some: {
-                    userId,
-                  },
-                },
-              },
-            }
-          : {
-              userId,
-              teamId: null,
-            }),
+        userId,
+        team: buildTeamWhereQuery({ teamId, userId }),
       },
     },
     include: {
diff --git a/packages/lib/server-only/field/delete-template-field.ts b/packages/lib/server-only/field/delete-template-field.ts
index 3c534943b..87a522068 100644
--- a/packages/lib/server-only/field/delete-template-field.ts
+++ b/packages/lib/server-only/field/delete-template-field.ts
@@ -1,10 +1,11 @@
 import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export interface DeleteTemplateFieldOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   fieldId: number;
 }
 
@@ -16,21 +17,9 @@ export const deleteTemplateField = async ({
   const field = await prisma.field.findFirst({
     where: {
       id: fieldId,
-      template: teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          },
+      template: {
+        team: buildTeamWhereQuery({ teamId, userId }),
+      },
     },
   });
 
diff --git a/packages/lib/server-only/field/get-field-by-id.ts b/packages/lib/server-only/field/get-field-by-id.ts
index 4df97868f..e91a99461 100644
--- a/packages/lib/server-only/field/get-field-by-id.ts
+++ b/packages/lib/server-only/field/get-field-by-id.ts
@@ -1,53 +1,49 @@
 import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export type GetFieldByIdOptions = {
   userId: number;
-  teamId?: number;
+  teamId: number;
   fieldId: number;
-  documentId?: number;
-  templateId?: number;
 };
 
-export const getFieldById = async ({
-  userId,
-  teamId,
-  fieldId,
-  documentId,
-  templateId,
-}: GetFieldByIdOptions) => {
+export const getFieldById = async ({ userId, teamId, fieldId }: GetFieldByIdOptions) => {
   const field = await prisma.field.findFirst({
     where: {
       id: fieldId,
-      documentId,
-      templateId,
+    },
+    include: {
       document: {
-        OR:
-          teamId === undefined
-            ? [
-                {
-                  userId,
-                  teamId: null,
-                },
-              ]
-            : [
-                {
-                  teamId,
-                  team: {
-                    members: {
-                      some: {
-                        userId,
-                      },
-                    },
-                  },
-                },
-              ],
+        select: {
+          teamId: true,
+        },
+      },
+      template: {
+        select: {
+          teamId: true,
+        },
       },
     },
   });
 
-  if (!field) {
+  const foundTeamId = field?.document?.teamId || field?.template?.teamId;
+
+  if (!field || !foundTeamId || foundTeamId !== teamId) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Field not found',
+    });
+  }
+
+  const team = await prisma.team.findUnique({
+    where: buildTeamWhereQuery({
+      teamId: foundTeamId,
+      userId,
+    }),
+  });
+
+  if (!team) {
     throw new AppError(AppErrorCode.NOT_FOUND, {
       message: 'Field not found',
     });
diff --git a/packages/lib/server-only/field/get-fields-for-document.ts b/packages/lib/server-only/field/get-fields-for-document.ts
index 9fa9f592d..007a6c2ba 100644
--- a/packages/lib/server-only/field/get-fields-for-document.ts
+++ b/packages/lib/server-only/field/get-fields-for-document.ts
@@ -1,9 +1,11 @@
 import { prisma } from '@documenso/prisma';
 
+import { buildTeamWhereQuery } from '../../utils/teams';
+
 export interface GetFieldsForDocumentOptions {
   documentId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
 }
 
 export type DocumentField = Awaited<ReturnType<typeof getFieldsForDocument>>[number];
@@ -15,22 +17,10 @@ export const getFieldsForDocument = async ({
 }: GetFieldsForDocumentOptions) => {
   const fields = await prisma.field.findMany({
     where: {
-      documentId,
-      document: teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          },
+      document: {
+        id: documentId,
+        team: buildTeamWhereQuery({ teamId, userId }),
+      },
     },
     include: {
       signature: true,
diff --git a/packages/lib/server-only/field/set-fields-for-document.ts b/packages/lib/server-only/field/set-fields-for-document.ts
index 56772a013..7ec75796a 100644
--- a/packages/lib/server-only/field/set-fields-for-document.ts
+++ b/packages/lib/server-only/field/set-fields-for-document.ts
@@ -26,10 +26,11 @@ import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { canRecipientFieldsBeModified } from '../../utils/recipients';
+import { getDocumentWhereInput } from '../document/get-document-by-id';
 
 export interface SetFieldsForDocumentOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   documentId: number;
   fields: FieldData[];
   requestMetadata: ApiRequestMetadata;
@@ -42,25 +43,14 @@ export const setFieldsForDocument = async ({
   fields,
   requestMetadata,
 }: SetFieldsForDocumentOptions) => {
+  const { documentWhereInput } = await getDocumentWhereInput({
+    documentId,
+    userId,
+    teamId,
+  });
+
   const document = await prisma.document.findFirst({
-    where: {
-      id: documentId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
-    },
+    where: documentWhereInput,
     include: {
       recipients: true,
     },
diff --git a/packages/lib/server-only/field/set-fields-for-template.ts b/packages/lib/server-only/field/set-fields-for-template.ts
index 3d79ba273..285e26e69 100644
--- a/packages/lib/server-only/field/set-fields-for-template.ts
+++ b/packages/lib/server-only/field/set-fields-for-template.ts
@@ -16,9 +16,11 @@ import {
 } from '@documenso/lib/types/field-meta';
 import { prisma } from '@documenso/prisma';
 
+import { buildTeamWhereQuery } from '../../utils/teams';
+
 export type SetFieldsForTemplateOptions = {
   userId: number;
-  teamId?: number;
+  teamId: number;
   templateId: number;
   fields: {
     id?: number | null;
@@ -42,21 +44,7 @@ export const setFieldsForTemplate = async ({
   const template = await prisma.template.findFirst({
     where: {
       id: templateId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
   });
 
diff --git a/packages/lib/server-only/field/update-document-fields.ts b/packages/lib/server-only/field/update-document-fields.ts
index e83c21c03..dc87db70d 100644
--- a/packages/lib/server-only/field/update-document-fields.ts
+++ b/packages/lib/server-only/field/update-document-fields.ts
@@ -11,10 +11,11 @@ import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { canRecipientFieldsBeModified } from '../../utils/recipients';
+import { getDocumentWhereInput } from '../document/get-document-by-id';
 
 export interface UpdateDocumentFieldsOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   documentId: number;
   fields: {
     id: number;
@@ -36,25 +37,14 @@ export const updateDocumentFields = async ({
   fields,
   requestMetadata,
 }: UpdateDocumentFieldsOptions) => {
+  const { documentWhereInput } = await getDocumentWhereInput({
+    documentId,
+    userId,
+    teamId,
+  });
+
   const document = await prisma.document.findFirst({
-    where: {
-      id: documentId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
-    },
+    where: documentWhereInput,
     include: {
       recipients: true,
       fields: true,
diff --git a/packages/lib/server-only/field/update-field.ts b/packages/lib/server-only/field/update-field.ts
index 8ddc0182e..492e46f42 100644
--- a/packages/lib/server-only/field/update-field.ts
+++ b/packages/lib/server-only/field/update-field.ts
@@ -6,12 +6,13 @@ import { prisma } from '@documenso/prisma';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { createDocumentAuditLogData, diffFieldChanges } from '../../utils/document-audit-logs';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export type UpdateFieldOptions = {
   fieldId: number;
   documentId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
   recipientId?: number;
   type?: FieldType;
   pageNumber?: number;
@@ -47,21 +48,8 @@ export const updateField = async ({
       id: fieldId,
       document: {
         id: documentId,
-        ...(teamId
-          ? {
-              team: {
-                id: teamId,
-                members: {
-                  some: {
-                    userId,
-                  },
-                },
-              },
-            }
-          : {
-              userId,
-              teamId: null,
-            }),
+        userId,
+        team: buildTeamWhereQuery({ teamId, userId }),
       },
     },
   });
@@ -101,14 +89,7 @@ export const updateField = async ({
 
     if (teamId) {
       team = await prisma.team.findFirst({
-        where: {
-          id: teamId,
-          members: {
-            some: {
-              userId,
-            },
-          },
-        },
+        where: buildTeamWhereQuery({ teamId, userId }),
       });
     }
 
diff --git a/packages/lib/server-only/field/update-template-fields.ts b/packages/lib/server-only/field/update-template-fields.ts
index 3c1febd61..4b62937bd 100644
--- a/packages/lib/server-only/field/update-template-fields.ts
+++ b/packages/lib/server-only/field/update-template-fields.ts
@@ -5,10 +5,11 @@ import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { canRecipientFieldsBeModified } from '../../utils/recipients';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export interface UpdateTemplateFieldsOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   templateId: number;
   fields: {
     id: number;
@@ -31,21 +32,7 @@ export const updateTemplateFields = async ({
   const template = await prisma.template.findFirst({
     where: {
       id: templateId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
     include: {
       recipients: true,
diff --git a/packages/lib/server-only/folder/create-folder.ts b/packages/lib/server-only/folder/create-folder.ts
index a92b986de..d361ae37d 100644
--- a/packages/lib/server-only/folder/create-folder.ts
+++ b/packages/lib/server-only/folder/create-folder.ts
@@ -1,16 +1,14 @@
-import { TeamMemberRole } from '@prisma/client';
-import type { Team, TeamGlobalSettings } from '@prisma/client';
-
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { prisma } from '@documenso/prisma';
 
 import type { TFolderType } from '../../types/folder-type';
 import { FolderType } from '../../types/folder-type';
 import { determineDocumentVisibility } from '../../utils/document-visibility';
+import { getTeamById } from '../team/get-team';
+import { getTeamSettings } from '../team/get-team-settings';
 
 export interface CreateFolderOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   name: string;
   parentId?: string | null;
   type?: TFolderType;
@@ -23,52 +21,9 @@ export const createFolder = async ({
   parentId,
   type = FolderType.DOCUMENT,
 }: CreateFolderOptions) => {
-  const user = await prisma.user.findFirstOrThrow({
-    where: {
-      id: userId,
-    },
-    include: {
-      teamMembers: {
-        select: {
-          teamId: true,
-        },
-      },
-    },
-  });
+  const team = await getTeamById({ userId, teamId });
 
-  if (
-    teamId !== undefined &&
-    !user.teamMembers.some((teamMember) => teamMember.teamId === teamId)
-  ) {
-    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'Team not found',
-    });
-  }
-
-  let team: (Team & { teamGlobalSettings: TeamGlobalSettings | null }) | null = null;
-  let userTeamRole: TeamMemberRole | undefined;
-
-  if (teamId) {
-    const teamWithUserRole = await prisma.team.findFirstOrThrow({
-      where: {
-        id: teamId,
-      },
-      include: {
-        teamGlobalSettings: true,
-        members: {
-          where: {
-            userId: userId,
-          },
-          select: {
-            role: true,
-          },
-        },
-      },
-    });
-
-    team = teamWithUserRole;
-    userTeamRole = teamWithUserRole.members[0]?.role;
-  }
+  const settings = await getTeamSettings({ userId, teamId });
 
   return await prisma.folder.create({
     data: {
@@ -77,10 +32,7 @@ export const createFolder = async ({
       teamId,
       parentId,
       type,
-      visibility: determineDocumentVisibility(
-        team?.teamGlobalSettings?.documentVisibility,
-        userTeamRole ?? TeamMemberRole.MEMBER,
-      ),
+      visibility: determineDocumentVisibility(settings.documentVisibility, team.currentTeamRole),
     },
   });
 };
diff --git a/packages/lib/server-only/folder/delete-folder.ts b/packages/lib/server-only/folder/delete-folder.ts
index 76ac8a62b..03640ba98 100644
--- a/packages/lib/server-only/folder/delete-folder.ts
+++ b/packages/lib/server-only/folder/delete-folder.ts
@@ -4,45 +4,16 @@ import { match } from 'ts-pattern';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { prisma } from '@documenso/prisma';
 
+import { getTeamById } from '../team/get-team';
+
 export interface DeleteFolderOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   folderId: string;
 }
 
 export const deleteFolder = async ({ userId, teamId, folderId }: DeleteFolderOptions) => {
-  let teamMemberRole: TeamMemberRole | null = null;
-
-  if (teamId) {
-    const team = await prisma.team.findFirst({
-      where: {
-        id: teamId,
-        members: {
-          some: {
-            userId,
-          },
-        },
-      },
-      include: {
-        members: {
-          where: {
-            userId,
-          },
-          select: {
-            role: true,
-          },
-        },
-      },
-    });
-
-    if (!team) {
-      throw new AppError(AppErrorCode.NOT_FOUND, {
-        message: 'Team not found',
-      });
-    }
-
-    teamMemberRole = team.members[0]?.role ?? null;
-  }
+  const team = await getTeamById({ userId, teamId });
 
   const folder = await prisma.folder.findFirst({
     where: {
@@ -63,18 +34,16 @@ export const deleteFolder = async ({ userId, teamId, folderId }: DeleteFolderOpt
     });
   }
 
-  if (teamId && teamMemberRole) {
-    const hasPermission = match(teamMemberRole)
-      .with(TeamMemberRole.ADMIN, () => true)
-      .with(TeamMemberRole.MANAGER, () => folder.visibility !== DocumentVisibility.ADMIN)
-      .with(TeamMemberRole.MEMBER, () => folder.visibility === DocumentVisibility.EVERYONE)
-      .otherwise(() => false);
+  const hasPermission = match(team.currentTeamRole)
+    .with(TeamMemberRole.ADMIN, () => true)
+    .with(TeamMemberRole.MANAGER, () => folder.visibility !== DocumentVisibility.ADMIN)
+    .with(TeamMemberRole.MEMBER, () => folder.visibility === DocumentVisibility.EVERYONE)
+    .otherwise(() => false);
 
-    if (!hasPermission) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You do not have permission to delete this folder',
-      });
-    }
+  if (!hasPermission) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'You do not have permission to delete this folder',
+    });
   }
 
   return await prisma.folder.delete({
diff --git a/packages/lib/server-only/folder/find-folders.ts b/packages/lib/server-only/folder/find-folders.ts
index ec4df30d3..fc4760c97 100644
--- a/packages/lib/server-only/folder/find-folders.ts
+++ b/packages/lib/server-only/folder/find-folders.ts
@@ -5,49 +5,19 @@ import { prisma } from '@documenso/prisma';
 
 import { DocumentVisibility } from '../../types/document-visibility';
 import type { TFolderType } from '../../types/folder-type';
+import { getTeamById } from '../team/get-team';
 
 export interface FindFoldersOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   parentId?: string | null;
   type?: TFolderType;
 }
 
 export const findFolders = async ({ userId, teamId, parentId, type }: FindFoldersOptions) => {
-  let team = null;
-  let teamMemberRole = null;
+  const team = await getTeamById({ userId, teamId });
 
-  if (teamId !== undefined) {
-    try {
-      team = await prisma.team.findFirstOrThrow({
-        where: {
-          id: teamId,
-          members: {
-            some: {
-              userId,
-            },
-          },
-        },
-        include: {
-          members: {
-            where: {
-              userId,
-            },
-            select: {
-              role: true,
-            },
-          },
-        },
-      });
-
-      teamMemberRole = team.members[0].role;
-    } catch (error) {
-      console.error('Error finding team:', error);
-      throw error;
-    }
-  }
-
-  const visibilityFilters = match(teamMemberRole)
+  const visibilityFilters = match(team.currentTeamRole)
     .with(TeamMemberRole.ADMIN, () => ({
       visibility: {
         in: [
@@ -67,14 +37,12 @@ export const findFolders = async ({ userId, teamId, parentId, type }: FindFolder
   const whereClause = {
     AND: [
       { parentId },
-      teamId
-        ? {
-            OR: [
-              { teamId, ...visibilityFilters },
-              { userId, teamId },
-            ],
-          }
-        : { userId, teamId: null },
+      {
+        OR: [
+          { teamId, ...visibilityFilters },
+          { userId, teamId },
+        ],
+      },
     ],
   };
 
@@ -94,7 +62,8 @@ export const findFolders = async ({ userId, teamId, parentId, type }: FindFolder
             prisma.folder.findMany({
               where: {
                 parentId: folder.id,
-                ...(teamId ? { teamId, ...visibilityFilters } : { userId, teamId: null }),
+                teamId,
+                ...visibilityFilters,
               },
               orderBy: {
                 createdAt: 'desc',
@@ -113,7 +82,8 @@ export const findFolders = async ({ userId, teamId, parentId, type }: FindFolder
             prisma.folder.count({
               where: {
                 parentId: folder.id,
-                ...(teamId ? { teamId, ...visibilityFilters } : { userId, teamId: null }),
+                teamId,
+                ...visibilityFilters,
               },
             }),
           ]);
diff --git a/packages/lib/server-only/folder/get-folder-breadcrumbs.ts b/packages/lib/server-only/folder/get-folder-breadcrumbs.ts
index c5d7327b0..736e62187 100644
--- a/packages/lib/server-only/folder/get-folder-breadcrumbs.ts
+++ b/packages/lib/server-only/folder/get-folder-breadcrumbs.ts
@@ -5,10 +5,11 @@ import { prisma } from '@documenso/prisma';
 
 import { DocumentVisibility } from '../../types/document-visibility';
 import type { TFolderType } from '../../types/folder-type';
+import { getTeamById } from '../team/get-team';
 
 export interface GetFolderBreadcrumbsOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   folderId: string;
   type?: TFolderType;
 }
@@ -19,39 +20,9 @@ export const getFolderBreadcrumbs = async ({
   folderId,
   type,
 }: GetFolderBreadcrumbsOptions) => {
-  let teamMemberRole = null;
+  const team = await getTeamById({ userId, teamId });
 
-  if (teamId !== undefined) {
-    try {
-      const team = await prisma.team.findFirstOrThrow({
-        where: {
-          id: teamId,
-          members: {
-            some: {
-              userId,
-            },
-          },
-        },
-        include: {
-          members: {
-            where: {
-              userId,
-            },
-            select: {
-              role: true,
-            },
-          },
-        },
-      });
-
-      teamMemberRole = team.members[0].role;
-    } catch (error) {
-      console.error('Error finding team:', error);
-      return [];
-    }
-  }
-
-  const visibilityFilters = match(teamMemberRole)
+  const visibilityFilters = match(team.currentTeamRole)
     .with(TeamMemberRole.ADMIN, () => ({
       visibility: {
         in: [
@@ -71,14 +42,10 @@ export const getFolderBreadcrumbs = async ({
   const whereClause = (folderId: string) => ({
     id: folderId,
     ...(type ? { type } : {}),
-    ...(teamId
-      ? {
-          OR: [
-            { teamId, ...visibilityFilters },
-            { userId, teamId },
-          ],
-        }
-      : { userId, teamId: null }),
+    OR: [
+      { teamId, ...visibilityFilters },
+      { userId, teamId },
+    ],
   });
 
   const breadcrumbs = [];
diff --git a/packages/lib/server-only/folder/get-folder-by-id.ts b/packages/lib/server-only/folder/get-folder-by-id.ts
index c4a069f90..64cb563c6 100644
--- a/packages/lib/server-only/folder/get-folder-by-id.ts
+++ b/packages/lib/server-only/folder/get-folder-by-id.ts
@@ -6,49 +6,19 @@ import { prisma } from '@documenso/prisma';
 
 import { DocumentVisibility } from '../../types/document-visibility';
 import type { TFolderType } from '../../types/folder-type';
+import { getTeamById } from '../team/get-team';
 
 export interface GetFolderByIdOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   folderId?: string;
   type?: TFolderType;
 }
 
 export const getFolderById = async ({ userId, teamId, folderId, type }: GetFolderByIdOptions) => {
-  let teamMemberRole = null;
+  const team = await getTeamById({ userId, teamId });
 
-  if (teamId !== undefined) {
-    try {
-      const team = await prisma.team.findFirstOrThrow({
-        where: {
-          id: teamId,
-          members: {
-            some: {
-              userId,
-            },
-          },
-        },
-        include: {
-          members: {
-            where: {
-              userId,
-            },
-            select: {
-              role: true,
-            },
-          },
-        },
-      });
-
-      teamMemberRole = team.members[0].role;
-    } catch (error) {
-      throw new AppError(AppErrorCode.NOT_FOUND, {
-        message: 'Team not found',
-      });
-    }
-  }
-
-  const visibilityFilters = match(teamMemberRole)
+  const visibilityFilters = match(team.currentTeamRole)
     .with(TeamMemberRole.ADMIN, () => ({
       visibility: {
         in: [
@@ -68,14 +38,10 @@ export const getFolderById = async ({ userId, teamId, folderId, type }: GetFolde
   const whereClause = {
     id: folderId,
     ...(type ? { type } : {}),
-    ...(teamId
-      ? {
-          OR: [
-            { teamId, ...visibilityFilters },
-            { userId, teamId },
-          ],
-        }
-      : { userId, teamId: null }),
+    OR: [
+      { teamId, ...visibilityFilters },
+      { userId, teamId },
+    ],
   };
 
   const folder = await prisma.folder.findFirst({
diff --git a/packages/lib/server-only/folder/move-document-to-folder.ts b/packages/lib/server-only/folder/move-document-to-folder.ts
index d0ecb3188..9cc0e25e7 100644
--- a/packages/lib/server-only/folder/move-document-to-folder.ts
+++ b/packages/lib/server-only/folder/move-document-to-folder.ts
@@ -7,9 +7,11 @@ import { FolderType } from '@documenso/lib/types/folder-type';
 import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { prisma } from '@documenso/prisma';
 
+import { getTeamById } from '../team/get-team';
+
 export interface MoveDocumentToFolderOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   documentId: number;
   folderId?: string | null;
   requestMetadata?: ApiRequestMetadata;
@@ -21,41 +23,9 @@ export const moveDocumentToFolder = async ({
   documentId,
   folderId,
 }: MoveDocumentToFolderOptions) => {
-  let teamMemberRole = null;
+  const team = await getTeamById({ userId, teamId });
 
-  if (teamId !== undefined) {
-    try {
-      const team = await prisma.team.findFirstOrThrow({
-        where: {
-          id: teamId,
-          members: {
-            some: {
-              userId,
-            },
-          },
-        },
-        include: {
-          members: {
-            where: {
-              userId,
-            },
-            select: {
-              role: true,
-            },
-          },
-        },
-      });
-
-      teamMemberRole = team.members[0].role;
-    } catch (error) {
-      console.error('Error finding team:', error);
-      throw new AppError(AppErrorCode.NOT_FOUND, {
-        message: 'Team not found',
-      });
-    }
-  }
-
-  const visibilityFilters = match(teamMemberRole)
+  const visibilityFilters = match(team.currentTeamRole)
     .with(TeamMemberRole.ADMIN, () => ({
       visibility: {
         in: [
@@ -74,14 +44,10 @@ export const moveDocumentToFolder = async ({
 
   const documentWhereClause = {
     id: documentId,
-    ...(teamId
-      ? {
-          OR: [
-            { teamId, ...visibilityFilters },
-            { userId, teamId },
-          ],
-        }
-      : { userId, teamId: null }),
+    OR: [
+      { teamId, ...visibilityFilters },
+      { userId, teamId },
+    ],
   };
 
   const document = await prisma.document.findFirst({
@@ -98,14 +64,10 @@ export const moveDocumentToFolder = async ({
     const folderWhereClause = {
       id: folderId,
       type: FolderType.DOCUMENT,
-      ...(teamId
-        ? {
-            OR: [
-              { teamId, ...visibilityFilters },
-              { userId, teamId },
-            ],
-          }
-        : { userId, teamId: null }),
+      OR: [
+        { teamId, ...visibilityFilters },
+        { userId, teamId },
+      ],
     };
 
     const folder = await prisma.folder.findFirst({
diff --git a/packages/lib/server-only/organisation/accept-organisation-invitation.ts b/packages/lib/server-only/organisation/accept-organisation-invitation.ts
new file mode 100644
index 000000000..653731470
--- /dev/null
+++ b/packages/lib/server-only/organisation/accept-organisation-invitation.ts
@@ -0,0 +1,105 @@
+import { OrganisationGroupType, OrganisationMemberInviteStatus } from '@prisma/client';
+
+import { prisma } from '@documenso/prisma';
+
+import { AppError, AppErrorCode } from '../../errors/app-error';
+import { jobs } from '../../jobs/client';
+import { generateDatabaseId } from '../../universal/id';
+
+export type AcceptOrganisationInvitationOptions = {
+  token: string;
+};
+
+export const acceptOrganisationInvitation = async ({
+  token,
+}: AcceptOrganisationInvitationOptions) => {
+  const organisationMemberInvite = await prisma.organisationMemberInvite.findFirst({
+    where: {
+      token,
+      status: {
+        not: OrganisationMemberInviteStatus.DECLINED,
+      },
+    },
+    include: {
+      organisation: {
+        include: {
+          groups: {
+            include: {
+              teamGroups: true,
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (!organisationMemberInvite) {
+    throw new AppError(AppErrorCode.NOT_FOUND);
+  }
+
+  if (organisationMemberInvite.status === OrganisationMemberInviteStatus.ACCEPTED) {
+    return;
+  }
+
+  const user = await prisma.user.findFirst({
+    where: {
+      email: organisationMemberInvite.email,
+    },
+  });
+
+  if (!user) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'User must exist to accept an organisation invitation',
+    });
+  }
+
+  const { organisation } = organisationMemberInvite;
+
+  const organisationGroupToUse = organisation.groups.find(
+    (group) =>
+      group.type === OrganisationGroupType.INTERNAL_ORGANISATION &&
+      group.organisationRole === organisationMemberInvite.organisationRole,
+  );
+
+  if (!organisationGroupToUse) {
+    throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+      message: 'Organisation group not found',
+    });
+  }
+
+  await prisma.$transaction(
+    async (tx) => {
+      await tx.organisationMember.create({
+        data: {
+          id: generateDatabaseId('member'),
+          userId: user.id,
+          organisationId: organisation.id,
+          organisationGroupMembers: {
+            create: {
+              id: generateDatabaseId('group_member'),
+              groupId: organisationGroupToUse.id,
+            },
+          },
+        },
+      });
+
+      await tx.organisationMemberInvite.update({
+        where: {
+          id: organisationMemberInvite.id,
+        },
+        data: {
+          status: OrganisationMemberInviteStatus.ACCEPTED,
+        },
+      });
+
+      await jobs.triggerJob({
+        name: 'send.organisation-member-joined.email',
+        payload: {
+          organisationId: organisation.id,
+          memberUserId: user.id,
+        },
+      });
+    },
+    { timeout: 30_000 },
+  );
+};
diff --git a/packages/lib/server-only/team/create-team-billing-portal.ts b/packages/lib/server-only/organisation/create-organisation-billing-portal.ts
similarity index 100%
rename from packages/lib/server-only/team/create-team-billing-portal.ts
rename to packages/lib/server-only/organisation/create-organisation-billing-portal.ts
diff --git a/packages/lib/server-only/organisation/create-organisation-member-invites.ts b/packages/lib/server-only/organisation/create-organisation-member-invites.ts
new file mode 100644
index 000000000..032a49d03
--- /dev/null
+++ b/packages/lib/server-only/organisation/create-organisation-member-invites.ts
@@ -0,0 +1,224 @@
+import { createElement } from 'react';
+
+import { msg } from '@lingui/core/macro';
+import type { Organisation, Prisma } from '@prisma/client';
+import { OrganisationMemberInviteStatus } from '@prisma/client';
+import { nanoid } from 'nanoid';
+
+import { syncMemberCountWithStripeSeatPlan } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
+import { mailer } from '@documenso/email/mailer';
+import { OrganisationInviteEmailTemplate } from '@documenso/email/templates/organisation-invite';
+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email';
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { isOrganisationRoleWithinUserHierarchy } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+import type { TCreateOrganisationMemberInvitesRequestSchema } from '@documenso/trpc/server/organisation-router/create-organisation-member-invites.types';
+
+import { getI18nInstance } from '../../client-only/providers/i18n-server';
+import { generateDatabaseId } from '../../universal/id';
+import { validateIfSubscriptionIsRequired } from '../../utils/billing';
+import { buildOrganisationWhereQuery } from '../../utils/organisations';
+import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+import { getEmailContext } from '../email/get-email-context';
+import { getMemberOrganisationRole } from '../team/get-member-roles';
+
+export type CreateOrganisationMemberInvitesOptions = {
+  userId: number;
+  userName: string;
+  organisationId: string;
+  invitations: TCreateOrganisationMemberInvitesRequestSchema['invitations'];
+};
+
+/**
+ * Invite organisation members via email to join a organisation.
+ */
+export const createOrganisationMemberInvites = async ({
+  userId,
+  userName,
+  organisationId,
+  invitations,
+}: CreateOrganisationMemberInvitesOptions): Promise<void> => {
+  const organisation = await prisma.organisation.findFirst({
+    where: buildOrganisationWhereQuery({
+      organisationId,
+      userId,
+      roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+    }),
+    include: {
+      members: {
+        select: {
+          user: {
+            select: {
+              id: true,
+              email: true,
+            },
+          },
+        },
+      },
+      invites: {
+        where: {
+          status: OrganisationMemberInviteStatus.PENDING,
+        },
+      },
+      organisationGlobalSettings: true,
+      organisationClaim: true,
+      subscription: true,
+    },
+  });
+
+  if (!organisation) {
+    throw new AppError(AppErrorCode.NOT_FOUND);
+  }
+
+  const { organisationClaim } = organisation;
+
+  const subscription = validateIfSubscriptionIsRequired(organisation.subscription);
+
+  const currentOrganisationMemberRole = await getMemberOrganisationRole({
+    organisationId: organisation.id,
+    reference: {
+      type: 'User',
+      id: userId,
+    },
+  });
+
+  const organisationMemberEmails = organisation.members.map((member) => member.user.email);
+  const organisationMemberInviteEmails = organisation.invites.map((invite) => invite.email);
+
+  const usersToInvite = invitations.filter((invitation) => {
+    // Filter out users that are already members of the organisation.
+    if (organisationMemberEmails.includes(invitation.email)) {
+      return false;
+    }
+
+    // Filter out users that have already been invited to the organisation.
+    if (organisationMemberInviteEmails.includes(invitation.email)) {
+      return false;
+    }
+
+    return true;
+  });
+
+  const unauthorizedRoleAccess = usersToInvite.some(
+    ({ organisationRole }) =>
+      !isOrganisationRoleWithinUserHierarchy(currentOrganisationMemberRole, organisationRole),
+  );
+
+  if (unauthorizedRoleAccess) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'User does not have permission to set high level roles',
+    });
+  }
+
+  const organisationMemberInvites: Prisma.OrganisationMemberInviteCreateManyInput[] =
+    usersToInvite.map(({ email, organisationRole }) => ({
+      id: generateDatabaseId('member_invite'),
+      email,
+      organisationId,
+      organisationRole,
+      token: nanoid(32),
+    }));
+
+  const numberOfCurrentMembers = organisation.members.length;
+  const numberOfCurrentInvites = organisation.invites.length;
+  const numberOfNewInvites = organisationMemberInvites.length;
+
+  const totalMemberCountWithInvites =
+    numberOfCurrentMembers + numberOfCurrentInvites + numberOfNewInvites;
+
+  // Handle billing for seat based plans.
+  if (subscription) {
+    await syncMemberCountWithStripeSeatPlan(
+      subscription,
+      organisationClaim,
+      totalMemberCountWithInvites,
+    );
+  }
+
+  await prisma.organisationMemberInvite.createMany({
+    data: organisationMemberInvites,
+  });
+
+  const sendEmailResult = await Promise.allSettled(
+    organisationMemberInvites.map(async ({ email, token }) =>
+      sendOrganisationMemberInviteEmail({
+        email,
+        token,
+        organisation,
+        senderName: userName,
+      }),
+    ),
+  );
+
+  const sendEmailResultErrorList = sendEmailResult.filter(
+    (result): result is PromiseRejectedResult => result.status === 'rejected',
+  );
+
+  if (sendEmailResultErrorList.length > 0) {
+    console.error(JSON.stringify(sendEmailResultErrorList));
+
+    throw new AppError('EmailDeliveryFailed', {
+      message: 'Failed to send invite emails to one or more users.',
+      userMessage: `Failed to send invites to ${sendEmailResultErrorList.length}/${organisationMemberInvites.length} users.`,
+    });
+  }
+};
+
+type SendOrganisationMemberInviteEmailOptions = {
+  email: string;
+  senderName: string;
+  token: string;
+  organisation: Pick<Organisation, 'id' | 'name'>;
+};
+
+/**
+ * Send an email to a user inviting them to join a organisation.
+ */
+export const sendOrganisationMemberInviteEmail = async ({
+  email,
+  senderName,
+  token,
+  organisation,
+}: SendOrganisationMemberInviteEmailOptions) => {
+  const template = createElement(OrganisationInviteEmailTemplate, {
+    assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
+    baseUrl: NEXT_PUBLIC_WEBAPP_URL(),
+    senderName,
+    token,
+    organisationName: organisation.name,
+  });
+
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'organisation',
+      organisationId: organisation.id,
+    },
+  });
+
+  const [html, text] = await Promise.all([
+    renderEmailWithI18N(template, {
+      lang: settings.documentLanguage,
+      branding,
+    }),
+    renderEmailWithI18N(template, {
+      lang: settings.documentLanguage,
+      branding,
+      plainText: true,
+    }),
+  ]);
+
+  const i18n = await getI18nInstance(settings.documentLanguage);
+
+  await mailer.sendMail({
+    to: email,
+    from: {
+      name: FROM_NAME,
+      address: FROM_ADDRESS,
+    },
+    subject: i18n._(msg`You have been invited to join ${organisation.name} on Documenso`),
+    html,
+    text,
+  });
+};
diff --git a/packages/lib/server-only/organisation/create-organisation.ts b/packages/lib/server-only/organisation/create-organisation.ts
new file mode 100644
index 000000000..c00ebd82c
--- /dev/null
+++ b/packages/lib/server-only/organisation/create-organisation.ts
@@ -0,0 +1,175 @@
+import type { Prisma } from '@prisma/client';
+import { OrganisationType } from '@prisma/client';
+import { OrganisationMemberRole } from '@prisma/client';
+
+import { prisma } from '@documenso/prisma';
+
+import { ORGANISATION_INTERNAL_GROUPS } from '../../constants/organisations';
+import { AppErrorCode } from '../../errors/app-error';
+import { AppError } from '../../errors/app-error';
+import type { InternalClaim } from '../../types/subscription';
+import { INTERNAL_CLAIM_ID, internalClaims } from '../../types/subscription';
+import { generateDatabaseId, prefixedId } from '../../universal/id';
+import { generateDefaultOrganisationSettings } from '../../utils/organisations';
+import { createTeam } from '../team/create-team';
+
+type CreateOrganisationOptions = {
+  userId: number;
+  name: string;
+  type: OrganisationType;
+  url?: string;
+  customerId?: string;
+  claim: InternalClaim;
+};
+
+export const createOrganisation = async ({
+  name,
+  url,
+  type,
+  userId,
+  customerId,
+  claim,
+}: CreateOrganisationOptions) => {
+  return await prisma.$transaction(async (tx) => {
+    const organisationSetting = await tx.organisationGlobalSettings.create({
+      data: {
+        ...generateDefaultOrganisationSettings(),
+        id: generateDatabaseId('org_setting'),
+      },
+    });
+
+    const organisationClaim = await tx.organisationClaim.create({
+      data: {
+        id: generateDatabaseId('org_claim'),
+        originalSubscriptionClaimId: claim.id,
+        ...createOrganisationClaimUpsertData(claim),
+      },
+    });
+
+    const orgIdAndUrl = prefixedId('org');
+
+    const organisation = await tx.organisation
+      .create({
+        data: {
+          id: orgIdAndUrl,
+          name,
+          type,
+          url: url || orgIdAndUrl,
+          ownerUserId: userId,
+          organisationGlobalSettingsId: organisationSetting.id,
+          organisationClaimId: organisationClaim.id,
+          groups: {
+            create: ORGANISATION_INTERNAL_GROUPS.map((group) => ({
+              ...group,
+              id: generateDatabaseId('org_group'),
+            })),
+          },
+          customerId,
+        },
+        include: {
+          groups: true,
+        },
+      })
+      .catch((err) => {
+        if (err.code === 'P2002') {
+          throw new AppError(AppErrorCode.ALREADY_EXISTS, {
+            message: 'Organisation URL already exists',
+          });
+        }
+
+        throw err;
+      });
+
+    const adminGroup = organisation.groups.find(
+      (group) => group.organisationRole === OrganisationMemberRole.ADMIN,
+    );
+
+    if (!adminGroup) {
+      throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+        message: 'Admin group not found',
+      });
+    }
+
+    await tx.organisationMember.create({
+      data: {
+        id: generateDatabaseId('member'),
+        userId,
+        organisationId: organisation.id,
+        organisationGroupMembers: {
+          create: {
+            id: generateDatabaseId('group_member'),
+            groupId: adminGroup.id,
+          },
+        },
+      },
+    });
+
+    return organisation;
+  });
+};
+
+type CreatePersonalOrganisationOptions = {
+  userId: number;
+  orgUrl?: string;
+  throwErrorOnOrganisationCreationFailure?: boolean;
+  inheritMembers?: boolean;
+  type?: OrganisationType;
+};
+
+export const createPersonalOrganisation = async ({
+  userId,
+  orgUrl,
+  throwErrorOnOrganisationCreationFailure = false,
+  inheritMembers = true,
+  type = OrganisationType.PERSONAL,
+}: CreatePersonalOrganisationOptions) => {
+  const organisation = await createOrganisation({
+    name: 'Personal Organisation',
+    userId,
+    url: orgUrl,
+    type,
+    claim: internalClaims[INTERNAL_CLAIM_ID.FREE],
+  }).catch((err) => {
+    console.error(err);
+
+    if (throwErrorOnOrganisationCreationFailure) {
+      throw err;
+    }
+
+    // Todo: (LOGS)
+  });
+
+  if (organisation) {
+    await createTeam({
+      userId,
+      teamName: 'Personal Team',
+      teamUrl: prefixedId('personal'),
+      organisationId: organisation.id,
+      inheritMembers,
+    }).catch((err) => {
+      console.error(err);
+
+      // Todo: (LOGS)
+    });
+  }
+
+  return organisation;
+};
+
+export const createOrganisationClaimUpsertData = (subscriptionClaim: InternalClaim) => {
+  // Done like this to ensure type errors are thrown if items are added.
+  const data: Omit<
+    Prisma.SubscriptionClaimCreateInput,
+    'id' | 'createdAt' | 'updatedAt' | 'locked' | 'name'
+  > = {
+    flags: {
+      ...subscriptionClaim.flags,
+    },
+    teamCount: subscriptionClaim.teamCount,
+    memberCount: subscriptionClaim.memberCount,
+  };
+
+  return {
+    ...data,
+  };
+};
diff --git a/packages/lib/server-only/organisation/get-organisation-claims.ts b/packages/lib/server-only/organisation/get-organisation-claims.ts
new file mode 100644
index 000000000..18096269d
--- /dev/null
+++ b/packages/lib/server-only/organisation/get-organisation-claims.ts
@@ -0,0 +1,39 @@
+import { prisma } from '@documenso/prisma';
+
+import { AppError, AppErrorCode } from '../../errors/app-error';
+
+export const getOrganisationClaim = async ({ organisationId }: { organisationId: string }) => {
+  const organisationClaim = await prisma.organisationClaim.findFirst({
+    where: {
+      organisation: {
+        id: organisationId,
+      },
+    },
+  });
+
+  if (!organisationClaim) {
+    throw new AppError(AppErrorCode.NOT_FOUND);
+  }
+
+  return organisationClaim;
+};
+
+export const getOrganisationClaimByTeamId = async ({ teamId }: { teamId: number }) => {
+  const organisationClaim = await prisma.organisationClaim.findFirst({
+    where: {
+      organisation: {
+        teams: {
+          some: {
+            id: teamId,
+          },
+        },
+      },
+    },
+  });
+
+  if (!organisationClaim) {
+    throw new AppError(AppErrorCode.NOT_FOUND);
+  }
+
+  return organisationClaim;
+};
diff --git a/packages/lib/server-only/profile/get-public-profile-by-url.ts b/packages/lib/server-only/profile/get-public-profile-by-url.ts
index 679bedb7e..1c9a2133e 100644
--- a/packages/lib/server-only/profile/get-public-profile-by-url.ts
+++ b/packages/lib/server-only/profile/get-public-profile-by-url.ts
@@ -1,15 +1,8 @@
 import type { Template, TemplateDirectLink } from '@prisma/client';
-import {
-  SubscriptionStatus,
-  type TeamProfile,
-  TemplateType,
-  type UserProfile,
-} from '@prisma/client';
+import { type TeamProfile, TemplateType } from '@prisma/client';
 
-import { getCommunityPlanPriceIds } from '@documenso/ee/server-only/stripe/get-community-plan-prices';
 import { prisma } from '@documenso/prisma';
 
-import { IS_BILLING_ENABLED } from '../../constants/app';
 import { AppError, AppErrorCode } from '../../errors/app-error';
 
 export type GetPublicProfileByUrlOptions = {
@@ -23,7 +16,7 @@ type PublicDirectLinkTemplate = Template & {
   };
 };
 
-type BaseResponse = {
+type GetPublicProfileByUrlResponse = {
   url: string;
   name: string;
   avatarImageId?: string | null;
@@ -32,155 +25,56 @@ type BaseResponse = {
     since: Date;
   };
   templates: PublicDirectLinkTemplate[];
+  profile: TeamProfile;
 };
 
-type GetPublicProfileByUrlResponse = BaseResponse &
-  (
-    | {
-        type: 'User';
-        profile: UserProfile;
-      }
-    | {
-        type: 'Team';
-        profile: TeamProfile;
-      }
-  );
-
 /**
  * Get the user or team public profile by URL.
  */
 export const getPublicProfileByUrl = async ({
   profileUrl,
 }: GetPublicProfileByUrlOptions): Promise<GetPublicProfileByUrlResponse> => {
-  const [user, team] = await Promise.all([
-    prisma.user.findFirst({
-      where: {
-        url: profileUrl,
-        profile: {
-          enabled: true,
+  const team = await prisma.team.findFirst({
+    where: {
+      url: profileUrl,
+      profile: {
+        enabled: true,
+      },
+    },
+    include: {
+      profile: true,
+      templates: {
+        where: {
+          directLink: {
+            enabled: true,
+          },
+          type: TemplateType.PUBLIC,
+        },
+        include: {
+          directLink: true,
         },
       },
-      include: {
-        profile: true,
-        templates: {
-          where: {
-            directLink: {
-              enabled: true,
-            },
-            type: TemplateType.PUBLIC,
-          },
-          include: {
-            directLink: true,
-          },
-        },
-        // Subscriptions and teamMembers are used to calculate the badges.
-        subscriptions: {
-          where: {
-            status: SubscriptionStatus.ACTIVE,
-          },
-        },
-        teamMembers: {
-          select: {
-            createdAt: true,
-          },
-          orderBy: {
-            createdAt: 'asc',
-          },
-        },
-      },
-    }),
-    prisma.team.findFirst({
-      where: {
-        url: profileUrl,
-        profile: {
-          enabled: true,
-        },
-      },
-      include: {
-        profile: true,
-        templates: {
-          where: {
-            directLink: {
-              enabled: true,
-            },
-            type: TemplateType.PUBLIC,
-          },
-          include: {
-            directLink: true,
-          },
-        },
-      },
-    }),
-  ]);
+    },
+  });
 
-  // Log as critical error.
-  if (user?.profile && team?.profile) {
-    console.error('Profile URL is ambiguous', { profileUrl, userId: user.id, teamId: team.id });
-    throw new AppError(AppErrorCode.INVALID_REQUEST, {
-      message: 'Profile URL is ambiguous',
+  if (!team?.profile?.enabled) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Profile not found',
     });
   }
 
-  if (user?.profile?.enabled) {
-    let badge: BaseResponse['badge'] = undefined;
-
-    if (user.teamMembers[0]) {
-      badge = {
-        type: 'Premium',
-        since: user.teamMembers[0]['createdAt'],
-      };
-    }
-
-    if (IS_BILLING_ENABLED()) {
-      const earlyAdopterPriceIds = await getCommunityPlanPriceIds();
-
-      const activeEarlyAdopterSub = user.subscriptions.find(
-        (subscription) =>
-          subscription.status === SubscriptionStatus.ACTIVE &&
-          earlyAdopterPriceIds.includes(subscription.priceId),
-      );
-
-      if (activeEarlyAdopterSub) {
-        badge = {
-          type: 'EarlySupporter',
-          since: activeEarlyAdopterSub.createdAt,
-        };
-      }
-    }
-
-    return {
-      type: 'User',
-      badge,
-      profile: user.profile,
-      url: profileUrl,
-      avatarImageId: user.avatarImageId,
-      name: user.name || '',
-      templates: user.templates.filter(
-        (template): template is PublicDirectLinkTemplate =>
-          template.directLink?.enabled === true && template.type === TemplateType.PUBLIC,
-      ),
-    };
-  }
-
-  if (team?.profile?.enabled) {
-    return {
-      type: 'Team',
-      badge: {
-        type: 'Premium',
-        since: team.createdAt,
-      },
-      profile: team.profile,
-      url: profileUrl,
-      avatarImageId: team.avatarImageId,
-      name: team.name || '',
-      templates: team.templates.filter(
-        (template): template is PublicDirectLinkTemplate =>
-          template.directLink?.enabled === true && template.type === TemplateType.PUBLIC,
-      ),
-    };
-  }
-
-  throw new AppError(AppErrorCode.NOT_FOUND, {
-    message: 'Profile not found',
-  });
+  return {
+    badge: {
+      type: 'Premium',
+      since: team.createdAt,
+    },
+    profile: team.profile,
+    url: profileUrl,
+    avatarImageId: team.avatarImageId,
+    name: team.name || '',
+    templates: team.templates.filter(
+      (template): template is PublicDirectLinkTemplate =>
+        template.directLink?.enabled === true && template.type === TemplateType.PUBLIC,
+    ),
+  };
 };
diff --git a/packages/lib/server-only/profile/set-avatar-image.ts b/packages/lib/server-only/profile/set-avatar-image.ts
index 1bb63d824..97b8cabe4 100644
--- a/packages/lib/server-only/profile/set-avatar-image.ts
+++ b/packages/lib/server-only/profile/set-avatar-image.ts
@@ -2,51 +2,49 @@ import sharp from 'sharp';
 
 import { prisma } from '@documenso/prisma';
 
-import { AppError, AppErrorCode } from '../../errors/app-error';
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/organisations';
+import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams';
+import { AppError } from '../../errors/app-error';
 import type { ApiRequestMetadata } from '../../universal/extract-request-metadata';
+import { buildOrganisationWhereQuery } from '../../utils/organisations';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export type SetAvatarImageOptions = {
   userId: number;
-  teamId?: number | null;
+  target:
+    | {
+        type: 'user';
+      }
+    | {
+        type: 'team';
+        teamId: number;
+      }
+    | {
+        type: 'organisation';
+        organisationId: string;
+      };
   bytes?: string | null;
   requestMetadata: ApiRequestMetadata;
 };
 
+/**
+ * Pretty nasty but will do for now.
+ */
 export const setAvatarImage = async ({
   userId,
-  teamId,
+  target,
   bytes,
   requestMetadata,
 }: SetAvatarImageOptions) => {
   let oldAvatarImageId: string | null = null;
 
-  const user = await prisma.user.findUnique({
-    where: {
-      id: userId,
-    },
-    include: {
-      avatarImage: true,
-    },
-  });
-
-  if (!user) {
-    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'User not found',
-    });
-  }
-
-  oldAvatarImageId = user.avatarImageId;
-
-  if (teamId) {
+  if (target.type === 'team') {
     const team = await prisma.team.findFirst({
-      where: {
-        id: teamId,
-        members: {
-          some: {
-            userId,
-          },
-        },
-      },
+      where: buildTeamWhereQuery({
+        teamId: target.teamId,
+        userId,
+        roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+      }),
     });
 
     if (!team) {
@@ -56,6 +54,39 @@ export const setAvatarImage = async ({
     }
 
     oldAvatarImageId = team.avatarImageId;
+  } else if (target.type === 'organisation') {
+    const organisation = await prisma.organisation.findFirst({
+      where: buildOrganisationWhereQuery({
+        organisationId: target.organisationId,
+        userId,
+        roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+      }),
+    });
+
+    if (!organisation) {
+      throw new AppError('ORGANISATION_NOT_FOUND', {
+        statusCode: 404,
+      });
+    }
+
+    oldAvatarImageId = organisation.avatarImageId;
+  } else {
+    const user = await prisma.user.findUnique({
+      where: {
+        id: userId,
+      },
+      include: {
+        avatarImage: true,
+      },
+    });
+
+    if (!user) {
+      throw new AppError('USER_NOT_FOUND', {
+        statusCode: 404,
+      });
+    }
+
+    oldAvatarImageId = user.avatarImageId;
   }
 
   if (oldAvatarImageId) {
@@ -83,17 +114,26 @@ export const setAvatarImage = async ({
     newAvatarImageId = avatarImage.id;
   }
 
-  if (teamId) {
+  // TODO: Audit Logs
+
+  if (target.type === 'team') {
     await prisma.team.update({
       where: {
-        id: teamId,
+        id: target.teamId,
+      },
+      data: {
+        avatarImageId: newAvatarImageId,
+      },
+    });
+  } else if (target.type === 'organisation') {
+    await prisma.organisation.update({
+      where: {
+        id: target.organisationId,
       },
       data: {
         avatarImageId: newAvatarImageId,
       },
     });
-
-    // TODO: Audit Logs
   } else {
     await prisma.user.update({
       where: {
@@ -103,8 +143,6 @@ export const setAvatarImage = async ({
         avatarImageId: newAvatarImageId,
       },
     });
-
-    // TODO: Audit Logs
   }
 
   return newAvatarImageId;
diff --git a/packages/lib/server-only/public-api/create-api-token.ts b/packages/lib/server-only/public-api/create-api-token.ts
index 459537e58..cdf3caf08 100644
--- a/packages/lib/server-only/public-api/create-api-token.ts
+++ b/packages/lib/server-only/public-api/create-api-token.ts
@@ -1,13 +1,14 @@
-import { TeamMemberRole } from '@prisma/client';
 import type { Duration } from 'luxon';
 import { DateTime } from 'luxon';
 
 import { prisma } from '@documenso/prisma';
 
+import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams';
 // temporary choice for testing only
 import * as timeConstants from '../../constants/time';
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { alphaid } from '../../universal/id';
+import { buildTeamWhereQuery } from '../../utils/teams';
 import { hashString } from '../auth/hash';
 
 type TimeConstants = typeof timeConstants & {
@@ -16,7 +17,7 @@ type TimeConstants = typeof timeConstants & {
 
 type CreateApiTokenInput = {
   userId: number;
-  teamId?: number;
+  teamId: number;
   tokenName: string;
   expiresIn: string | null;
 };
@@ -33,20 +34,18 @@ export const createApiToken = async ({
 
   const timeConstantsRecords: TimeConstants = timeConstants;
 
-  if (teamId) {
-    const member = await prisma.teamMember.findFirst({
-      where: {
-        userId,
-        teamId,
-        role: TeamMemberRole.ADMIN,
-      },
-    });
+  const team = await prisma.team.findFirst({
+    where: buildTeamWhereQuery({
+      teamId,
+      userId,
+      roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+    }),
+  });
 
-    if (!member) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You do not have permission to create a token for this team',
-      });
-    }
+  if (!team) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'You do not have permission to create a token for this team',
+    });
   }
 
   const storedToken = await prisma.apiToken.create({
diff --git a/packages/lib/server-only/public-api/delete-api-token-by-id.ts b/packages/lib/server-only/public-api/delete-api-token-by-id.ts
index 246ca9bfb..751b08c4f 100644
--- a/packages/lib/server-only/public-api/delete-api-token-by-id.ts
+++ b/packages/lib/server-only/public-api/delete-api-token-by-id.ts
@@ -1,32 +1,34 @@
-import { TeamMemberRole } from '@prisma/client';
-
 import { prisma } from '@documenso/prisma';
 
+import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams';
+import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
+
 export type DeleteTokenByIdOptions = {
   id: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
 };
 
 export const deleteTokenById = async ({ id, userId, teamId }: DeleteTokenByIdOptions) => {
-  if (teamId) {
-    const member = await prisma.teamMember.findFirst({
-      where: {
-        userId,
-        teamId,
-        role: TeamMemberRole.ADMIN,
-      },
-    });
+  const team = await prisma.team.findFirst({
+    where: buildTeamWhereQuery({
+      teamId,
+      userId,
+      roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+    }),
+  });
 
-    if (!member) {
-      throw new Error('You do not have permission to delete this token');
-    }
+  if (!team) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'You do not have permission to delete this token',
+    });
   }
 
   return await prisma.apiToken.delete({
     where: {
       id,
-      teamId: teamId ?? null,
+      teamId,
     },
   });
 };
diff --git a/packages/lib/server-only/public-api/get-api-token-by-token.ts b/packages/lib/server-only/public-api/get-api-token-by-token.ts
index 401a82178..925230bfd 100644
--- a/packages/lib/server-only/public-api/get-api-token-by-token.ts
+++ b/packages/lib/server-only/public-api/get-api-token-by-token.ts
@@ -10,8 +10,30 @@ export const getApiTokenByToken = async ({ token }: { token: string }) => {
       token: hashedToken,
     },
     include: {
-      team: true,
-      user: true,
+      team: {
+        include: {
+          organisation: {
+            include: {
+              owner: {
+                select: {
+                  id: true,
+                  name: true,
+                  email: true,
+                  disabled: true,
+                },
+              },
+            },
+          },
+        },
+      },
+      user: {
+        select: {
+          id: true,
+          name: true,
+          email: true,
+          disabled: true,
+        },
+      },
     },
   });
 
@@ -25,11 +47,7 @@ export const getApiTokenByToken = async ({ token }: { token: string }) => {
 
   // Handle a silly choice from many moons ago
   if (apiToken.team && !apiToken.user) {
-    apiToken.user = await prisma.user.findFirst({
-      where: {
-        id: apiToken.team.ownerUserId,
-      },
-    });
+    apiToken.user = apiToken.team.organisation.owner;
   }
 
   const { user } = apiToken;
diff --git a/packages/lib/server-only/public-api/get-api-tokens.ts b/packages/lib/server-only/public-api/get-api-tokens.ts
index dd25ec4a5..2effe863f 100644
--- a/packages/lib/server-only/public-api/get-api-tokens.ts
+++ b/packages/lib/server-only/public-api/get-api-tokens.ts
@@ -1,31 +1,22 @@
-import { TeamMemberRole } from '@prisma/client';
-
 import { prisma } from '@documenso/prisma';
 
+import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams';
+import { buildTeamWhereQuery } from '../../utils/teams';
+
 export type GetApiTokensOptions = {
   userId: number;
-  teamId?: number;
+  teamId: number;
 };
 
 export const getApiTokens = async ({ userId, teamId }: GetApiTokensOptions) => {
   return await prisma.apiToken.findMany({
     where: {
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                  role: TeamMemberRole.ADMIN,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      userId,
+      team: buildTeamWhereQuery({
+        teamId,
+        userId,
+        roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+      }),
     },
     select: {
       id: true,
diff --git a/packages/lib/server-only/recipient/create-document-recipients.ts b/packages/lib/server-only/recipient/create-document-recipients.ts
index 707011296..cf584a874 100644
--- a/packages/lib/server-only/recipient/create-document-recipients.ts
+++ b/packages/lib/server-only/recipient/create-document-recipients.ts
@@ -1,7 +1,6 @@
 import { RecipientRole } from '@prisma/client';
 import { SendStatus, SigningStatus } from '@prisma/client';
 
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
 import type { TRecipientAccessAuthTypes } from '@documenso/lib/types/document-auth';
 import { type TRecipientActionAuthTypes } from '@documenso/lib/types/document-auth';
@@ -12,10 +11,11 @@ import { createRecipientAuthOptions } from '@documenso/lib/utils/document-auth';
 import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { getDocumentWhereInput } from '../document/get-document-by-id';
 
 export interface CreateDocumentRecipientsOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   documentId: number;
   recipients: {
     email: string;
@@ -35,27 +35,25 @@ export const createDocumentRecipients = async ({
   recipients: recipientsToCreate,
   requestMetadata,
 }: CreateDocumentRecipientsOptions) => {
+  const { documentWhereInput } = await getDocumentWhereInput({
+    documentId,
+    userId,
+    teamId,
+  });
+
   const document = await prisma.document.findFirst({
-    where: {
-      id: documentId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
-    },
+    where: documentWhereInput,
     include: {
       recipients: true,
+      team: {
+        select: {
+          organisation: {
+            select: {
+              organisationClaim: true,
+            },
+          },
+        },
+      },
     },
   });
 
@@ -76,17 +74,10 @@ export const createDocumentRecipients = async ({
   );
 
   // Check if user has permission to set the global action auth.
-  if (recipientsHaveActionAuth) {
-    const isEnterprise = await isUserEnterprise({
-      userId,
-      teamId,
+  if (recipientsHaveActionAuth && !document.team.organisation.organisationClaim.flags.cfr21) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'You do not have permission to set the action auth',
     });
-
-    if (!isEnterprise) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You do not have permission to set the action auth',
-      });
-    }
   }
 
   const normalizedRecipients = recipientsToCreate.map((recipient) => ({
diff --git a/packages/lib/server-only/recipient/create-template-recipients.ts b/packages/lib/server-only/recipient/create-template-recipients.ts
index 8768172f4..34d61ef66 100644
--- a/packages/lib/server-only/recipient/create-template-recipients.ts
+++ b/packages/lib/server-only/recipient/create-template-recipients.ts
@@ -1,7 +1,6 @@
 import { RecipientRole } from '@prisma/client';
 import { SendStatus, SigningStatus } from '@prisma/client';
 
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import type { TRecipientAccessAuthTypes } from '@documenso/lib/types/document-auth';
 import { type TRecipientActionAuthTypes } from '@documenso/lib/types/document-auth';
 import { nanoid } from '@documenso/lib/universal/id';
@@ -9,10 +8,11 @@ import { createRecipientAuthOptions } from '@documenso/lib/utils/document-auth';
 import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export interface CreateTemplateRecipientsOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   templateId: number;
   recipients: {
     email: string;
@@ -33,24 +33,19 @@ export const createTemplateRecipients = async ({
   const template = await prisma.template.findFirst({
     where: {
       id: templateId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
     include: {
       recipients: true,
+      team: {
+        select: {
+          organisation: {
+            select: {
+              organisationClaim: true,
+            },
+          },
+        },
+      },
     },
   });
 
@@ -65,17 +60,10 @@ export const createTemplateRecipients = async ({
   );
 
   // Check if user has permission to set the global action auth.
-  if (recipientsHaveActionAuth) {
-    const isEnterprise = await isUserEnterprise({
-      userId,
-      teamId,
+  if (recipientsHaveActionAuth && !template.team.organisation.organisationClaim.flags.cfr21) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'You do not have permission to set the action auth',
     });
-
-    if (!isEnterprise) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You do not have permission to set the action auth',
-      });
-    }
   }
 
   const normalizedRecipients = recipientsToCreate.map((recipient) => ({
diff --git a/packages/lib/server-only/recipient/delete-document-recipient.ts b/packages/lib/server-only/recipient/delete-document-recipient.ts
index c087a3fe9..a364fa410 100644
--- a/packages/lib/server-only/recipient/delete-document-recipient.ts
+++ b/packages/lib/server-only/recipient/delete-document-recipient.ts
@@ -16,10 +16,12 @@ import { AppError, AppErrorCode } from '../../errors/app-error';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
+import { buildTeamWhereQuery } from '../../utils/teams';
+import { getEmailContext } from '../email/get-email-context';
 
 export interface DeleteDocumentRecipientOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   recipientId: number;
   requestMetadata: ApiRequestMetadata;
 }
@@ -37,21 +39,7 @@ export const deleteDocumentRecipient = async ({
           id: recipientId,
         },
       },
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
     include: {
       documentMeta: true,
@@ -137,12 +125,21 @@ export const deleteDocumentRecipient = async ({
       assetBaseUrl,
     });
 
+    const { branding, settings } = await getEmailContext({
+      source: {
+        type: 'team',
+        teamId: document.teamId,
+      },
+    });
+
+    const lang = document.documentMeta?.language ?? settings.documentLanguage;
+
     const [html, text] = await Promise.all([
-      renderEmailWithI18N(template, { lang: document.documentMeta?.language }),
-      renderEmailWithI18N(template, { lang: document.documentMeta?.language, plainText: true }),
+      renderEmailWithI18N(template, { lang, branding }),
+      renderEmailWithI18N(template, { lang, branding, plainText: true }),
     ]);
 
-    const i18n = await getI18nInstance(document.documentMeta?.language);
+    const i18n = await getI18nInstance(lang);
 
     await mailer.sendMail({
       to: {
diff --git a/packages/lib/server-only/recipient/delete-recipient.ts b/packages/lib/server-only/recipient/delete-recipient.ts
index 185791631..4596c2427 100644
--- a/packages/lib/server-only/recipient/delete-recipient.ts
+++ b/packages/lib/server-only/recipient/delete-recipient.ts
@@ -1,16 +1,17 @@
-import type { Team } from '@prisma/client';
 import { SendStatus } from '@prisma/client';
 
 import { prisma } from '@documenso/prisma';
 
+import { AppError, AppErrorCode } from '../../errors/app-error';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export type DeleteRecipientOptions = {
   documentId: number;
   recipientId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
   requestMetadata?: RequestMetadata;
 };
 
@@ -26,21 +27,8 @@ export const deleteRecipient = async ({
       id: recipientId,
       document: {
         id: documentId,
-        ...(teamId
-          ? {
-              team: {
-                id: teamId,
-                members: {
-                  some: {
-                    userId,
-                  },
-                },
-              },
-            }
-          : {
-              userId,
-              teamId: null,
-            }),
+        userId,
+        team: buildTeamWhereQuery({ teamId, userId }),
       },
     },
   });
@@ -59,19 +47,12 @@ export const deleteRecipient = async ({
     },
   });
 
-  let team: Team | null = null;
+  const team = await prisma.team.findFirst({
+    where: buildTeamWhereQuery({ teamId, userId }),
+  });
 
-  if (teamId) {
-    team = await prisma.team.findFirst({
-      where: {
-        id: teamId,
-        members: {
-          some: {
-            userId,
-          },
-        },
-      },
-    });
+  if (!team) {
+    throw new AppError(AppErrorCode.NOT_FOUND);
   }
 
   const deletedRecipient = await prisma.$transaction(async (tx) => {
diff --git a/packages/lib/server-only/recipient/delete-template-recipient.ts b/packages/lib/server-only/recipient/delete-template-recipient.ts
index 8b10e9552..d042d1d2d 100644
--- a/packages/lib/server-only/recipient/delete-template-recipient.ts
+++ b/packages/lib/server-only/recipient/delete-template-recipient.ts
@@ -1,10 +1,11 @@
 import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export interface DeleteTemplateRecipientOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   recipientId: number;
 }
 
@@ -20,21 +21,7 @@ export const deleteTemplateRecipient = async ({
           id: recipientId,
         },
       },
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
     include: {
       recipients: {
diff --git a/packages/lib/server-only/recipient/get-recipient-by-id.ts b/packages/lib/server-only/recipient/get-recipient-by-id.ts
index e14c93955..a647d021b 100644
--- a/packages/lib/server-only/recipient/get-recipient-by-id.ts
+++ b/packages/lib/server-only/recipient/get-recipient-by-id.ts
@@ -1,11 +1,12 @@
 import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export type GetRecipientByIdOptions = {
   recipientId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
 };
 
 /**
@@ -20,21 +21,9 @@ export const getRecipientById = async ({
   const recipient = await prisma.recipient.findFirst({
     where: {
       id: recipientId,
-      document: teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          },
+      document: {
+        team: buildTeamWhereQuery({ teamId, userId }),
+      },
     },
     include: {
       fields: true,
diff --git a/packages/lib/server-only/recipient/get-recipients-for-document.ts b/packages/lib/server-only/recipient/get-recipients-for-document.ts
index daa34d106..3cfd79e4d 100644
--- a/packages/lib/server-only/recipient/get-recipients-for-document.ts
+++ b/packages/lib/server-only/recipient/get-recipients-for-document.ts
@@ -1,9 +1,11 @@
 import { prisma } from '@documenso/prisma';
 
+import { getDocumentWhereInput } from '../document/get-document-by-id';
+
 export interface GetRecipientsForDocumentOptions {
   documentId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
 }
 
 export const getRecipientsForDocument = async ({
@@ -11,24 +13,15 @@ export const getRecipientsForDocument = async ({
   userId,
   teamId,
 }: GetRecipientsForDocumentOptions) => {
+  const { documentWhereInput } = await getDocumentWhereInput({
+    documentId,
+    userId,
+    teamId,
+  });
+
   const recipients = await prisma.recipient.findMany({
     where: {
-      documentId,
-      document: teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          },
+      document: documentWhereInput,
     },
     orderBy: {
       id: 'asc',
diff --git a/packages/lib/server-only/recipient/get-recipients-for-template.ts b/packages/lib/server-only/recipient/get-recipients-for-template.ts
index 6256126ef..14cafebfb 100644
--- a/packages/lib/server-only/recipient/get-recipients-for-template.ts
+++ b/packages/lib/server-only/recipient/get-recipients-for-template.ts
@@ -3,7 +3,7 @@ import { prisma } from '@documenso/prisma';
 export interface GetRecipientsForTemplateOptions {
   templateId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
 }
 
 export const getRecipientsForTemplate = async ({
diff --git a/packages/lib/server-only/recipient/set-document-recipients.ts b/packages/lib/server-only/recipient/set-document-recipients.ts
index b81ca2848..abe55dc58 100644
--- a/packages/lib/server-only/recipient/set-document-recipients.ts
+++ b/packages/lib/server-only/recipient/set-document-recipients.ts
@@ -6,7 +6,6 @@ import { RecipientRole } from '@prisma/client';
 import { SendStatus, SigningStatus } from '@prisma/client';
 import { isDeepEqual } from 'remeda';
 
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { mailer } from '@documenso/email/mailer';
 import RecipientRemovedFromDocumentTemplate from '@documenso/email/templates/recipient-removed-from-document';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
@@ -31,11 +30,12 @@ import { AppError, AppErrorCode } from '../../errors/app-error';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import { canRecipientBeModified } from '../../utils/recipients';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
+import { getDocumentWhereInput } from '../document/get-document-by-id';
+import { getEmailContext } from '../email/get-email-context';
 
 export interface SetDocumentRecipientsOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   documentId: number;
   recipients: RecipientData[];
   requestMetadata: ApiRequestMetadata;
@@ -48,36 +48,36 @@ export const setDocumentRecipients = async ({
   recipients,
   requestMetadata,
 }: SetDocumentRecipientsOptions) => {
+  const { documentWhereInput } = await getDocumentWhereInput({
+    documentId,
+    userId,
+    teamId,
+  });
+
   const document = await prisma.document.findFirst({
-    where: {
-      id: documentId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
-    },
+    where: documentWhereInput,
     include: {
       fields: true,
       documentMeta: true,
       team: {
-        include: {
-          teamGlobalSettings: true,
+        select: {
+          organisation: {
+            select: {
+              organisationClaim: true,
+            },
+          },
         },
       },
     },
   });
 
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'team',
+      teamId,
+    },
+  });
+
   const user = await prisma.user.findFirstOrThrow({
     where: {
       id: userId,
@@ -102,17 +102,10 @@ export const setDocumentRecipients = async ({
   );
 
   // Check if user has permission to set the global action auth.
-  if (recipientsHaveActionAuth) {
-    const isDocumentEnterprise = await isUserEnterprise({
-      userId,
-      teamId,
+  if (recipientsHaveActionAuth && !document.team.organisation.organisationClaim.flags.cfr21) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'You do not have permission to set the action auth',
     });
-
-    if (!isDocumentEnterprise) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You do not have permission to set the action auth',
-      });
-    }
   }
 
   const normalizedRecipients = recipients.map((recipient) => ({
@@ -309,16 +302,14 @@ export const setDocumentRecipients = async ({
           assetBaseUrl,
         });
 
-        const branding = document.team?.teamGlobalSettings
-          ? teamGlobalSettingsToBranding(document.team.teamGlobalSettings)
-          : undefined;
+        const lang = document.documentMeta?.language ?? settings.documentLanguage;
 
         const [html, text] = await Promise.all([
-          renderEmailWithI18N(template, { lang: document.documentMeta?.language }),
-          renderEmailWithI18N(template, { lang: document.documentMeta?.language, plainText: true }),
+          renderEmailWithI18N(template, { lang, branding }),
+          renderEmailWithI18N(template, { lang, branding, plainText: true }),
         ]);
 
-        const i18n = await getI18nInstance(document.documentMeta?.language);
+        const i18n = await getI18nInstance(lang);
 
         await mailer.sendMail({
           to: {
diff --git a/packages/lib/server-only/recipient/set-template-recipients.ts b/packages/lib/server-only/recipient/set-template-recipients.ts
index c1a7fc25b..f09968585 100644
--- a/packages/lib/server-only/recipient/set-template-recipients.ts
+++ b/packages/lib/server-only/recipient/set-template-recipients.ts
@@ -1,7 +1,6 @@
 import type { Recipient } from '@prisma/client';
 import { RecipientRole } from '@prisma/client';
 
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import {
   DIRECT_TEMPLATE_RECIPIENT_EMAIL,
   DIRECT_TEMPLATE_RECIPIENT_NAME,
@@ -15,10 +14,11 @@ import {
 } from '../../types/document-auth';
 import { nanoid } from '../../universal/id';
 import { createRecipientAuthOptions } from '../../utils/document-auth';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export type SetTemplateRecipientsOptions = {
   userId: number;
-  teamId?: number;
+  teamId: number;
   templateId: number;
   recipients: {
     id?: number;
@@ -39,24 +39,19 @@ export const setTemplateRecipients = async ({
   const template = await prisma.template.findFirst({
     where: {
       id: templateId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
     include: {
       directLink: true,
+      team: {
+        select: {
+          organisation: {
+            select: {
+              organisationClaim: true,
+            },
+          },
+        },
+      },
     },
   });
 
@@ -69,17 +64,10 @@ export const setTemplateRecipients = async ({
   );
 
   // Check if user has permission to set the global action auth.
-  if (recipientsHaveActionAuth) {
-    const isDocumentEnterprise = await isUserEnterprise({
-      userId,
-      teamId,
+  if (recipientsHaveActionAuth && !template.team.organisation.organisationClaim.flags.cfr21) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'You do not have permission to set the action auth',
     });
-
-    if (!isDocumentEnterprise) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You do not have permission to set the action auth',
-      });
-    }
   }
 
   const normalizedRecipients = recipients.map((recipient) => {
diff --git a/packages/lib/server-only/recipient/update-document-recipients.ts b/packages/lib/server-only/recipient/update-document-recipients.ts
index 43e6c9c37..d021c9708 100644
--- a/packages/lib/server-only/recipient/update-document-recipients.ts
+++ b/packages/lib/server-only/recipient/update-document-recipients.ts
@@ -3,7 +3,6 @@ import { RecipientRole } from '@prisma/client';
 import { SendStatus, SigningStatus } from '@prisma/client';
 import { isDeepEqual } from 'remeda';
 
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
 import type { TRecipientAccessAuthTypes } from '@documenso/lib/types/document-auth';
 import {
@@ -20,10 +19,11 @@ import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { canRecipientBeModified } from '../../utils/recipients';
+import { getDocumentWhereInput } from '../document/get-document-by-id';
 
 export interface UpdateDocumentRecipientsOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   documentId: number;
   recipients: RecipientData[];
   requestMetadata: ApiRequestMetadata;
@@ -36,28 +36,26 @@ export const updateDocumentRecipients = async ({
   recipients,
   requestMetadata,
 }: UpdateDocumentRecipientsOptions) => {
+  const { documentWhereInput } = await getDocumentWhereInput({
+    documentId,
+    userId,
+    teamId,
+  });
+
   const document = await prisma.document.findFirst({
-    where: {
-      id: documentId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
-    },
+    where: documentWhereInput,
     include: {
       fields: true,
       recipients: true,
+      team: {
+        select: {
+          organisation: {
+            select: {
+              organisationClaim: true,
+            },
+          },
+        },
+      },
     },
   });
 
@@ -78,17 +76,10 @@ export const updateDocumentRecipients = async ({
   );
 
   // Check if user has permission to set the global action auth.
-  if (recipientsHaveActionAuth) {
-    const isEnterprise = await isUserEnterprise({
-      userId,
-      teamId,
+  if (recipientsHaveActionAuth && !document.team.organisation.organisationClaim.flags.cfr21) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'You do not have permission to set the action auth',
     });
-
-    if (!isEnterprise) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You do not have permission to set the action auth',
-      });
-    }
   }
 
   const recipientsToUpdate = recipients.map((recipient) => {
diff --git a/packages/lib/server-only/recipient/update-recipient.ts b/packages/lib/server-only/recipient/update-recipient.ts
deleted file mode 100644
index a352ca781..000000000
--- a/packages/lib/server-only/recipient/update-recipient.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import type { RecipientRole, Team } from '@prisma/client';
-
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
-import { prisma } from '@documenso/prisma';
-
-import { AppError, AppErrorCode } from '../../errors/app-error';
-import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
-import {
-  type TRecipientActionAuthTypes,
-  ZRecipientAuthOptionsSchema,
-} from '../../types/document-auth';
-import type { RequestMetadata } from '../../universal/extract-request-metadata';
-import { createDocumentAuditLogData, diffRecipientChanges } from '../../utils/document-audit-logs';
-import { createRecipientAuthOptions } from '../../utils/document-auth';
-
-export type UpdateRecipientOptions = {
-  documentId: number;
-  recipientId: number;
-  email?: string;
-  name?: string;
-  role?: RecipientRole;
-  signingOrder?: number | null;
-  actionAuth?: TRecipientActionAuthTypes[];
-  userId: number;
-  teamId?: number;
-  requestMetadata?: RequestMetadata;
-};
-
-export const updateRecipient = async ({
-  documentId,
-  recipientId,
-  email,
-  name,
-  role,
-  signingOrder,
-  actionAuth,
-  userId,
-  teamId,
-  requestMetadata,
-}: UpdateRecipientOptions) => {
-  const recipient = await prisma.recipient.findFirst({
-    where: {
-      id: recipientId,
-      document: {
-        id: documentId,
-        ...(teamId
-          ? {
-              team: {
-                id: teamId,
-                members: {
-                  some: {
-                    userId,
-                  },
-                },
-              },
-            }
-          : {
-              userId,
-              teamId: null,
-            }),
-      },
-    },
-    include: {
-      document: true,
-    },
-  });
-
-  let team: Team | null = null;
-
-  if (teamId) {
-    team = await prisma.team.findFirst({
-      where: {
-        id: teamId,
-        members: {
-          some: {
-            userId,
-          },
-        },
-      },
-    });
-  }
-
-  const user = await prisma.user.findFirstOrThrow({
-    where: {
-      id: userId,
-    },
-  });
-
-  if (!recipient) {
-    throw new Error('Recipient not found');
-  }
-
-  if (actionAuth && actionAuth.length > 0) {
-    const isDocumentEnterprise = await isUserEnterprise({
-      userId,
-      teamId,
-    });
-
-    if (!isDocumentEnterprise) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You do not have permission to set the action auth',
-      });
-    }
-  }
-
-  const recipientAuthOptions = ZRecipientAuthOptionsSchema.parse(recipient.authOptions);
-
-  const updatedRecipient = await prisma.$transaction(async (tx) => {
-    const persisted = await prisma.recipient.update({
-      where: {
-        id: recipient.id,
-      },
-      data: {
-        email: email?.toLowerCase() ?? recipient.email,
-        name: name ?? recipient.name,
-        role: role ?? recipient.role,
-        signingOrder,
-        authOptions: createRecipientAuthOptions({
-          accessAuth: recipientAuthOptions.accessAuth,
-          actionAuth: actionAuth ?? [],
-        }),
-      },
-    });
-
-    const changes = diffRecipientChanges(recipient, persisted);
-
-    if (changes.length > 0) {
-      await tx.documentAuditLog.create({
-        data: createDocumentAuditLogData({
-          type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_UPDATED,
-          documentId: documentId,
-          user: {
-            id: team?.id ?? user.id,
-            name: team?.name ?? user.name,
-            email: team ? '' : user.email,
-          },
-          requestMetadata,
-          data: {
-            changes,
-            recipientId,
-            recipientEmail: persisted.email,
-            recipientName: persisted.name,
-            recipientRole: persisted.role,
-          },
-        }),
-      });
-
-      return persisted;
-    }
-  });
-
-  return updatedRecipient;
-};
diff --git a/packages/lib/server-only/recipient/update-template-recipients.ts b/packages/lib/server-only/recipient/update-template-recipients.ts
index a9d723064..5867e85ab 100644
--- a/packages/lib/server-only/recipient/update-template-recipients.ts
+++ b/packages/lib/server-only/recipient/update-template-recipients.ts
@@ -1,7 +1,6 @@
 import { RecipientRole } from '@prisma/client';
 import { SendStatus, SigningStatus } from '@prisma/client';
 
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import type { TRecipientAccessAuthTypes } from '@documenso/lib/types/document-auth';
 import {
   type TRecipientActionAuthTypes,
@@ -11,10 +10,11 @@ import { createRecipientAuthOptions } from '@documenso/lib/utils/document-auth';
 import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export interface UpdateTemplateRecipientsOptions {
   userId: number;
-  teamId?: number;
+  teamId: number;
   templateId: number;
   recipients: {
     id: number;
@@ -36,24 +36,19 @@ export const updateTemplateRecipients = async ({
   const template = await prisma.template.findFirst({
     where: {
       id: templateId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
     include: {
       recipients: true,
+      team: {
+        select: {
+          organisation: {
+            select: {
+              organisationClaim: true,
+            },
+          },
+        },
+      },
     },
   });
 
@@ -68,17 +63,10 @@ export const updateTemplateRecipients = async ({
   );
 
   // Check if user has permission to set the global action auth.
-  if (recipientsHaveActionAuth) {
-    const isEnterprise = await isUserEnterprise({
-      userId,
-      teamId,
+  if (recipientsHaveActionAuth && !template.team.organisation.organisationClaim.flags.cfr21) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'You do not have permission to set the action auth',
     });
-
-    if (!isEnterprise) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You do not have permission to set the action auth',
-      });
-    }
   }
 
   const recipientsToUpdate = recipients.map((recipient) => {
diff --git a/packages/lib/server-only/subscription/get-subscriptions-by-user-id.ts b/packages/lib/server-only/subscription/get-subscriptions-by-user-id.ts
deleted file mode 100644
index 264a30472..000000000
--- a/packages/lib/server-only/subscription/get-subscriptions-by-user-id.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { prisma } from '@documenso/prisma';
-
-export type GetSubscriptionsByUserIdOptions = {
-  userId: number;
-};
-
-export const getSubscriptionsByUserId = async ({ userId }: GetSubscriptionsByUserIdOptions) => {
-  return await prisma.subscription.findMany({
-    where: {
-      userId,
-    },
-  });
-};
diff --git a/packages/lib/server-only/team/accept-team-invitation.ts b/packages/lib/server-only/team/accept-team-invitation.ts
deleted file mode 100644
index 0c2bd38b8..000000000
--- a/packages/lib/server-only/team/accept-team-invitation.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { TeamMemberInviteStatus } from '@prisma/client';
-
-import { updateSubscriptionItemQuantity } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
-import { prisma } from '@documenso/prisma';
-
-import { jobs } from '../../jobs/client';
-
-export type AcceptTeamInvitationOptions = {
-  userId: number;
-  teamId: number;
-};
-
-export const acceptTeamInvitation = async ({ userId, teamId }: AcceptTeamInvitationOptions) => {
-  await prisma.$transaction(
-    async (tx) => {
-      const user = await tx.user.findFirstOrThrow({
-        where: {
-          id: userId,
-        },
-      });
-
-      const teamMemberInvite = await tx.teamMemberInvite.findFirstOrThrow({
-        where: {
-          teamId,
-          email: user.email,
-          status: {
-            not: TeamMemberInviteStatus.DECLINED,
-          },
-        },
-        include: {
-          team: {
-            include: {
-              subscription: true,
-              members: {
-                include: {
-                  user: true,
-                },
-              },
-            },
-          },
-        },
-      });
-
-      if (teamMemberInvite.status === TeamMemberInviteStatus.ACCEPTED) {
-        const memberExists = await tx.teamMember.findFirst({
-          where: {
-            teamId: teamMemberInvite.teamId,
-            userId: user.id,
-          },
-        });
-
-        if (memberExists) {
-          return;
-        }
-      }
-
-      const { team } = teamMemberInvite;
-
-      const teamMember = await tx.teamMember.create({
-        data: {
-          teamId: teamMemberInvite.teamId,
-          userId: user.id,
-          role: teamMemberInvite.role,
-        },
-      });
-
-      await tx.teamMemberInvite.update({
-        where: {
-          id: teamMemberInvite.id,
-        },
-        data: {
-          status: TeamMemberInviteStatus.ACCEPTED,
-        },
-      });
-
-      if (IS_BILLING_ENABLED() && team.subscription) {
-        const numberOfSeats = await tx.teamMember.count({
-          where: {
-            teamId: teamMemberInvite.teamId,
-          },
-        });
-
-        await updateSubscriptionItemQuantity({
-          priceId: team.subscription.priceId,
-          subscriptionId: team.subscription.planId,
-          quantity: numberOfSeats,
-        });
-      }
-
-      await jobs.triggerJob({
-        name: 'send.team-member-joined.email',
-        payload: {
-          teamId: teamMember.teamId,
-          memberId: teamMember.id,
-        },
-      });
-    },
-    { timeout: 30_000 },
-  );
-};
diff --git a/packages/lib/server-only/team/create-team-checkout-session.ts b/packages/lib/server-only/team/create-team-checkout-session.ts
deleted file mode 100644
index 706bea48e..000000000
--- a/packages/lib/server-only/team/create-team-checkout-session.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { getCheckoutSession } from '@documenso/ee/server-only/stripe/get-checkout-session';
-import { getTeamPrices } from '@documenso/ee/server-only/stripe/get-team-prices';
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { prisma } from '@documenso/prisma';
-
-export type CreateTeamPendingCheckoutSession = {
-  userId: number;
-  pendingTeamId: number;
-  interval: 'monthly' | 'yearly';
-};
-
-export const createTeamPendingCheckoutSession = async ({
-  userId,
-  pendingTeamId,
-  interval,
-}: CreateTeamPendingCheckoutSession) => {
-  const teamPendingCreation = await prisma.teamPending.findFirstOrThrow({
-    where: {
-      id: pendingTeamId,
-      ownerUserId: userId,
-    },
-    include: {
-      owner: true,
-    },
-  });
-
-  const prices = await getTeamPrices();
-  const priceId = prices[interval].priceId;
-
-  try {
-    const stripeCheckoutSession = await getCheckoutSession({
-      customerId: teamPendingCreation.customerId,
-      priceId,
-      returnUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/settings/teams`,
-      subscriptionMetadata: {
-        pendingTeamId: pendingTeamId.toString(),
-      },
-    });
-
-    if (!stripeCheckoutSession) {
-      throw new AppError(AppErrorCode.UNKNOWN_ERROR);
-    }
-
-    return stripeCheckoutSession;
-  } catch (e) {
-    console.error(e);
-
-    // Absorb all the errors incase Stripe throws something sensitive.
-    throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
-      message: 'Something went wrong.',
-    });
-  }
-};
diff --git a/packages/lib/server-only/team/create-team-email-verification.ts b/packages/lib/server-only/team/create-team-email-verification.ts
index 546478d16..de4dcddd2 100644
--- a/packages/lib/server-only/team/create-team-email-verification.ts
+++ b/packages/lib/server-only/team/create-team-email-verification.ts
@@ -1,7 +1,7 @@
 import { createElement } from 'react';
 
 import { msg } from '@lingui/core/macro';
-import type { Team, TeamGlobalSettings } from '@prisma/client';
+import type { Team } from '@prisma/client';
 import { Prisma } from '@prisma/client';
 import { z } from 'zod';
 
@@ -15,9 +15,11 @@ import { createTokenVerification } from '@documenso/lib/utils/token-verification
 import { prisma } from '@documenso/prisma';
 
 import { getI18nInstance } from '../../client-only/providers/i18n-server';
+import type { SupportedLanguageCodes } from '../../constants/i18n';
 import { env } from '../../utils/env';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
+import { buildTeamWhereQuery } from '../../utils/teams';
+import { getEmailContext } from '../email/get-email-context';
 
 export type CreateTeamEmailVerificationOptions = {
   userId: number;
@@ -34,33 +36,26 @@ export const createTeamEmailVerification = async ({
   data,
 }: CreateTeamEmailVerificationOptions): Promise<void> => {
   try {
+    const team = await prisma.team.findFirstOrThrow({
+      where: buildTeamWhereQuery({
+        teamId,
+        userId,
+        roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+      }),
+      include: {
+        teamEmail: true,
+        emailVerification: true,
+      },
+    });
+
+    if (team.teamEmail || team.emailVerification) {
+      throw new AppError(AppErrorCode.INVALID_REQUEST, {
+        message: 'Team already has an email or existing email verification.',
+      });
+    }
+
     await prisma.$transaction(
       async (tx) => {
-        const team = await tx.team.findFirstOrThrow({
-          where: {
-            id: teamId,
-            members: {
-              some: {
-                userId,
-                role: {
-                  in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
-                },
-              },
-            },
-          },
-          include: {
-            teamEmail: true,
-            emailVerification: true,
-            teamGlobalSettings: true,
-          },
-        });
-
-        if (team.teamEmail || team.emailVerification) {
-          throw new AppError(AppErrorCode.INVALID_REQUEST, {
-            message: 'Team already has an email or existing email verification.',
-          });
-        }
-
         const existingTeamEmail = await tx.teamEmail.findFirst({
           where: {
             email: data.email,
@@ -116,13 +111,7 @@ export const createTeamEmailVerification = async ({
  * @param teamName The name of the team the user is being invited to.
  * @param teamUrl The url of the team the user is being invited to.
  */
-export const sendTeamEmailVerificationEmail = async (
-  email: string,
-  token: string,
-  team: Team & {
-    teamGlobalSettings?: TeamGlobalSettings | null;
-  },
-) => {
+export const sendTeamEmailVerificationEmail = async (email: string, token: string, team: Team) => {
   const assetBaseUrl = env('NEXT_PUBLIC_WEBAPP_URL') || 'http://localhost:3000';
 
   const template = createElement(ConfirmTeamEmailTemplate, {
@@ -133,11 +122,15 @@ export const sendTeamEmailVerificationEmail = async (
     token,
   });
 
-  const branding = team.teamGlobalSettings
-    ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
-    : undefined;
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'team',
+      teamId: team.id,
+    },
+  });
 
-  const lang = team.teamGlobalSettings?.documentLanguage;
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  const lang = settings.documentLanguage as SupportedLanguageCodes;
 
   const [html, text] = await Promise.all([
     renderEmailWithI18N(template, { lang, branding }),
diff --git a/packages/lib/server-only/team/create-team-member-invites.ts b/packages/lib/server-only/team/create-team-member-invites.ts
deleted file mode 100644
index 3d965da3c..000000000
--- a/packages/lib/server-only/team/create-team-member-invites.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-import { createElement } from 'react';
-
-import { msg } from '@lingui/core/macro';
-import type { Team, TeamGlobalSettings } from '@prisma/client';
-import { TeamMemberInviteStatus } from '@prisma/client';
-import { nanoid } from 'nanoid';
-
-import { mailer } from '@documenso/email/mailer';
-import { TeamInviteEmailTemplate } from '@documenso/email/templates/team-invite';
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email';
-import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
-import { prisma } from '@documenso/prisma';
-import type { TCreateTeamMemberInvitesMutationSchema } from '@documenso/trpc/server/team-router/schema';
-
-import { getI18nInstance } from '../../client-only/providers/i18n-server';
-import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
-
-export type CreateTeamMemberInvitesOptions = {
-  userId: number;
-  userName: string;
-  teamId: number;
-  invitations: TCreateTeamMemberInvitesMutationSchema['invitations'];
-};
-
-/**
- * Invite team members via email to join a team.
- */
-export const createTeamMemberInvites = async ({
-  userId,
-  userName,
-  teamId,
-  invitations,
-}: CreateTeamMemberInvitesOptions): Promise<void> => {
-  const team = await prisma.team.findFirstOrThrow({
-    where: {
-      id: teamId,
-      members: {
-        some: {
-          userId,
-          role: {
-            in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
-          },
-        },
-      },
-    },
-    include: {
-      members: {
-        select: {
-          role: true,
-          user: {
-            select: {
-              id: true,
-              email: true,
-            },
-          },
-        },
-      },
-      invites: true,
-      teamGlobalSettings: true,
-    },
-  });
-
-  const teamMemberEmails = team.members.map((member) => member.user.email);
-  const teamMemberInviteEmails = team.invites.map((invite) => invite.email);
-  const currentTeamMember = team.members.find((member) => member.user.id === userId);
-
-  if (!currentTeamMember) {
-    throw new AppError(AppErrorCode.UNAUTHORIZED, {
-      message: 'User not part of team.',
-    });
-  }
-
-  const usersToInvite = invitations.filter((invitation) => {
-    // Filter out users that are already members of the team.
-    if (teamMemberEmails.includes(invitation.email)) {
-      return false;
-    }
-
-    // Filter out users that have already been invited to the team.
-    if (teamMemberInviteEmails.includes(invitation.email)) {
-      return false;
-    }
-
-    return true;
-  });
-
-  const unauthorizedRoleAccess = usersToInvite.some(
-    ({ role }) => !isTeamRoleWithinUserHierarchy(currentTeamMember.role, role),
-  );
-
-  if (unauthorizedRoleAccess) {
-    throw new AppError(AppErrorCode.UNAUTHORIZED, {
-      message: 'User does not have permission to set high level roles',
-    });
-  }
-
-  const teamMemberInvites = usersToInvite.map(({ email, role }) => ({
-    email,
-    teamId,
-    role,
-    status: TeamMemberInviteStatus.PENDING,
-    token: nanoid(32),
-  }));
-
-  await prisma.teamMemberInvite.createMany({
-    data: teamMemberInvites,
-  });
-
-  const sendEmailResult = await Promise.allSettled(
-    teamMemberInvites.map(async ({ email, token }) =>
-      sendTeamMemberInviteEmail({
-        email,
-        token,
-        team,
-        senderName: userName,
-      }),
-    ),
-  );
-
-  const sendEmailResultErrorList = sendEmailResult.filter(
-    (result): result is PromiseRejectedResult => result.status === 'rejected',
-  );
-
-  if (sendEmailResultErrorList.length > 0) {
-    console.error(JSON.stringify(sendEmailResultErrorList));
-
-    throw new AppError('EmailDeliveryFailed', {
-      message: 'Failed to send invite emails to one or more users.',
-      userMessage: `Failed to send invites to ${sendEmailResultErrorList.length}/${teamMemberInvites.length} users.`,
-    });
-  }
-};
-
-type SendTeamMemberInviteEmailOptions = {
-  email: string;
-  senderName: string;
-  token: string;
-  team: Team & {
-    teamGlobalSettings?: TeamGlobalSettings | null;
-  };
-};
-
-/**
- * Send an email to a user inviting them to join a team.
- */
-export const sendTeamMemberInviteEmail = async ({
-  email,
-  senderName,
-  token,
-  team,
-}: SendTeamMemberInviteEmailOptions) => {
-  const template = createElement(TeamInviteEmailTemplate, {
-    assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
-    baseUrl: NEXT_PUBLIC_WEBAPP_URL(),
-    senderName,
-    token,
-    teamName: team.name,
-    teamUrl: team.url,
-  });
-
-  const branding = team.teamGlobalSettings
-    ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
-    : undefined;
-
-  const [html, text] = await Promise.all([
-    renderEmailWithI18N(template, { lang: team.teamGlobalSettings?.documentLanguage, branding }),
-    renderEmailWithI18N(template, {
-      lang: team.teamGlobalSettings?.documentLanguage,
-      branding,
-      plainText: true,
-    }),
-  ]);
-
-  const i18n = await getI18nInstance(team.teamGlobalSettings?.documentLanguage);
-
-  await mailer.sendMail({
-    to: email,
-    from: {
-      name: FROM_NAME,
-      address: FROM_ADDRESS,
-    },
-    subject: i18n._(msg`You have been invited to join ${team.name} on Documenso`),
-    html,
-    text,
-  });
-};
diff --git a/packages/lib/server-only/team/create-team.ts b/packages/lib/server-only/team/create-team.ts
index 22e17d656..b8ebb0a25 100644
--- a/packages/lib/server-only/team/create-team.ts
+++ b/packages/lib/server-only/team/create-team.ts
@@ -1,17 +1,18 @@
-import { Prisma, TeamMemberRole } from '@prisma/client';
-import type Stripe from 'stripe';
-import { z } from 'zod';
+import { OrganisationGroupType, OrganisationMemberRole, TeamMemberRole } from '@prisma/client';
+import { match } from 'ts-pattern';
 
-import { createTeamCustomer } from '@documenso/ee/server-only/stripe/create-team-customer';
-import { getTeamRelatedPrices } from '@documenso/ee/server-only/stripe/get-team-related-prices';
-import { mapStripeSubscriptionToPrismaUpsertAction } from '@documenso/ee/server-only/stripe/webhook/on-subscription-updated';
-import { isDocumentPlatform as isUserPlatformPlan } from '@documenso/ee/server-only/util/is-document-platform';
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { subscriptionsContainsActivePlan } from '@documenso/lib/utils/billing';
 import { prisma } from '@documenso/prisma';
 
-import { stripe } from '../stripe';
+import { IS_BILLING_ENABLED } from '../../constants/app';
+import {
+  LOWEST_ORGANISATION_ROLE,
+  ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP,
+} from '../../constants/organisations';
+import { TEAM_INTERNAL_GROUPS } from '../../constants/teams';
+import { generateDatabaseId } from '../../universal/id';
+import { buildOrganisationWhereQuery } from '../../utils/organisations';
+import { generateDefaultTeamSettings } from '../../utils/teams';
 
 export type CreateTeamOptions = {
   /**
@@ -30,264 +31,169 @@ export type CreateTeamOptions = {
    * Used as the URL path, example: https://documenso.com/t/{teamUrl}/settings
    */
   teamUrl: string;
+
+  /**
+   * ID of the organisation the team belongs to.
+   */
+  organisationId: string;
+
+  /**
+   * Whether to inherit all members from the organisation.
+   */
+  inheritMembers: boolean;
+
+  /**
+   * List of additional groups to attach to the team.
+   */
+  groups?: {
+    id: string;
+    role: TeamMemberRole;
+  }[];
 };
 
-export const ZCreateTeamResponseSchema = z.union([
-  z.object({
-    paymentRequired: z.literal(false),
-  }),
-  z.object({
-    paymentRequired: z.literal(true),
-    pendingTeamId: z.number(),
-  }),
-]);
-
-export type TCreateTeamResponse = z.infer<typeof ZCreateTeamResponseSchema>;
-
-/**
- * Create a team or pending team depending on the user's subscription or application's billing settings.
- */
 export const createTeam = async ({
   userId,
   teamName,
   teamUrl,
-}: CreateTeamOptions): Promise<TCreateTeamResponse> => {
-  const user = await prisma.user.findUniqueOrThrow({
-    where: {
-      id: userId,
-    },
+  organisationId,
+  inheritMembers,
+}: CreateTeamOptions) => {
+  const organisation = await prisma.organisation.findFirst({
+    where: buildOrganisationWhereQuery({
+      organisationId,
+      userId,
+      roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+    }),
     include: {
-      subscriptions: true,
+      groups: true,
+      subscription: true,
+      organisationClaim: true,
+      owner: {
+        select: {
+          id: true,
+          name: true,
+          email: true,
+        },
+      },
     },
   });
 
-  const isPlatformPlan = await isUserPlatformPlan({
-    userId: user.id,
-    teamId: null,
-  });
-
-  let isPaymentRequired = IS_BILLING_ENABLED();
-  let customerId: string | null = null;
-
-  if (IS_BILLING_ENABLED()) {
-    const teamRelatedPriceIds = await getTeamRelatedPrices().then((prices) =>
-      prices.map((price) => price.id),
-    );
-
-    const hasTeamRelatedSubscription = subscriptionsContainsActivePlan(
-      user.subscriptions,
-      teamRelatedPriceIds,
-    );
-
-    if (isPlatformPlan) {
-      // For platform users, check if they already have any teams
-      const existingTeams = await prisma.team.findMany({
-        where: {
-          ownerUserId: userId,
-        },
-      });
-
-      // Payment is required if they already have any team
-      isPaymentRequired = existingTeams.length > 0;
-    } else {
-      // For non-platform users, payment is required if they don't have a team-related subscription
-      isPaymentRequired = !hasTeamRelatedSubscription;
-    }
-
-    customerId = await createTeamCustomer({
-      name: user.name ?? teamName,
-      email: user.email,
-    }).then((customer) => customer.id);
+  if (!organisation) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Organisation not found.',
+    });
   }
 
-  try {
-    // Create the team directly if no payment is required.
-    if (!isPaymentRequired) {
-      await prisma.$transaction(async (tx) => {
-        const existingUserProfileWithUrl = await tx.user.findUnique({
-          where: {
-            url: teamUrl,
-          },
-          select: {
-            id: true,
+  // Validate they have enough team slots. 0 means they can create unlimited teams.
+  if (organisation.organisationClaim.teamCount !== 0 && IS_BILLING_ENABLED()) {
+    const teamCount = await prisma.team.count({
+      where: {
+        organisationId,
+      },
+    });
+
+    if (teamCount >= organisation.organisationClaim.teamCount) {
+      throw new AppError(AppErrorCode.LIMIT_EXCEEDED, {
+        message: 'You have reached the maximum number of teams for your plan.',
+      });
+    }
+  }
+
+  // Inherit internal organisation groups to the team.
+  // Organisation Admins/Mangers get assigned as team admins, members get assigned as team members.
+  const internalOrganisationGroups = organisation.groups
+    .filter((group) => {
+      if (group.type !== OrganisationGroupType.INTERNAL_ORGANISATION) {
+        return false;
+      }
+
+      // If we're inheriting members, allow all internal organisation groups.
+      if (inheritMembers) {
+        return true;
+      }
+
+      // Otherwise, only inherit organisation admins/managers.
+      return (
+        group.organisationRole === OrganisationMemberRole.ADMIN ||
+        group.organisationRole === OrganisationMemberRole.MANAGER
+      );
+    })
+    .map((group) =>
+      match(group.organisationRole)
+        .with(OrganisationMemberRole.ADMIN, OrganisationMemberRole.MANAGER, () => ({
+          organisationGroupId: group.id,
+          teamRole: TeamMemberRole.ADMIN,
+        }))
+        .with(OrganisationMemberRole.MEMBER, () => ({
+          organisationGroupId: group.id,
+          teamRole: TeamMemberRole.MEMBER,
+        }))
+        .exhaustive(),
+    );
+
+  await prisma
+    .$transaction(
+      async (tx) => {
+        const teamSettings = await tx.teamGlobalSettings.create({
+          data: {
+            ...generateDefaultTeamSettings(),
+            id: generateDatabaseId('team_setting'),
           },
         });
 
-        if (existingUserProfileWithUrl) {
-          throw new AppError(AppErrorCode.ALREADY_EXISTS, {
-            message: 'URL already taken.',
-          });
-        }
-
         const team = await tx.team.create({
           data: {
             name: teamName,
             url: teamUrl,
-            ownerUserId: user.id,
-            customerId,
-            members: {
-              create: [
-                {
-                  userId: user.id,
-                  role: TeamMemberRole.ADMIN,
+            organisationId,
+            teamGlobalSettingsId: teamSettings.id,
+            teamGroups: {
+              createMany: {
+                // Attach the internal organisation groups to the team.
+                data: internalOrganisationGroups.map((group) => ({
+                  ...group,
+                  id: generateDatabaseId('team_group'),
+                })),
+              },
+            },
+          },
+          include: {
+            teamGroups: true,
+          },
+        });
+
+        // Create the internal team groups.
+        await Promise.all(
+          TEAM_INTERNAL_GROUPS.map(async (teamGroup) =>
+            tx.organisationGroup.create({
+              data: {
+                id: generateDatabaseId('org_group'),
+                type: teamGroup.type,
+                organisationRole: LOWEST_ORGANISATION_ROLE,
+                organisationId,
+                teamGroups: {
+                  create: {
+                    id: generateDatabaseId('team_group'),
+                    teamId: team.id,
+                    teamRole: teamGroup.teamRole,
+                  },
                 },
-              ],
-            },
-          },
-        });
-
-        await tx.teamGlobalSettings.upsert({
-          where: {
-            teamId: team.id,
-          },
-          update: {},
-          create: {
-            teamId: team.id,
-          },
-        });
-      });
-
-      return {
-        paymentRequired: false,
-      };
-    }
-
-    // Create a pending team if payment is required.
-    const pendingTeam = await prisma.$transaction(async (tx) => {
-      const existingTeamWithUrl = await tx.team.findUnique({
-        where: {
-          url: teamUrl,
-        },
-      });
-
-      const existingUserProfileWithUrl = await tx.user.findUnique({
-        where: {
-          url: teamUrl,
-        },
-        select: {
-          id: true,
-        },
-      });
-
-      if (existingUserProfileWithUrl) {
+              },
+            }),
+          ),
+        );
+      },
+      {
+        timeout: 7500,
+      },
+    )
+    .catch((err) => {
+      if (err.code === 'P2002') {
         throw new AppError(AppErrorCode.ALREADY_EXISTS, {
-          message: 'URL already taken.',
+          message: 'Team URL already exists',
         });
       }
 
-      if (existingTeamWithUrl) {
-        throw new AppError(AppErrorCode.ALREADY_EXISTS, {
-          message: 'Team URL already exists.',
-        });
-      }
-
-      if (!customerId) {
-        throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
-          message: 'Missing customer ID for pending teams.',
-        });
-      }
-
-      return await tx.teamPending.create({
-        data: {
-          name: teamName,
-          url: teamUrl,
-          ownerUserId: user.id,
-          customerId,
-        },
-      });
-    });
-
-    return {
-      paymentRequired: true,
-      pendingTeamId: pendingTeam.id,
-    };
-  } catch (err) {
-    console.error(err);
-
-    if (!(err instanceof Prisma.PrismaClientKnownRequestError)) {
       throw err;
-    }
-
-    const target = z.array(z.string()).safeParse(err.meta?.target);
-
-    if (err.code === 'P2002' && target.success && target.data.includes('url')) {
-      throw new AppError(AppErrorCode.ALREADY_EXISTS, {
-        message: 'Team URL already exists.',
-      });
-    }
-
-    throw err;
-  }
-};
-
-export type CreateTeamFromPendingTeamOptions = {
-  pendingTeamId: number;
-  subscription: Stripe.Subscription;
-};
-
-export const createTeamFromPendingTeam = async ({
-  pendingTeamId,
-  subscription,
-}: CreateTeamFromPendingTeamOptions) => {
-  const createdTeam = await prisma.$transaction(async (tx) => {
-    const pendingTeam = await tx.teamPending.findUniqueOrThrow({
-      where: {
-        id: pendingTeamId,
-      },
-    });
-
-    await tx.teamPending.delete({
-      where: {
-        id: pendingTeamId,
-      },
-    });
-
-    const team = await tx.team.create({
-      data: {
-        name: pendingTeam.name,
-        url: pendingTeam.url,
-        ownerUserId: pendingTeam.ownerUserId,
-        customerId: pendingTeam.customerId,
-        members: {
-          create: [
-            {
-              userId: pendingTeam.ownerUserId,
-              role: TeamMemberRole.ADMIN,
-            },
-          ],
-        },
-      },
-    });
-
-    await tx.teamGlobalSettings.upsert({
-      where: {
-        teamId: team.id,
-      },
-      update: {},
-      create: {
-        teamId: team.id,
-      },
-    });
-
-    await tx.subscription.upsert(
-      mapStripeSubscriptionToPrismaUpsertAction(subscription, undefined, team.id),
-    );
-
-    return team;
-  });
-
-  // Attach the team ID to the subscription metadata for sanity reasons.
-  await stripe.subscriptions
-    .update(subscription.id, {
-      metadata: {
-        teamId: createdTeam.id.toString(),
-      },
-    })
-    .catch((e) => {
-      console.error(e);
-      // Non-critical error, but we want to log it so we can rectify it.
-      // Todo: Teams - Alert us.
-    });
-
-  return createdTeam;
+    });
 };
diff --git a/packages/lib/server-only/team/decline-team-invitation.ts b/packages/lib/server-only/team/decline-team-invitation.ts
deleted file mode 100644
index e3d87dc4e..000000000
--- a/packages/lib/server-only/team/decline-team-invitation.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { prisma } from '@documenso/prisma';
-
-export type DeclineTeamInvitationOptions = {
-  userId: number;
-  teamId: number;
-};
-
-export const declineTeamInvitation = async ({ userId, teamId }: DeclineTeamInvitationOptions) => {
-  await prisma.$transaction(
-    async (tx) => {
-      const user = await tx.user.findFirstOrThrow({
-        where: {
-          id: userId,
-        },
-      });
-
-      const teamMemberInvite = await tx.teamMemberInvite.findFirstOrThrow({
-        where: {
-          teamId,
-          email: user.email,
-        },
-      });
-
-      await tx.teamMemberInvite.delete({
-        where: {
-          id: teamMemberInvite.id,
-        },
-      });
-
-      // TODO: notify the team owner
-    },
-    { timeout: 30_000 },
-  );
-};
diff --git a/packages/lib/server-only/team/delete-team-email-verification.ts b/packages/lib/server-only/team/delete-team-email-verification.ts
index fee39553f..daf7f8d0d 100644
--- a/packages/lib/server-only/team/delete-team-email-verification.ts
+++ b/packages/lib/server-only/team/delete-team-email-verification.ts
@@ -1,6 +1,8 @@
 import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams';
 import { prisma } from '@documenso/prisma';
 
+import { buildTeamWhereQuery } from '../../utils/teams';
+
 export type DeleteTeamEmailVerificationOptions = {
   userId: number;
   teamId: number;
@@ -10,25 +12,17 @@ export const deleteTeamEmailVerification = async ({
   userId,
   teamId,
 }: DeleteTeamEmailVerificationOptions) => {
-  await prisma.$transaction(async (tx) => {
-    await tx.team.findFirstOrThrow({
-      where: {
-        id: teamId,
-        members: {
-          some: {
-            userId,
-            role: {
-              in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
-            },
-          },
-        },
-      },
-    });
+  await prisma.team.findFirstOrThrow({
+    where: buildTeamWhereQuery({
+      teamId,
+      userId,
+      roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+    }),
+  });
 
-    await tx.teamEmailVerification.delete({
-      where: {
-        teamId,
-      },
-    });
+  await prisma.teamEmailVerification.delete({
+    where: {
+      teamId,
+    },
   });
 };
diff --git a/packages/lib/server-only/team/delete-team-email.ts b/packages/lib/server-only/team/delete-team-email.ts
index 15e08cba4..da6e44f2b 100644
--- a/packages/lib/server-only/team/delete-team-email.ts
+++ b/packages/lib/server-only/team/delete-team-email.ts
@@ -12,7 +12,8 @@ import { prisma } from '@documenso/prisma';
 import { getI18nInstance } from '../../client-only/providers/i18n-server';
 import { env } from '../../utils/env';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
+import { buildTeamWhereQuery } from '../../utils/teams';
+import { getEmailContext } from '../email/get-email-context';
 
 export type DeleteTeamEmailOptions = {
   userId: number;
@@ -26,47 +27,48 @@ export type DeleteTeamEmailOptions = {
  * The user must either be part of the team with the required permissions, or the owner of the email.
  */
 export const deleteTeamEmail = async ({ userId, userEmail, teamId }: DeleteTeamEmailOptions) => {
-  const team = await prisma.$transaction(async (tx) => {
-    const foundTeam = await tx.team.findFirstOrThrow({
-      where: {
-        id: teamId,
-        OR: [
-          {
-            teamEmail: {
-              email: userEmail,
-            },
-          },
-          {
-            members: {
-              some: {
-                userId,
-                role: {
-                  in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
-                },
-              },
-            },
-          },
-        ],
-      },
-      include: {
-        teamEmail: true,
-        owner: {
-          select: {
-            name: true,
-            email: true,
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'team',
+      teamId,
+    },
+  });
+
+  const team = await prisma.team.findFirstOrThrow({
+    where: {
+      OR: [
+        buildTeamWhereQuery({
+          teamId,
+          userId,
+          roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+        }),
+        {
+          id: teamId,
+          teamEmail: {
+            email: userEmail,
+          },
+        },
+      ],
+    },
+    include: {
+      teamEmail: true,
+      organisation: {
+        select: {
+          owner: {
+            select: {
+              name: true,
+              email: true,
+            },
           },
         },
-        teamGlobalSettings: true,
       },
-    });
+    },
+  });
 
-    await tx.teamEmail.delete({
-      where: {
-        teamId,
-      },
-    });
-
-    return foundTeam;
+  await prisma.teamEmail.delete({
+    where: {
+      teamId,
+    },
   });
 
   try {
@@ -80,11 +82,7 @@ export const deleteTeamEmail = async ({ userId, userEmail, teamId }: DeleteTeamE
       teamUrl: team.url,
     });
 
-    const branding = team.teamGlobalSettings
-      ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
-      : undefined;
-
-    const lang = team.teamGlobalSettings?.documentLanguage;
+    const lang = settings.documentLanguage;
 
     const [html, text] = await Promise.all([
       renderEmailWithI18N(template, { lang, branding }),
@@ -95,8 +93,8 @@ export const deleteTeamEmail = async ({ userId, userEmail, teamId }: DeleteTeamE
 
     await mailer.sendMail({
       to: {
-        address: team.owner.email,
-        name: team.owner.name ?? '',
+        address: team.organisation.owner.email,
+        name: team.organisation.owner.name ?? '',
       },
       from: {
         name: FROM_NAME,
diff --git a/packages/lib/server-only/team/delete-team-invitations.ts b/packages/lib/server-only/team/delete-team-invitations.ts
deleted file mode 100644
index a2baf8352..000000000
--- a/packages/lib/server-only/team/delete-team-invitations.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { prisma } from '@documenso/prisma';
-
-import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams';
-
-export type DeleteTeamMemberInvitationsOptions = {
-  /**
-   * The ID of the user who is initiating this action.
-   */
-  userId: number;
-
-  /**
-   * The ID of the team to remove members from.
-   */
-  teamId: number;
-
-  /**
-   * The IDs of the invitations to remove.
-   */
-  invitationIds: number[];
-};
-
-export const deleteTeamMemberInvitations = async ({
-  userId,
-  teamId,
-  invitationIds,
-}: DeleteTeamMemberInvitationsOptions) => {
-  await prisma.$transaction(async (tx) => {
-    await tx.teamMember.findFirstOrThrow({
-      where: {
-        userId,
-        teamId,
-        role: {
-          in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
-        },
-      },
-    });
-
-    await tx.teamMemberInvite.deleteMany({
-      where: {
-        id: {
-          in: invitationIds,
-        },
-        teamId,
-      },
-    });
-  });
-};
diff --git a/packages/lib/server-only/team/delete-team-members.ts b/packages/lib/server-only/team/delete-team-members.ts
deleted file mode 100644
index 001817c5e..000000000
--- a/packages/lib/server-only/team/delete-team-members.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { updateSubscriptionItemQuantity } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
-import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
-import { prisma } from '@documenso/prisma';
-
-export type DeleteTeamMembersOptions = {
-  /**
-   * The ID of the user who is initiating this action.
-   */
-  userId: number;
-
-  /**
-   * The ID of the team to remove members from.
-   */
-  teamId: number;
-
-  /**
-   * The IDs of the team members to remove.
-   */
-  teamMemberIds: number[];
-};
-
-export const deleteTeamMembers = async ({
-  userId,
-  teamId,
-  teamMemberIds,
-}: DeleteTeamMembersOptions) => {
-  await prisma.$transaction(
-    async (tx) => {
-      // Find the team and validate that the user is allowed to remove members.
-      const team = await tx.team.findFirstOrThrow({
-        where: {
-          id: teamId,
-          members: {
-            some: {
-              userId,
-              role: {
-                in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
-              },
-            },
-          },
-        },
-        include: {
-          members: {
-            select: {
-              id: true,
-              userId: true,
-              role: true,
-            },
-          },
-          subscription: true,
-        },
-      });
-
-      const currentTeamMember = team.members.find((member) => member.userId === userId);
-      const teamMembersToRemove = team.members.filter((member) =>
-        teamMemberIds.includes(member.id),
-      );
-
-      if (!currentTeamMember) {
-        throw new AppError(AppErrorCode.NOT_FOUND, {
-          message: 'Team member record does not exist',
-        });
-      }
-
-      if (teamMembersToRemove.find((member) => member.userId === team.ownerUserId)) {
-        throw new AppError(AppErrorCode.UNAUTHORIZED, { message: 'Cannot remove the team owner' });
-      }
-
-      const isMemberToRemoveHigherRole = teamMembersToRemove.some(
-        (member) => !isTeamRoleWithinUserHierarchy(currentTeamMember.role, member.role),
-      );
-
-      if (isMemberToRemoveHigherRole) {
-        throw new AppError(AppErrorCode.UNAUTHORIZED, {
-          message: 'Cannot remove a member with a higher role',
-        });
-      }
-
-      // Remove the team members.
-      await tx.teamMember.deleteMany({
-        where: {
-          id: {
-            in: teamMemberIds,
-          },
-          teamId,
-          userId: {
-            not: team.ownerUserId,
-          },
-        },
-      });
-
-      if (IS_BILLING_ENABLED() && team.subscription) {
-        const numberOfSeats = await tx.teamMember.count({
-          where: {
-            teamId,
-          },
-        });
-
-        await updateSubscriptionItemQuantity({
-          priceId: team.subscription.priceId,
-          subscriptionId: team.subscription.planId,
-          quantity: numberOfSeats,
-        });
-      }
-    },
-    { timeout: 30_000 },
-  );
-};
diff --git a/packages/lib/server-only/team/delete-team-pending.ts b/packages/lib/server-only/team/delete-team-pending.ts
deleted file mode 100644
index b339fd862..000000000
--- a/packages/lib/server-only/team/delete-team-pending.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { prisma } from '@documenso/prisma';
-
-export type DeleteTeamPendingOptions = {
-  userId: number;
-  pendingTeamId: number;
-};
-
-export const deleteTeamPending = async ({ userId, pendingTeamId }: DeleteTeamPendingOptions) => {
-  await prisma.teamPending.delete({
-    where: {
-      id: pendingTeamId,
-      ownerUserId: userId,
-    },
-  });
-};
diff --git a/packages/lib/server-only/team/delete-team-transfer-request.ts b/packages/lib/server-only/team/delete-team-transfer-request.ts
deleted file mode 100644
index 245a72b5a..000000000
--- a/packages/lib/server-only/team/delete-team-transfer-request.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { prisma } from '@documenso/prisma';
-
-import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams';
-
-export type DeleteTeamTransferRequestOptions = {
-  /**
-   * The ID of the user deleting the transfer.
-   */
-  userId: number;
-
-  /**
-   * The ID of the team whose team transfer request should be deleted.
-   */
-  teamId: number;
-};
-
-export const deleteTeamTransferRequest = async ({
-  userId,
-  teamId,
-}: DeleteTeamTransferRequestOptions) => {
-  await prisma.$transaction(async (tx) => {
-    await tx.team.findFirstOrThrow({
-      where: {
-        id: teamId,
-        members: {
-          some: {
-            userId,
-            role: {
-              in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['DELETE_TEAM_TRANSFER_REQUEST'],
-            },
-          },
-        },
-      },
-    });
-
-    await tx.teamTransferVerification.delete({
-      where: {
-        teamId,
-      },
-    });
-  });
-};
diff --git a/packages/lib/server-only/team/delete-team.ts b/packages/lib/server-only/team/delete-team.ts
index 864e23fea..ccaefa7d4 100644
--- a/packages/lib/server-only/team/delete-team.ts
+++ b/packages/lib/server-only/team/delete-team.ts
@@ -1,20 +1,22 @@
 import { createElement } from 'react';
 
 import { msg } from '@lingui/core/macro';
-import type { Team, TeamGlobalSettings } from '@prisma/client';
+import { OrganisationGroupType, type Team } from '@prisma/client';
+import { uniqueBy } from 'remeda';
 
 import { mailer } from '@documenso/email/mailer';
 import { TeamDeleteEmailTemplate } from '@documenso/email/templates/team-delete';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email';
-import { AppError } from '@documenso/lib/errors/app-error';
-import { stripe } from '@documenso/lib/server-only/stripe';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { prisma } from '@documenso/prisma';
 
 import { getI18nInstance } from '../../client-only/providers/i18n-server';
+import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams';
 import { jobs } from '../../jobs/client';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
+import { buildTeamWhereQuery } from '../../utils/teams';
+import { getEmailContext } from '../email/get-email-context';
 
 export type DeleteTeamOptions = {
   userId: number;
@@ -22,41 +24,78 @@ export type DeleteTeamOptions = {
 };
 
 export const deleteTeam = async ({ userId, teamId }: DeleteTeamOptions) => {
-  await prisma.$transaction(
-    async (tx) => {
-      const team = await tx.team.findFirstOrThrow({
-        where: {
-          id: teamId,
-          ownerUserId: userId,
+  const team = await prisma.team.findFirst({
+    where: buildTeamWhereQuery({
+      teamId,
+      userId,
+      roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['DELETE_TEAM'],
+    }),
+    include: {
+      organisation: {
+        select: {
+          organisationGlobalSettings: true,
         },
+      },
+      teamGroups: {
         include: {
-          subscription: true,
-          members: {
+          organisationGroup: {
             include: {
-              user: {
-                select: {
-                  id: true,
-                  name: true,
-                  email: true,
+              organisationGroupMembers: {
+                include: {
+                  organisationMember: {
+                    include: {
+                      user: {
+                        select: {
+                          id: true,
+                          name: true,
+                          email: true,
+                        },
+                      },
+                    },
+                  },
                 },
               },
             },
           },
-          teamGlobalSettings: true,
+        },
+      },
+    },
+  });
+
+  if (!team) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'You are not authorized to delete this team',
+    });
+  }
+
+  const membersToNotify = uniqueBy(
+    team.teamGroups.flatMap((group) =>
+      group.organisationGroup.organisationGroupMembers.map((member) => ({
+        id: member.organisationMember.user.id,
+        name: member.organisationMember.user.name || '',
+        email: member.organisationMember.user.email,
+      })),
+    ),
+    (member) => member.id,
+  );
+
+  await prisma.$transaction(
+    async (tx) => {
+      await tx.team.delete({
+        where: {
+          id: teamId,
         },
       });
 
-      if (team.subscription) {
-        await stripe.subscriptions
-          .cancel(team.subscription.planId, {
-            prorate: false,
-            invoice_now: true,
-          })
-          .catch((err) => {
-            console.error(err);
-            throw AppError.parseError(err);
-          });
-      }
+      // Purge all internal organisation groups that have no teams.
+      await tx.organisationGroup.deleteMany({
+        where: {
+          type: OrganisationGroupType.INTERNAL_TEAM,
+          teamGroups: {
+            none: {},
+          },
+        },
+      });
 
       await jobs.triggerJob({
         name: 'send.team-deleted.email',
@@ -64,21 +103,9 @@ export const deleteTeam = async ({ userId, teamId }: DeleteTeamOptions) => {
           team: {
             name: team.name,
             url: team.url,
-            ownerUserId: team.ownerUserId,
-            teamGlobalSettings: team.teamGlobalSettings,
           },
-          members: team.members.map((member) => ({
-            id: member.user.id,
-            name: member.user.name || '',
-            email: member.user.email,
-          })),
-        },
-      });
-
-      await tx.team.delete({
-        where: {
-          id: teamId,
-          ownerUserId: userId,
+          members: membersToNotify,
+          organisationId: team.organisationId,
         },
       });
     },
@@ -88,25 +115,29 @@ export const deleteTeam = async ({ userId, teamId }: DeleteTeamOptions) => {
 
 type SendTeamDeleteEmailOptions = {
   email: string;
-  team: Pick<Team, 'url' | 'name'> & {
-    teamGlobalSettings?: TeamGlobalSettings | null;
-  };
-  isOwner: boolean;
+  team: Pick<Team, 'url' | 'name'>;
+  organisationId: string;
 };
 
-export const sendTeamDeleteEmail = async ({ email, isOwner, team }: SendTeamDeleteEmailOptions) => {
+export const sendTeamDeleteEmail = async ({
+  email,
+  team,
+  organisationId,
+}: SendTeamDeleteEmailOptions) => {
   const template = createElement(TeamDeleteEmailTemplate, {
     assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
     baseUrl: NEXT_PUBLIC_WEBAPP_URL(),
     teamUrl: team.url,
-    isOwner,
   });
 
-  const branding = team.teamGlobalSettings
-    ? teamGlobalSettingsToBranding(team.teamGlobalSettings)
-    : undefined;
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'organisation',
+      organisationId,
+    },
+  });
 
-  const lang = team.teamGlobalSettings?.documentLanguage;
+  const lang = settings.documentLanguage;
 
   const [html, text] = await Promise.all([
     renderEmailWithI18N(template, { lang, branding }),
diff --git a/packages/lib/server-only/team/find-team-invoices.ts b/packages/lib/server-only/team/find-organisation-invoices.ts
similarity index 93%
rename from packages/lib/server-only/team/find-team-invoices.ts
rename to packages/lib/server-only/team/find-organisation-invoices.ts
index 2f522237e..d07a64018 100644
--- a/packages/lib/server-only/team/find-team-invoices.ts
+++ b/packages/lib/server-only/team/find-organisation-invoices.ts
@@ -8,7 +8,7 @@ export interface FindTeamInvoicesOptions {
   teamId: number;
 }
 
-export const findTeamInvoices = async ({ userId, teamId }: FindTeamInvoicesOptions) => {
+export const findOrganisationInvoices = async ({ userId, teamId }: FindTeamInvoicesOptions) => {
   const team = await prisma.team.findUniqueOrThrow({
     where: {
       id: teamId,
diff --git a/packages/lib/server-only/team/find-team-member-invites.ts b/packages/lib/server-only/team/find-team-member-invites.ts
deleted file mode 100644
index ccc4fbb2b..000000000
--- a/packages/lib/server-only/team/find-team-member-invites.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import type { TeamMemberInvite } from '@prisma/client';
-import { Prisma } from '@prisma/client';
-import { P, match } from 'ts-pattern';
-import type { z } from 'zod';
-
-import { prisma } from '@documenso/prisma';
-import { TeamMemberInviteSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamMemberInviteSchema';
-
-import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams';
-import { type FindResultResponse, ZFindResultResponse } from '../../types/search-params';
-
-export interface FindTeamMemberInvitesOptions {
-  userId: number;
-  teamId: number;
-  query?: string;
-  page?: number;
-  perPage?: number;
-  orderBy?: {
-    column: keyof TeamMemberInvite;
-    direction: 'asc' | 'desc';
-  };
-}
-
-export const ZFindTeamMemberInvitesResponseSchema = ZFindResultResponse.extend({
-  data: TeamMemberInviteSchema.pick({
-    id: true,
-    teamId: true,
-    email: true,
-    role: true,
-    createdAt: true,
-  }).array(),
-});
-
-export type TFindTeamMemberInvitesResponse = z.infer<typeof ZFindTeamMemberInvitesResponseSchema>;
-
-export const findTeamMemberInvites = async ({
-  userId,
-  teamId,
-  query,
-  page = 1,
-  perPage = 10,
-  orderBy,
-}: FindTeamMemberInvitesOptions): Promise<TFindTeamMemberInvitesResponse> => {
-  const orderByColumn = orderBy?.column ?? 'email';
-  const orderByDirection = orderBy?.direction ?? 'desc';
-
-  // Check that the user belongs to the team they are trying to find invites in.
-  const userTeam = await prisma.team.findUniqueOrThrow({
-    where: {
-      id: teamId,
-      members: {
-        some: {
-          userId,
-          role: {
-            in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
-          },
-        },
-      },
-    },
-  });
-
-  const termFilters: Prisma.TeamMemberInviteWhereInput | undefined = match(query)
-    .with(P.string.minLength(1), () => ({
-      email: {
-        contains: query,
-        mode: Prisma.QueryMode.insensitive,
-      },
-    }))
-    .otherwise(() => undefined);
-
-  const whereClause: Prisma.TeamMemberInviteWhereInput = {
-    ...termFilters,
-    teamId: userTeam.id,
-  };
-
-  const [data, count] = await Promise.all([
-    prisma.teamMemberInvite.findMany({
-      where: whereClause,
-      skip: Math.max(page - 1, 0) * perPage,
-      take: perPage,
-      orderBy: {
-        [orderByColumn]: orderByDirection,
-      },
-      // Exclude token attribute.
-      select: {
-        id: true,
-        teamId: true,
-        email: true,
-        role: true,
-        createdAt: true,
-      },
-    }),
-    prisma.teamMemberInvite.count({
-      where: whereClause,
-    }),
-  ]);
-
-  return {
-    data,
-    count,
-    currentPage: Math.max(page, 1),
-    perPage,
-    totalPages: Math.ceil(count / perPage),
-  } satisfies FindResultResponse<typeof data>;
-};
diff --git a/packages/lib/server-only/team/find-team-members.ts b/packages/lib/server-only/team/find-team-members.ts
index bb1d4b213..e517743d8 100644
--- a/packages/lib/server-only/team/find-team-members.ts
+++ b/packages/lib/server-only/team/find-team-members.ts
@@ -1,14 +1,13 @@
-import type { TeamMember } from '@prisma/client';
+import type { OrganisationMember } from '@prisma/client';
 import { Prisma } from '@prisma/client';
 import { P, match } from 'ts-pattern';
-import type { z } from 'zod';
 
 import { prisma } from '@documenso/prisma';
-import { TeamMemberSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamMemberSchema';
-import { UserSchema } from '@documenso/prisma/generated/zod/modelSchema/UserSchema';
 
+import { AppError, AppErrorCode } from '../../errors/app-error';
 import type { FindResultResponse } from '../../types/search-params';
-import { ZFindResultResponse } from '../../types/search-params';
+import { getHighestOrganisationRoleInGroup } from '../../utils/organisations';
+import { getHighestTeamRoleInGroup } from '../../utils/teams';
 
 export interface FindTeamMembersOptions {
   userId: number;
@@ -17,22 +16,11 @@ export interface FindTeamMembersOptions {
   page?: number;
   perPage?: number;
   orderBy?: {
-    column: keyof TeamMember | 'name';
+    column: keyof OrganisationMember | 'name';
     direction: 'asc' | 'desc';
   };
 }
 
-export const ZFindTeamMembersResponseSchema = ZFindResultResponse.extend({
-  data: TeamMemberSchema.extend({
-    user: UserSchema.pick({
-      name: true,
-      email: true,
-    }),
-  }).array(),
-});
-
-export type TFindTeamMembersResponse = z.infer<typeof ZFindTeamMembersResponseSchema>;
-
 export const findTeamMembers = async ({
   userId,
   teamId,
@@ -40,39 +28,69 @@ export const findTeamMembers = async ({
   page = 1,
   perPage = 10,
   orderBy,
-}: FindTeamMembersOptions): Promise<TFindTeamMembersResponse> => {
+}: FindTeamMembersOptions) => {
   const orderByColumn = orderBy?.column ?? 'name';
   const orderByDirection = orderBy?.direction ?? 'desc';
 
   // Check that the user belongs to the team they are trying to find members in.
-  const userTeam = await prisma.team.findUniqueOrThrow({
+  const userTeam = await prisma.organisationMember.findFirst({
     where: {
-      id: teamId,
-      members: {
+      userId,
+      organisationGroupMembers: {
         some: {
-          userId,
+          group: {
+            teamGroups: {
+              some: {
+                teamId,
+              },
+            },
+          },
         },
       },
     },
   });
 
-  const termFilters: Prisma.TeamMemberWhereInput | undefined = match(query)
+  if (!userTeam) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED);
+  }
+
+  const termFilters: Prisma.OrganisationMemberWhereInput | undefined = match(query)
     .with(P.string.minLength(1), () => ({
       user: {
-        name: {
-          contains: query,
-          mode: Prisma.QueryMode.insensitive,
-        },
+        OR: [
+          {
+            name: {
+              contains: query,
+              mode: Prisma.QueryMode.insensitive,
+            },
+          },
+          {
+            email: {
+              contains: query,
+              mode: Prisma.QueryMode.insensitive,
+            },
+          },
+        ],
       },
     }))
     .otherwise(() => undefined);
 
-  const whereClause: Prisma.TeamMemberWhereInput = {
+  const whereClause: Prisma.OrganisationMemberWhereInput = {
     ...termFilters,
-    teamId: userTeam.id,
+    organisationGroupMembers: {
+      some: {
+        group: {
+          teamGroups: {
+            some: {
+              teamId,
+            },
+          },
+        },
+      },
+    },
   };
 
-  let orderByClause: Prisma.TeamMemberOrderByWithRelationInput = {
+  let orderByClause: Prisma.OrganisationMemberOrderByWithRelationInput = {
     [orderByColumn]: orderByDirection,
   };
 
@@ -86,7 +104,7 @@ export const findTeamMembers = async ({
   }
 
   const [data, count] = await Promise.all([
-    prisma.teamMember.findMany({
+    prisma.organisationMember.findMany({
       where: whereClause,
       skip: Math.max(page - 1, 0) * perPage,
       take: perPage,
@@ -94,22 +112,53 @@ export const findTeamMembers = async ({
       include: {
         user: {
           select: {
-            name: true,
+            id: true,
             email: true,
+            name: true,
+            avatarImageId: true,
+          },
+        },
+        organisationGroupMembers: {
+          include: {
+            group: {
+              include: {
+                teamGroups: true,
+              },
+            },
           },
         },
       },
     }),
-    prisma.teamMember.count({
+    prisma.organisationMember.count({
       where: whereClause,
     }),
   ]);
 
+  // same as get-team-members.
+  const mappedData = data.map((member) => ({
+    id: member.id,
+    userId: member.userId,
+    createdAt: member.createdAt,
+    email: member.user.email,
+    name: member.user.name,
+    avatarImageId: member.user.avatarImageId,
+    // Filter teamGroups to only include the current team
+    teamRole: getHighestTeamRoleInGroup(
+      member.organisationGroupMembers.flatMap(({ group }) =>
+        group.teamGroups.filter((tg) => tg.teamId === teamId),
+      ),
+    ),
+    teamRoleGroupType: member.organisationGroupMembers[0].group.type,
+    organisationRole: getHighestOrganisationRoleInGroup(
+      member.organisationGroupMembers.flatMap(({ group }) => group),
+    ),
+  }));
+
   return {
-    data,
+    data: mappedData,
     count,
     currentPage: Math.max(page, 1),
     perPage,
     totalPages: Math.ceil(count / perPage),
-  } satisfies FindResultResponse<typeof data>;
+  } satisfies FindResultResponse<typeof mappedData>;
 };
diff --git a/packages/lib/server-only/team/find-teams-pending.ts b/packages/lib/server-only/team/find-teams-pending.ts
deleted file mode 100644
index e902c42ad..000000000
--- a/packages/lib/server-only/team/find-teams-pending.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import type { Team } from '@prisma/client';
-import { Prisma } from '@prisma/client';
-import type { z } from 'zod';
-
-import { prisma } from '@documenso/prisma';
-import { TeamPendingSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamPendingSchema';
-
-import { type FindResultResponse, ZFindResultResponse } from '../../types/search-params';
-
-export interface FindTeamsPendingOptions {
-  userId: number;
-  query?: string;
-  page?: number;
-  perPage?: number;
-  orderBy?: {
-    column: keyof Team;
-    direction: 'asc' | 'desc';
-  };
-}
-
-export const ZFindTeamsPendingResponseSchema = ZFindResultResponse.extend({
-  data: TeamPendingSchema.array(),
-});
-
-export type TFindTeamsPendingResponse = z.infer<typeof ZFindTeamsPendingResponseSchema>;
-
-export const findTeamsPending = async ({
-  userId,
-  query,
-  page = 1,
-  perPage = 10,
-  orderBy,
-}: FindTeamsPendingOptions): Promise<TFindTeamsPendingResponse> => {
-  const orderByColumn = orderBy?.column ?? 'name';
-  const orderByDirection = orderBy?.direction ?? 'desc';
-
-  const whereClause: Prisma.TeamPendingWhereInput = {
-    ownerUserId: userId,
-  };
-
-  if (query && query.length > 0) {
-    whereClause.name = {
-      contains: query,
-      mode: Prisma.QueryMode.insensitive,
-    };
-  }
-
-  const [data, count] = await Promise.all([
-    prisma.teamPending.findMany({
-      where: whereClause,
-      skip: Math.max(page - 1, 0) * perPage,
-      take: perPage,
-      orderBy: {
-        [orderByColumn]: orderByDirection,
-      },
-    }),
-    prisma.teamPending.count({
-      where: whereClause,
-    }),
-  ]);
-
-  return {
-    data,
-    count,
-    currentPage: Math.max(page, 1),
-    perPage,
-    totalPages: Math.ceil(count / perPage),
-  } satisfies FindResultResponse<typeof data>;
-};
diff --git a/packages/lib/server-only/team/find-teams.ts b/packages/lib/server-only/team/find-teams.ts
index 5c27aa5d8..b72a4de84 100644
--- a/packages/lib/server-only/team/find-teams.ts
+++ b/packages/lib/server-only/team/find-teams.ts
@@ -4,9 +4,11 @@ import { Prisma } from '@prisma/client';
 import { prisma } from '@documenso/prisma';
 
 import type { FindResultResponse } from '../../types/search-params';
+import { getHighestTeamRoleInGroup } from '../../utils/teams';
 
 export interface FindTeamsOptions {
   userId: number;
+  organisationId: string;
   query?: string;
   page?: number;
   perPage?: number;
@@ -18,6 +20,7 @@ export interface FindTeamsOptions {
 
 export const findTeams = async ({
   userId,
+  organisationId,
   query,
   page = 1,
   perPage = 10,
@@ -27,9 +30,20 @@ export const findTeams = async ({
   const orderByDirection = orderBy?.direction ?? 'desc';
 
   const whereClause: Prisma.TeamWhereInput = {
-    members: {
+    organisation: {
+      id: organisationId,
+    },
+    teamGroups: {
       some: {
-        userId,
+        organisationGroup: {
+          organisationGroupMembers: {
+            some: {
+              organisationMember: {
+                userId,
+              },
+            },
+          },
+        },
       },
     },
   };
@@ -50,9 +64,17 @@ export const findTeams = async ({
         [orderByColumn]: orderByDirection,
       },
       include: {
-        members: {
+        teamGroups: {
           where: {
-            userId,
+            organisationGroup: {
+              organisationGroupMembers: {
+                some: {
+                  organisationMember: {
+                    userId,
+                  },
+                },
+              },
+            },
           },
         },
       },
@@ -64,8 +86,7 @@ export const findTeams = async ({
 
   const maskedData = data.map((team) => ({
     ...team,
-    currentTeamMember: team.members[0],
-    members: undefined,
+    currentTeamRole: getHighestTeamRoleInGroup(team.teamGroups),
   }));
 
   return {
diff --git a/packages/lib/server-only/team/get-member-roles.ts b/packages/lib/server-only/team/get-member-roles.ts
new file mode 100644
index 000000000..247bf7145
--- /dev/null
+++ b/packages/lib/server-only/team/get-member-roles.ts
@@ -0,0 +1,114 @@
+import { prisma } from '@documenso/prisma';
+
+import { AppError, AppErrorCode } from '../../errors/app-error';
+import { getHighestOrganisationRoleInGroup } from '../../utils/organisations';
+import { getHighestTeamRoleInGroup } from '../../utils/teams';
+
+type GetMemberRolesOptions = {
+  teamId: number;
+  reference:
+    | {
+        type: 'User';
+        id: number;
+      }
+    | {
+        type: 'Member';
+        id: string;
+      };
+};
+
+/**
+ * Returns the highest Team role of a given member or user of a team
+ */
+export const getMemberRoles = async ({ teamId, reference }: GetMemberRolesOptions) => {
+  const team = await prisma.team.findFirst({
+    where: {
+      id: teamId,
+    },
+    include: {
+      teamGroups: {
+        where: {
+          organisationGroup: {
+            organisationGroupMembers: {
+              some: {
+                organisationMember:
+                  reference.type === 'User'
+                    ? {
+                        userId: reference.id,
+                      }
+                    : {
+                        id: reference.id,
+                      },
+              },
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (!team || team.teamGroups.length === 0) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Roles not found',
+    });
+  }
+
+  return {
+    // Todo: Would be nice bonus to have. If implemented make sure to test hard.
+    // organisationRole: getHighestOrganisationRoleInGroup(),
+    teamRole: getHighestTeamRoleInGroup(team.teamGroups),
+  };
+};
+
+type GetMemberOrganisationRoleOptions = {
+  organisationId: string;
+  reference:
+    | {
+        type: 'User';
+        id: number;
+      }
+    | {
+        type: 'Member';
+        id: string;
+      };
+};
+
+/**
+ * Returns the highest Organisation of a given organisation member
+ */
+export const getMemberOrganisationRole = async ({
+  organisationId,
+  reference,
+}: GetMemberOrganisationRoleOptions) => {
+  const organisation = await prisma.organisation.findFirst({
+    where: {
+      id: organisationId,
+    },
+    include: {
+      groups: {
+        where: {
+          organisationGroupMembers: {
+            some: {
+              organisationMember:
+                reference.type === 'User'
+                  ? {
+                      userId: reference.id,
+                    }
+                  : {
+                      id: reference.id,
+                    },
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (!organisation || organisation.groups.length === 0) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Roles not found',
+    });
+  }
+
+  return getHighestOrganisationRoleInGroup(organisation.groups);
+};
diff --git a/packages/lib/server-only/team/get-team-email-by-email.ts b/packages/lib/server-only/team/get-team-email-by-email.ts
index 665694db4..b684ad75f 100644
--- a/packages/lib/server-only/team/get-team-email-by-email.ts
+++ b/packages/lib/server-only/team/get-team-email-by-email.ts
@@ -1,5 +1,7 @@
 import { prisma } from '@documenso/prisma';
 
+import { buildTeamWhereQuery } from '../../utils/teams';
+
 export type GetTeamEmailByEmailOptions = {
   email: string;
 };
@@ -20,3 +22,22 @@ export const getTeamEmailByEmail = async ({ email }: GetTeamEmailByEmailOptions)
     },
   });
 };
+
+export const getTeamWithEmail = async ({
+  userId,
+  teamUrl,
+}: {
+  userId: number;
+  teamUrl: string;
+}) => {
+  return await prisma.team.findFirstOrThrow({
+    where: {
+      ...buildTeamWhereQuery({ teamId: undefined, userId }),
+      url: teamUrl,
+    },
+    include: {
+      teamEmail: true,
+      emailVerification: true,
+    },
+  });
+};
diff --git a/packages/lib/server-only/team/get-team-invitations.ts b/packages/lib/server-only/team/get-team-invitations.ts
deleted file mode 100644
index 0ae3e0e5b..000000000
--- a/packages/lib/server-only/team/get-team-invitations.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import type { z } from 'zod';
-
-import { prisma } from '@documenso/prisma';
-import { TeamMemberInviteSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamMemberInviteSchema';
-import { TeamSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
-
-export type GetTeamInvitationsOptions = {
-  email: string;
-};
-
-export const ZGetTeamInvitationsResponseSchema = TeamMemberInviteSchema.extend({
-  team: TeamSchema.pick({
-    id: true,
-    name: true,
-    url: true,
-    avatarImageId: true,
-  }),
-}).array();
-
-export type TGetTeamInvitationsResponse = z.infer<typeof ZGetTeamInvitationsResponseSchema>;
-
-export const getTeamInvitations = async ({
-  email,
-}: GetTeamInvitationsOptions): Promise<TGetTeamInvitationsResponse> => {
-  return await prisma.teamMemberInvite.findMany({
-    where: {
-      email,
-    },
-    include: {
-      team: {
-        select: {
-          id: true,
-          name: true,
-          url: true,
-          avatarImageId: true,
-        },
-      },
-    },
-  });
-};
diff --git a/packages/lib/server-only/team/get-team-members.ts b/packages/lib/server-only/team/get-team-members.ts
index 025eb3dc3..eb9c98aeb 100644
--- a/packages/lib/server-only/team/get-team-members.ts
+++ b/packages/lib/server-only/team/get-team-members.ts
@@ -1,38 +1,32 @@
-import type { z } from 'zod';
-
 import { prisma } from '@documenso/prisma';
-import { TeamMemberSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamMemberSchema';
-import { UserSchema } from '@documenso/prisma/generated/zod/modelSchema/UserSchema';
+import type { TGetTeamMembersResponse } from '@documenso/trpc/server/team-router/get-team-members.types';
+
+import { AppError, AppErrorCode } from '../../errors/app-error';
+import { getHighestOrganisationRoleInGroup } from '../../utils/organisations';
+import { getHighestTeamRoleInGroup } from '../../utils/teams';
 
 export type GetTeamMembersOptions = {
   userId: number;
   teamId: number;
 };
 
-export const ZGetTeamMembersResponseSchema = TeamMemberSchema.extend({
-  user: UserSchema.pick({
-    id: true,
-    name: true,
-    email: true,
-  }),
-}).array();
-
-export type TGetTeamMembersResponseSchema = z.infer<typeof ZGetTeamMembersResponseSchema>;
-
 /**
  * Get all team members for a given team.
  */
 export const getTeamMembers = async ({
   userId,
   teamId,
-}: GetTeamMembersOptions): Promise<TGetTeamMembersResponseSchema> => {
-  return await prisma.teamMember.findMany({
+}: GetTeamMembersOptions): Promise<TGetTeamMembersResponse> => {
+  const teamMembers = await prisma.organisationMember.findMany({
     where: {
-      team: {
-        id: teamId,
-        members: {
-          some: {
-            userId: userId,
+      organisationGroupMembers: {
+        some: {
+          group: {
+            teamGroups: {
+              some: {
+                teamId,
+              },
+            },
           },
         },
       },
@@ -43,8 +37,43 @@ export const getTeamMembers = async ({
           id: true,
           email: true,
           name: true,
+          avatarImageId: true,
+        },
+      },
+      organisationGroupMembers: {
+        include: {
+          group: {
+            include: {
+              teamGroups: true,
+            },
+          },
         },
       },
     },
   });
+
+  const isAuthorized = teamMembers.some((member) => member.userId === userId);
+
+  // Checks that the user is part of the organisation/team.
+  if (!isAuthorized) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED);
+  }
+
+  return teamMembers.map((member) => {
+    const memberGroups = member.organisationGroupMembers.map((group) => group.group);
+
+    return {
+      id: member.id,
+      userId: member.userId,
+      createdAt: member.createdAt,
+      email: member.user.email,
+      name: member.user.name,
+      avatarImageId: member.user.avatarImageId,
+      // Filter teamGroups to only include the current team
+      teamRole: getHighestTeamRoleInGroup(
+        memberGroups.flatMap((group) => group.teamGroups.filter((tg) => tg.teamId === teamId)),
+      ),
+      organisationRole: getHighestOrganisationRoleInGroup(memberGroups),
+    };
+  });
 };
diff --git a/packages/lib/server-only/team/get-team-public-profile.ts b/packages/lib/server-only/team/get-team-public-profile.ts
index 57eb0f1b5..49be86200 100644
--- a/packages/lib/server-only/team/get-team-public-profile.ts
+++ b/packages/lib/server-only/team/get-team-public-profile.ts
@@ -3,6 +3,7 @@ import type { TeamProfile } from '@prisma/client';
 import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
 import { updateTeamPublicProfile } from './update-team-public-profile';
 
 export type GetTeamPublicProfileOptions = {
@@ -20,14 +21,7 @@ export const getTeamPublicProfile = async ({
   teamId,
 }: GetTeamPublicProfileOptions): Promise<GetTeamPublicProfileResponse> => {
   const team = await prisma.team.findFirst({
-    where: {
-      id: teamId,
-      members: {
-        some: {
-          userId,
-        },
-      },
-    },
+    where: buildTeamWhereQuery({ teamId, userId }),
     include: {
       profile: true,
     },
diff --git a/packages/lib/server-only/team/get-team-settings.ts b/packages/lib/server-only/team/get-team-settings.ts
new file mode 100644
index 000000000..6eb0b0817
--- /dev/null
+++ b/packages/lib/server-only/team/get-team-settings.ts
@@ -0,0 +1,37 @@
+import { prisma } from '@documenso/prisma';
+
+import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery, extractDerivedTeamSettings } from '../../utils/teams';
+
+export type GetTeamSettingsOptions = {
+  userId?: number;
+  teamId: number;
+};
+
+/**
+ * You must provide userId if you want to validate whether the user can access the team settings.
+ */
+export const getTeamSettings = async ({ userId, teamId }: GetTeamSettingsOptions) => {
+  const team = await prisma.team.findFirst({
+    where: userId !== undefined ? buildTeamWhereQuery({ teamId, userId }) : { id: teamId },
+    include: {
+      organisation: {
+        include: {
+          organisationGlobalSettings: true,
+        },
+      },
+      teamGlobalSettings: true,
+    },
+  });
+
+  if (!team) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Team not found',
+    });
+  }
+
+  const organisationSettings = team.organisation.organisationGlobalSettings;
+  const teamSettings = team.teamGlobalSettings;
+
+  return extractDerivedTeamSettings(organisationSettings, teamSettings);
+};
diff --git a/packages/lib/server-only/team/get-team.ts b/packages/lib/server-only/team/get-team.ts
index cee09a690..8af5101e4 100644
--- a/packages/lib/server-only/team/get-team.ts
+++ b/packages/lib/server-only/team/get-team.ts
@@ -1,72 +1,22 @@
-import type { Prisma } from '@prisma/client';
-import type { z } from 'zod';
-
 import { prisma } from '@documenso/prisma';
-import { TeamEmailSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamEmailSchema';
-import { TeamGlobalSettingsSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamGlobalSettingsSchema';
-import { TeamMemberSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamMemberSchema';
-import { TeamSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import {
+  buildTeamWhereQuery,
+  extractDerivedTeamSettings,
+  getHighestTeamRoleInGroup,
+} from '../../utils/teams';
 
 export type GetTeamByIdOptions = {
-  userId?: number;
+  userId: number;
   teamId: number;
 };
 
-export const ZGetTeamByIdResponseSchema = TeamSchema.extend({
-  teamEmail: TeamEmailSchema.nullable(),
-  teamGlobalSettings: TeamGlobalSettingsSchema.nullable(),
-  currentTeamMember: TeamMemberSchema.pick({
-    role: true,
-  }).nullable(),
-});
-
-export type TGetTeamByIdResponse = z.infer<typeof ZGetTeamByIdResponseSchema>;
-
-/**
- * Get a team given a teamId.
- *
- * Provide an optional userId to check that the user is a member of the team.
- */
-export const getTeamById = async ({
-  userId,
-  teamId,
-}: GetTeamByIdOptions): Promise<TGetTeamByIdResponse> => {
-  const whereFilter: Prisma.TeamWhereUniqueInput = {
-    id: teamId,
-  };
-
-  if (userId !== undefined) {
-    whereFilter['members'] = {
-      some: {
-        userId,
-      },
-    };
-  }
-
-  const result = await prisma.team.findUniqueOrThrow({
-    where: whereFilter,
-    include: {
-      teamEmail: true,
-      teamGlobalSettings: true,
-      members: {
-        where: {
-          userId,
-        },
-        select: {
-          role: true,
-        },
-      },
-    },
+export const getTeamById = async ({ userId, teamId }: GetTeamByIdOptions) => {
+  return await getTeam({
+    teamReference: teamId,
+    userId,
   });
-
-  const { members, ...team } = result;
-
-  return {
-    ...team,
-    currentTeamMember: userId !== undefined ? members[0] : null,
-  };
 };
 
 export type GetTeamByUrlOptions = {
@@ -80,57 +30,65 @@ export type TGetTeamByUrlResponse = Awaited<ReturnType<typeof getTeamByUrl>>;
  * Get a team given a team URL.
  */
 export const getTeamByUrl = async ({ userId, teamUrl }: GetTeamByUrlOptions) => {
-  const whereFilter: Prisma.TeamWhereUniqueInput = {
-    url: teamUrl,
-  };
+  return await getTeam({
+    teamReference: teamUrl,
+    userId,
+  });
+};
 
-  if (userId !== undefined) {
-    whereFilter['members'] = {
-      some: {
-        userId,
-      },
-    };
-  }
-
-  const result = await prisma.team.findFirst({
-    where: whereFilter,
+/**
+ * Get a team by its ID or URL.
+ */
+export const getTeam = async ({
+  teamReference,
+  userId,
+}: {
+  teamReference: number | string;
+  userId: number;
+}) => {
+  const team = await prisma.team.findFirst({
+    where: {
+      ...buildTeamWhereQuery({ teamId: undefined, userId }),
+      id: typeof teamReference === 'number' ? teamReference : undefined,
+      url: typeof teamReference === 'string' ? teamReference : undefined,
+    },
     include: {
       teamEmail: true,
-      emailVerification: {
-        select: {
-          expiresAt: true,
-          name: true,
-          email: true,
-        },
-      },
-      transferVerification: {
-        select: {
-          expiresAt: true,
-          name: true,
-          email: true,
-        },
-      },
-      subscription: true,
-      teamGlobalSettings: true,
-      members: {
+      teamGroups: {
         where: {
-          userId,
+          organisationGroup: {
+            organisationGroupMembers: {
+              some: {
+                organisationMember: {
+                  userId,
+                },
+              },
+            },
+          },
         },
-        select: {
-          role: true,
+      },
+      teamGlobalSettings: true,
+      organisation: {
+        include: {
+          organisationGlobalSettings: true,
         },
       },
     },
   });
 
-  if (!result) {
-    throw new AppError(AppErrorCode.NOT_FOUND);
+  if (!team) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Team not found',
+    });
   }
 
-  const { members, ...team } = result;
+  const organisationSettings = team.organisation.organisationGlobalSettings;
+  const teamSettings = team.teamGlobalSettings;
 
   return {
     ...team,
-    currentTeamMember: members[0],
+    currentTeamRole: getHighestTeamRoleInGroup(team.teamGroups),
+    teamSettings,
+    derivedSettings: extractDerivedTeamSettings(organisationSettings, teamSettings),
   };
 };
diff --git a/packages/lib/server-only/team/get-teams.ts b/packages/lib/server-only/team/get-teams.ts
index b90636515..390735431 100644
--- a/packages/lib/server-only/team/get-teams.ts
+++ b/packages/lib/server-only/team/get-teams.ts
@@ -1,53 +1,48 @@
-import type { z } from 'zod';
+import { z } from 'zod';
 
 import { prisma } from '@documenso/prisma';
-import { SubscriptionSchema } from '@documenso/prisma/generated/zod/modelSchema/SubscriptionSchema';
-import { TeamMemberSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamMemberSchema';
+import { TeamMemberRole } from '@documenso/prisma/generated/types';
 import { TeamSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
 
+import { buildTeamWhereQuery, getHighestTeamRoleInGroup } from '../../utils/teams';
+
 export type GetTeamsOptions = {
   userId: number;
+
+  /**
+   * If teamId is undefined we get all teams the user belongs to.
+   */
+  teamId?: number;
 };
 
 export const ZGetTeamsResponseSchema = TeamSchema.extend({
-  currentTeamMember: TeamMemberSchema.pick({
-    role: true,
-  }),
-  subscription: SubscriptionSchema.pick({
-    status: true,
-  }).nullable(),
+  teamRole: z.nativeEnum(TeamMemberRole),
 }).array();
 
 export type TGetTeamsResponse = z.infer<typeof ZGetTeamsResponseSchema>;
 
-export const getTeams = async ({ userId }: GetTeamsOptions): Promise<TGetTeamsResponse> => {
+export const getTeams = async ({ userId, teamId }: GetTeamsOptions) => {
   const teams = await prisma.team.findMany({
-    where: {
-      members: {
-        some: {
-          userId,
-        },
-      },
-    },
+    where: buildTeamWhereQuery({ teamId, userId }),
     include: {
-      subscription: {
-        select: {
-          status: true,
-        },
-      },
-      members: {
+      teamGroups: {
         where: {
-          userId,
-        },
-        select: {
-          role: true,
+          organisationGroup: {
+            organisationGroupMembers: {
+              some: {
+                organisationMember: {
+                  userId,
+                },
+              },
+            },
+          },
         },
       },
     },
   });
 
-  return teams.map(({ members, ...team }) => ({
+  return teams.map((team) => ({
     ...team,
-    currentTeamMember: members[0],
+    currentTeamRole: getHighestTeamRoleInGroup(team.teamGroups),
   }));
 };
diff --git a/packages/lib/server-only/team/leave-team.ts b/packages/lib/server-only/team/leave-team.ts
deleted file mode 100644
index 36305eea3..000000000
--- a/packages/lib/server-only/team/leave-team.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { updateSubscriptionItemQuantity } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
-import { prisma } from '@documenso/prisma';
-
-import { jobs } from '../../jobs/client';
-
-export type LeaveTeamOptions = {
-  /**
-   * The ID of the user who is leaving the team.
-   */
-  userId: number;
-
-  /**
-   * The ID of the team the user is leaving.
-   */
-  teamId: number;
-};
-
-export const leaveTeam = async ({ userId, teamId }: LeaveTeamOptions): Promise<void> => {
-  await prisma.$transaction(
-    async (tx) => {
-      const team = await tx.team.findFirstOrThrow({
-        where: {
-          id: teamId,
-          ownerUserId: {
-            not: userId,
-          },
-          members: {
-            some: {
-              userId,
-            },
-          },
-        },
-        include: {
-          subscription: true,
-        },
-      });
-
-      const leavingUser = await tx.user.findUniqueOrThrow({
-        where: { id: userId },
-      });
-
-      await tx.teamMember.delete({
-        where: {
-          userId_teamId: {
-            userId,
-            teamId,
-          },
-          team: {
-            ownerUserId: {
-              not: userId,
-            },
-          },
-        },
-      });
-
-      if (IS_BILLING_ENABLED() && team.subscription) {
-        const numberOfSeats = await tx.teamMember.count({
-          where: {
-            teamId,
-          },
-        });
-
-        await updateSubscriptionItemQuantity({
-          priceId: team.subscription.priceId,
-          subscriptionId: team.subscription.planId,
-          quantity: numberOfSeats,
-        });
-      }
-
-      await jobs.triggerJob({
-        name: 'send.team-member-left.email',
-        payload: {
-          teamId,
-          memberUserId: leavingUser.id,
-        },
-      });
-    },
-    { timeout: 30_000 },
-  );
-};
diff --git a/packages/lib/server-only/team/request-team-ownership-transfer.ts b/packages/lib/server-only/team/request-team-ownership-transfer.ts
deleted file mode 100644
index 942c471b5..000000000
--- a/packages/lib/server-only/team/request-team-ownership-transfer.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import { createElement } from 'react';
-
-import { msg } from '@lingui/core/macro';
-
-import { mailer } from '@documenso/email/mailer';
-import { TeamTransferRequestTemplate } from '@documenso/email/templates/team-transfer-request';
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email';
-import { createTokenVerification } from '@documenso/lib/utils/token-verification';
-import { prisma } from '@documenso/prisma';
-
-import { getI18nInstance } from '../../client-only/providers/i18n-server';
-import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
-
-export type RequestTeamOwnershipTransferOptions = {
-  /**
-   * The ID of the user initiating the transfer.
-   */
-  userId: number;
-
-  /**
-   * The name of the user initiating the transfer.
-   */
-  userName: string;
-
-  /**
-   * The ID of the team whose ownership is being transferred.
-   */
-  teamId: number;
-
-  /**
-   * The user ID of the new owner.
-   */
-  newOwnerUserId: number;
-
-  /**
-   * Whether to clear any current payment methods attached to the team.
-   */
-  clearPaymentMethods: boolean;
-};
-
-export const requestTeamOwnershipTransfer = async ({
-  userId,
-  userName,
-  teamId,
-  newOwnerUserId,
-}: RequestTeamOwnershipTransferOptions): Promise<void> => {
-  // Todo: Clear payment methods disabled for now.
-  const clearPaymentMethods = false;
-
-  await prisma.$transaction(
-    async (tx) => {
-      const team = await tx.team.findFirstOrThrow({
-        where: {
-          id: teamId,
-          ownerUserId: userId,
-          members: {
-            some: {
-              userId: newOwnerUserId,
-            },
-          },
-        },
-      });
-
-      const newOwnerUser = await tx.user.findFirstOrThrow({
-        where: {
-          id: newOwnerUserId,
-        },
-      });
-
-      const { token, expiresAt } = createTokenVerification({ minute: 10 });
-
-      const teamVerificationPayload = {
-        teamId,
-        token,
-        expiresAt,
-        userId: newOwnerUserId,
-        name: newOwnerUser.name ?? '',
-        email: newOwnerUser.email,
-        clearPaymentMethods,
-      };
-
-      await tx.teamTransferVerification.upsert({
-        where: {
-          teamId,
-        },
-        create: teamVerificationPayload,
-        update: teamVerificationPayload,
-      });
-
-      const template = createElement(TeamTransferRequestTemplate, {
-        assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
-        baseUrl: NEXT_PUBLIC_WEBAPP_URL(),
-        senderName: userName,
-        teamName: team.name,
-        teamUrl: team.url,
-        token,
-      });
-
-      const [html, text] = await Promise.all([
-        renderEmailWithI18N(template),
-        renderEmailWithI18N(template, { plainText: true }),
-      ]);
-
-      const i18n = await getI18nInstance();
-
-      await mailer.sendMail({
-        to: newOwnerUser.email,
-        from: {
-          name: FROM_NAME,
-          address: FROM_ADDRESS,
-        },
-        subject: i18n._(
-          msg`You have been requested to take ownership of team ${team.name} on Documenso`,
-        ),
-        html,
-        text,
-      });
-    },
-    { timeout: 30_000 },
-  );
-};
diff --git a/packages/lib/server-only/team/resend-team-email-verification.ts b/packages/lib/server-only/team/resend-team-email-verification.ts
index b7b5d8cff..79a9b2581 100644
--- a/packages/lib/server-only/team/resend-team-email-verification.ts
+++ b/packages/lib/server-only/team/resend-team-email-verification.ts
@@ -3,6 +3,7 @@ import { AppError } from '@documenso/lib/errors/app-error';
 import { createTokenVerification } from '@documenso/lib/utils/token-verification';
 import { prisma } from '@documenso/prisma';
 
+import { buildTeamWhereQuery } from '../../utils/teams';
 import { sendTeamEmailVerificationEmail } from './create-team-email-verification';
 
 export type ResendTeamMemberInvitationOptions = {
@@ -17,32 +18,25 @@ export const resendTeamEmailVerification = async ({
   userId,
   teamId,
 }: ResendTeamMemberInvitationOptions): Promise<void> => {
+  const team = await prisma.team.findFirst({
+    where: buildTeamWhereQuery({
+      teamId,
+      userId,
+      roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+    }),
+    include: {
+      emailVerification: true,
+    },
+  });
+
+  if (!team) {
+    throw new AppError('TeamNotFound', {
+      message: 'User is not a member of the team.',
+    });
+  }
+
   await prisma.$transaction(
     async (tx) => {
-      const team = await tx.team.findUniqueOrThrow({
-        where: {
-          id: teamId,
-          members: {
-            some: {
-              userId,
-              role: {
-                in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
-              },
-            },
-          },
-        },
-        include: {
-          emailVerification: true,
-          teamGlobalSettings: true,
-        },
-      });
-
-      if (!team) {
-        throw new AppError('TeamNotFound', {
-          message: 'User is not a member of the team.',
-        });
-      }
-
       const { emailVerification } = team;
 
       if (!emailVerification) {
diff --git a/packages/lib/server-only/team/resend-team-member-invitation.ts b/packages/lib/server-only/team/resend-team-member-invitation.ts
deleted file mode 100644
index e4aa47e97..000000000
--- a/packages/lib/server-only/team/resend-team-member-invitation.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams';
-import { AppError } from '@documenso/lib/errors/app-error';
-import { prisma } from '@documenso/prisma';
-
-import { sendTeamMemberInviteEmail } from './create-team-member-invites';
-
-export type ResendTeamMemberInvitationOptions = {
-  /**
-   * The ID of the user who is initiating this action.
-   */
-  userId: number;
-
-  /**
-   * The name of the user who is initiating this action.
-   */
-  userName: string;
-
-  /**
-   * The ID of the team.
-   */
-  teamId: number;
-
-  /**
-   * The IDs of the invitations to resend.
-   */
-  invitationId: number;
-};
-
-/**
- * Resend an email for a given team member invite.
- */
-export const resendTeamMemberInvitation = async ({
-  userId,
-  userName,
-  teamId,
-  invitationId,
-}: ResendTeamMemberInvitationOptions): Promise<void> => {
-  await prisma.$transaction(
-    async (tx) => {
-      const team = await tx.team.findUniqueOrThrow({
-        where: {
-          id: teamId,
-          members: {
-            some: {
-              userId,
-              role: {
-                in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
-              },
-            },
-          },
-        },
-        include: {
-          teamGlobalSettings: true,
-        },
-      });
-
-      if (!team) {
-        throw new AppError('TeamNotFound', { message: 'User is not a valid member of the team.' });
-      }
-
-      const teamMemberInvite = await tx.teamMemberInvite.findUniqueOrThrow({
-        where: {
-          id: invitationId,
-          teamId,
-        },
-      });
-
-      if (!teamMemberInvite) {
-        throw new AppError('InviteNotFound', { message: 'No invite exists for this user.' });
-      }
-
-      await sendTeamMemberInviteEmail({
-        email: teamMemberInvite.email,
-        token: teamMemberInvite.token,
-        senderName: userName,
-        team,
-      });
-    },
-    { timeout: 30_000 },
-  );
-};
diff --git a/packages/lib/server-only/team/transfer-team-ownership.ts b/packages/lib/server-only/team/transfer-team-ownership.ts
deleted file mode 100644
index 9ea5d7bca..000000000
--- a/packages/lib/server-only/team/transfer-team-ownership.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import { TeamMemberRole } from '@prisma/client';
-import type Stripe from 'stripe';
-
-import { transferTeamSubscription } from '@documenso/ee/server-only/stripe/transfer-team-subscription';
-import { mapStripeSubscriptionToPrismaUpsertAction } from '@documenso/ee/server-only/stripe/webhook/on-subscription-updated';
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
-import { prisma } from '@documenso/prisma';
-
-export type TransferTeamOwnershipOptions = {
-  token: string;
-};
-
-export const transferTeamOwnership = async ({ token }: TransferTeamOwnershipOptions) => {
-  await prisma.$transaction(
-    async (tx) => {
-      const teamTransferVerification = await tx.teamTransferVerification.findFirstOrThrow({
-        where: {
-          token,
-        },
-        include: {
-          team: {
-            include: {
-              subscription: true,
-            },
-          },
-        },
-      });
-
-      const { team, userId: newOwnerUserId } = teamTransferVerification;
-
-      await Promise.all([
-        tx.teamTransferVerification.updateMany({
-          where: {
-            teamId: team.id,
-          },
-          data: {
-            completed: true,
-          },
-        }),
-        tx.teamTransferVerification.deleteMany({
-          where: {
-            teamId: team.id,
-            expiresAt: {
-              lt: new Date(),
-            },
-          },
-        }),
-      ]);
-
-      const newOwnerUser = await tx.user.findFirstOrThrow({
-        where: {
-          id: newOwnerUserId,
-          teamMembers: {
-            some: {
-              teamId: team.id,
-            },
-          },
-        },
-        include: {
-          subscriptions: true,
-        },
-      });
-
-      let teamSubscription: Stripe.Subscription | null = null;
-
-      if (IS_BILLING_ENABLED()) {
-        teamSubscription = await transferTeamSubscription({
-          user: newOwnerUser,
-          team,
-          clearPaymentMethods: teamTransferVerification.clearPaymentMethods,
-        });
-      }
-
-      if (teamSubscription) {
-        await tx.subscription.upsert(
-          mapStripeSubscriptionToPrismaUpsertAction(teamSubscription, undefined, team.id),
-        );
-      }
-
-      await tx.team.update({
-        where: {
-          id: team.id,
-        },
-        data: {
-          ownerUserId: newOwnerUserId,
-          members: {
-            update: {
-              where: {
-                userId_teamId: {
-                  teamId: team.id,
-                  userId: newOwnerUserId,
-                },
-              },
-              data: {
-                role: TeamMemberRole.ADMIN,
-              },
-            },
-          },
-        },
-      });
-    },
-    { timeout: 30_000 },
-  );
-};
diff --git a/packages/lib/server-only/team/update-team-branding-settings.ts b/packages/lib/server-only/team/update-team-branding-settings.ts
deleted file mode 100644
index 6ba3afc3f..000000000
--- a/packages/lib/server-only/team/update-team-branding-settings.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { TeamMemberRole } from '@prisma/client';
-import type { z } from 'zod';
-
-import { prisma } from '@documenso/prisma';
-import { TeamGlobalSettingsSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamGlobalSettingsSchema';
-
-export type UpdateTeamBrandingSettingsOptions = {
-  userId: number;
-  teamId: number;
-
-  settings: {
-    brandingEnabled: boolean;
-    brandingLogo: string;
-    brandingUrl: string;
-    brandingCompanyDetails: string;
-  };
-};
-
-export const ZUpdateTeamBrandingSettingsResponseSchema = TeamGlobalSettingsSchema;
-
-export type TUpdateTeamBrandingSettingsResponse = z.infer<
-  typeof ZUpdateTeamBrandingSettingsResponseSchema
->;
-
-export const updateTeamBrandingSettings = async ({
-  userId,
-  teamId,
-  settings,
-}: UpdateTeamBrandingSettingsOptions): Promise<TUpdateTeamBrandingSettingsResponse> => {
-  const { brandingEnabled, brandingLogo, brandingUrl, brandingCompanyDetails } = settings;
-
-  const member = await prisma.teamMember.findFirst({
-    where: {
-      userId,
-      teamId,
-    },
-  });
-
-  if (!member || member.role !== TeamMemberRole.ADMIN) {
-    throw new Error('You do not have permission to update this team.');
-  }
-
-  return await prisma.teamGlobalSettings.upsert({
-    where: {
-      teamId,
-    },
-    create: {
-      teamId,
-      brandingEnabled,
-      brandingLogo,
-      brandingUrl,
-      brandingCompanyDetails,
-    },
-    update: {
-      brandingEnabled,
-      brandingLogo,
-      brandingUrl,
-      brandingCompanyDetails,
-    },
-  });
-};
diff --git a/packages/lib/server-only/team/update-team-email.ts b/packages/lib/server-only/team/update-team-email.ts
index 1cc36d7e8..047cfc5e7 100644
--- a/packages/lib/server-only/team/update-team-email.ts
+++ b/packages/lib/server-only/team/update-team-email.ts
@@ -1,6 +1,8 @@
 import { prisma } from '@documenso/prisma';
 
 import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams';
+import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export type UpdateTeamEmailOptions = {
   userId: number;
@@ -15,32 +17,34 @@ export const updateTeamEmail = async ({
   teamId,
   data,
 }: UpdateTeamEmailOptions): Promise<void> => {
-  await prisma.$transaction(async (tx) => {
-    await tx.team.findFirstOrThrow({
-      where: {
-        id: teamId,
-        members: {
-          some: {
-            userId,
-            role: {
-              in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
-            },
-          },
-        },
-        teamEmail: {
-          isNot: null,
-        },
-      },
-    });
+  const team = await prisma.team.findFirst({
+    where: buildTeamWhereQuery({
+      teamId,
+      userId,
+      roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+    }),
+    include: {
+      teamEmail: true,
+    },
+  });
 
-    await tx.teamEmail.update({
-      where: {
-        teamId,
-      },
-      data: {
-        // Note: Never allow the email to be updated without re-verifying via email.
-        name: data.name,
-      },
+  if (!team) {
+    throw new AppError(AppErrorCode.NOT_FOUND);
+  }
+
+  if (!team.teamEmail) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Team email does not exist',
     });
+  }
+
+  await prisma.teamEmail.update({
+    where: {
+      teamId,
+    },
+    data: {
+      // Note: Never allow the email to be updated without re-verifying via email.
+      name: data.name,
+    },
   });
 };
diff --git a/packages/lib/server-only/team/update-team-member.ts b/packages/lib/server-only/team/update-team-member.ts
deleted file mode 100644
index 4f2b00e92..000000000
--- a/packages/lib/server-only/team/update-team-member.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import type { TeamMemberRole } from '@prisma/client';
-
-import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
-import { prisma } from '@documenso/prisma';
-
-export type UpdateTeamMemberOptions = {
-  userId: number;
-  teamId: number;
-  teamMemberId: number;
-  data: {
-    role: TeamMemberRole;
-  };
-};
-
-export const updateTeamMember = async ({
-  userId,
-  teamId,
-  teamMemberId,
-  data,
-}: UpdateTeamMemberOptions): Promise<void> => {
-  await prisma.$transaction(async (tx) => {
-    // Find the team and validate that the user is allowed to update members.
-    const team = await tx.team.findFirstOrThrow({
-      where: {
-        id: teamId,
-        members: {
-          some: {
-            userId,
-            role: {
-              in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
-            },
-          },
-        },
-      },
-      include: {
-        members: {
-          select: {
-            id: true,
-            userId: true,
-            role: true,
-          },
-        },
-      },
-    });
-
-    const currentTeamMember = team.members.find((member) => member.userId === userId);
-    const teamMemberToUpdate = team.members.find((member) => member.id === teamMemberId);
-
-    if (!teamMemberToUpdate || !currentTeamMember) {
-      throw new AppError(AppErrorCode.NOT_FOUND, { message: 'Team member does not exist' });
-    }
-
-    if (teamMemberToUpdate.userId === team.ownerUserId) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, { message: 'Cannot update the owner' });
-    }
-
-    const isMemberToUpdateHigherRole = !isTeamRoleWithinUserHierarchy(
-      currentTeamMember.role,
-      teamMemberToUpdate.role,
-    );
-
-    if (isMemberToUpdateHigherRole) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'Cannot update a member with a higher role',
-      });
-    }
-
-    const isNewMemberRoleHigherThanCurrentRole = !isTeamRoleWithinUserHierarchy(
-      currentTeamMember.role,
-      data.role,
-    );
-
-    if (isNewMemberRoleHigherThanCurrentRole) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'Cannot give a member a role higher than the user initating the update',
-      });
-    }
-
-    return await tx.teamMember.update({
-      where: {
-        id: teamMemberId,
-        teamId,
-        userId: {
-          not: team.ownerUserId,
-        },
-      },
-      data: {
-        role: data.role,
-      },
-    });
-  });
-};
diff --git a/packages/lib/server-only/team/update-team-public-profile.ts b/packages/lib/server-only/team/update-team-public-profile.ts
index cb3477a6b..4c23f4311 100644
--- a/packages/lib/server-only/team/update-team-public-profile.ts
+++ b/packages/lib/server-only/team/update-team-public-profile.ts
@@ -1,5 +1,7 @@
 import { prisma } from '@documenso/prisma';
 
+import { buildTeamWhereQuery } from '../../utils/teams';
+
 export type UpdatePublicProfileOptions = {
   userId: number;
   teamId: number;
@@ -15,14 +17,7 @@ export const updateTeamPublicProfile = async ({
   data,
 }: UpdatePublicProfileOptions) => {
   return await prisma.team.update({
-    where: {
-      id: teamId,
-      members: {
-        some: {
-          userId,
-        },
-      },
-    },
+    where: buildTeamWhereQuery({ teamId, userId }),
     data: {
       profile: {
         upsert: {
diff --git a/packages/lib/server-only/team/update-team.ts b/packages/lib/server-only/team/update-team.ts
index e03cd96a5..cb2c1385a 100644
--- a/packages/lib/server-only/team/update-team.ts
+++ b/packages/lib/server-only/team/update-team.ts
@@ -5,6 +5,8 @@ import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { prisma } from '@documenso/prisma';
 
+import { buildTeamWhereQuery } from '../../utils/teams';
+
 export type UpdateTeamOptions = {
   userId: number;
   teamId: number;
@@ -16,38 +18,37 @@ export type UpdateTeamOptions = {
 
 export const updateTeam = async ({ userId, teamId, data }: UpdateTeamOptions): Promise<void> => {
   try {
-    await prisma.$transaction(async (tx) => {
-      const foundPendingTeamWithUrl = await tx.teamPending.findFirst({
-        where: {
-          url: data.url,
+    const foundTeamWithUrl = await prisma.team.findFirst({
+      where: {
+        url: data.url,
+        id: {
+          not: teamId,
         },
+      },
+    });
+
+    const foundOrganisationWithUrl = await prisma.organisation.findFirst({
+      where: {
+        url: data.url,
+      },
+    });
+
+    if (foundTeamWithUrl || foundOrganisationWithUrl) {
+      throw new AppError(AppErrorCode.ALREADY_EXISTS, {
+        message: 'Team URL already exists.',
       });
+    }
 
-      if (foundPendingTeamWithUrl) {
-        throw new AppError(AppErrorCode.ALREADY_EXISTS, {
-          message: 'Team URL already exists.',
-        });
-      }
-
-      const team = await tx.team.update({
-        where: {
-          id: teamId,
-          members: {
-            some: {
-              userId,
-              role: {
-                in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
-              },
-            },
-          },
-        },
-        data: {
-          url: data.url,
-          name: data.name,
-        },
-      });
-
-      return team;
+    await prisma.team.update({
+      where: buildTeamWhereQuery({
+        teamId,
+        userId,
+        roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+      }),
+      data: {
+        url: data.url,
+        name: data.name,
+      },
     });
   } catch (err) {
     console.error(err);
diff --git a/packages/lib/server-only/template/create-document-from-direct-template.ts b/packages/lib/server-only/template/create-document-from-direct-template.ts
index 4441b9460..9292a8116 100644
--- a/packages/lib/server-only/template/create-document-from-direct-template.ts
+++ b/packages/lib/server-only/template/create-document-from-direct-template.ts
@@ -47,10 +47,10 @@ import {
 } from '../../utils/document-auth';
 import { env } from '../../utils/env';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
-import { teamGlobalSettingsToBranding } from '../../utils/team-global-settings-to-branding';
 import { formatDocumentsPath } from '../../utils/teams';
 import { sendDocument } from '../document/send-document';
 import { validateFieldAuth } from '../document/validate-field-auth';
+import { getEmailContext } from '../email/get-email-context';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
 
 export type CreateDocumentFromDirectTemplateOptions = {
@@ -109,11 +109,6 @@ export const createDocumentFromDirectTemplate = async ({
       templateDocumentData: true,
       templateMeta: true,
       user: true,
-      team: {
-        include: {
-          teamGlobalSettings: true,
-        },
-      },
     },
   });
 
@@ -121,6 +116,13 @@ export const createDocumentFromDirectTemplate = async ({
     throw new AppError(AppErrorCode.INVALID_REQUEST, { message: 'Invalid or missing template' });
   }
 
+  const { branding, settings } = await getEmailContext({
+    source: {
+      type: 'team',
+      teamId: template.teamId,
+    },
+  });
+
   const { recipients, directLink, user: templateOwner } = template;
 
   const directTemplateRecipient = recipients.find(
@@ -172,8 +174,7 @@ export const createDocumentFromDirectTemplate = async ({
   const metaDateFormat = template.templateMeta?.dateFormat || DEFAULT_DOCUMENT_DATE_FORMAT;
   const metaEmailMessage = template.templateMeta?.message || '';
   const metaEmailSubject = template.templateMeta?.subject || '';
-  const metaLanguage =
-    template.templateMeta?.language ?? template.team?.teamGlobalSettings?.documentLanguage;
+  const metaLanguage = template.templateMeta?.language ?? settings.documentLanguage;
   const metaSigningOrder = template.templateMeta?.signingOrder || DocumentSigningOrder.PARALLEL;
 
   // Associate, validate and map to a query every direct template recipient field with the provided fields.
@@ -285,7 +286,7 @@ export const createDocumentFromDirectTemplate = async ({
         createdAt: initialRequestTime,
         status: DocumentStatus.PENDING,
         externalId: directTemplateExternalId,
-        visibility: template.team?.teamGlobalSettings?.documentVisibility,
+        visibility: settings.documentVisibility,
         documentDataId: documentData.id,
         authOptions: createDocumentAuthOptions({
           globalAccessAuth: templateAuthOptions.globalAccessAuth,
@@ -587,10 +588,6 @@ export const createDocumentFromDirectTemplate = async ({
       assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000',
     });
 
-    const branding = template.team?.teamGlobalSettings
-      ? teamGlobalSettingsToBranding(template.team.teamGlobalSettings)
-      : undefined;
-
     const [html, text] = await Promise.all([
       renderEmailWithI18N(emailTemplate, { lang: metaLanguage, branding }),
       renderEmailWithI18N(emailTemplate, { lang: metaLanguage, branding, plainText: true }),
@@ -626,7 +623,7 @@ export const createDocumentFromDirectTemplate = async ({
     await sendDocument({
       documentId,
       userId: template.userId,
-      teamId: template.teamId || undefined,
+      teamId: template.teamId,
       requestMetadata,
     });
 
diff --git a/packages/lib/server-only/template/create-document-from-template-legacy.ts b/packages/lib/server-only/template/create-document-from-template-legacy.ts
index 06aaa3c64..5dd98b032 100644
--- a/packages/lib/server-only/template/create-document-from-template-legacy.ts
+++ b/packages/lib/server-only/template/create-document-from-template-legacy.ts
@@ -3,10 +3,13 @@ import { DocumentSource, type RecipientRole } from '@prisma/client';
 import { nanoid, prefixedId } from '@documenso/lib/universal/id';
 import { prisma } from '@documenso/prisma';
 
+import { buildTeamWhereQuery } from '../../utils/teams';
+import { getTeamSettings } from '../team/get-team-settings';
+
 export type CreateDocumentFromTemplateLegacyOptions = {
   templateId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
   recipients?: {
     name?: string;
     email: string;
@@ -27,32 +30,13 @@ export const createDocumentFromTemplateLegacy = async ({
   const template = await prisma.template.findUnique({
     where: {
       id: templateId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
     include: {
       recipients: true,
       fields: true,
       templateDocumentData: true,
       templateMeta: true,
-      team: {
-        include: {
-          teamGlobalSettings: true,
-        },
-      },
     },
   });
 
@@ -60,6 +44,11 @@ export const createDocumentFromTemplateLegacy = async ({
     throw new Error('Template not found.');
   }
 
+  const settings = await getTeamSettings({
+    userId,
+    teamId,
+  });
+
   const documentData = await prisma.documentData.create({
     data: {
       type: template.templateDocumentData.type,
@@ -76,7 +65,7 @@ export const createDocumentFromTemplateLegacy = async ({
       userId,
       teamId: template.teamId,
       title: template.title,
-      visibility: template.team?.teamGlobalSettings?.documentVisibility,
+      visibility: settings.documentVisibility,
       documentDataId: documentData.id,
       useLegacyFieldInsertion: template.useLegacyFieldInsertion ?? false,
       recipients: {
@@ -96,8 +85,7 @@ export const createDocumentFromTemplateLegacy = async ({
           dateFormat: template.templateMeta?.dateFormat,
           redirectUrl: template.templateMeta?.redirectUrl,
           signingOrder: template.templateMeta?.signingOrder ?? undefined,
-          language:
-            template.templateMeta?.language || template.team?.teamGlobalSettings?.documentLanguage,
+          language: template.templateMeta?.language || settings.documentLanguage,
           typedSignatureEnabled: template.templateMeta?.typedSignatureEnabled,
           uploadSignatureEnabled: template.templateMeta?.uploadSignatureEnabled,
           drawSignatureEnabled: template.templateMeta?.drawSignatureEnabled,
diff --git a/packages/lib/server-only/template/create-document-from-template.ts b/packages/lib/server-only/template/create-document-from-template.ts
index 344dbe032..3150670a3 100644
--- a/packages/lib/server-only/template/create-document-from-template.ts
+++ b/packages/lib/server-only/template/create-document-from-template.ts
@@ -46,6 +46,8 @@ import {
   createRecipientAuthOptions,
   extractDocumentAuthMethods,
 } from '../../utils/document-auth';
+import { buildTeamWhereQuery } from '../../utils/teams';
+import { getTeamSettings } from '../team/get-team-settings';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
 
 type FinalRecipient = Pick<
@@ -60,7 +62,7 @@ export type CreateDocumentFromTemplateOptions = {
   templateId: number;
   externalId?: string | null;
   userId: number;
-  teamId?: number;
+  teamId: number;
   recipients: {
     id: number;
     name?: string;
@@ -276,21 +278,7 @@ export const createDocumentFromTemplate = async ({
   const template = await prisma.template.findUnique({
     where: {
       id: templateId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
     include: {
       recipients: {
@@ -300,11 +288,6 @@ export const createDocumentFromTemplate = async ({
       },
       templateDocumentData: true,
       templateMeta: true,
-      team: {
-        include: {
-          teamGlobalSettings: true,
-        },
-      },
     },
   });
 
@@ -314,6 +297,11 @@ export const createDocumentFromTemplate = async ({
     });
   }
 
+  const settings = await getTeamSettings({
+    userId,
+    teamId,
+  });
+
   // Check that all the passed in recipient IDs can be associated with a template recipient.
   recipients.forEach((recipient) => {
     const foundRecipient = template.recipients.find(
@@ -386,7 +374,7 @@ export const createDocumentFromTemplate = async ({
           globalAccessAuth: templateAuthOptions.globalAccessAuth,
           globalActionAuth: templateAuthOptions.globalActionAuth,
         }),
-        visibility: template.visibility || template.team?.teamGlobalSettings?.documentVisibility,
+        visibility: template.visibility || settings.documentVisibility,
         useLegacyFieldInsertion: template.useLegacyFieldInsertion ?? false,
         documentMeta: {
           create: {
@@ -406,9 +394,7 @@ export const createDocumentFromTemplate = async ({
               template.templateMeta?.signingOrder ||
               DocumentSigningOrder.PARALLEL,
             language:
-              override?.language ||
-              template.templateMeta?.language ||
-              template.team?.teamGlobalSettings?.documentLanguage,
+              override?.language || template.templateMeta?.language || settings.documentLanguage,
             typedSignatureEnabled:
               override?.typedSignatureEnabled ?? template.templateMeta?.typedSignatureEnabled,
             uploadSignatureEnabled:
diff --git a/packages/lib/server-only/template/create-template-direct-link.ts b/packages/lib/server-only/template/create-template-direct-link.ts
index c2de4c36f..db4a2dc46 100644
--- a/packages/lib/server-only/template/create-template-direct-link.ts
+++ b/packages/lib/server-only/template/create-template-direct-link.ts
@@ -8,11 +8,12 @@ import {
 import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export type CreateTemplateDirectLinkOptions = {
   templateId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
   directRecipientId?: number;
 };
 
@@ -25,21 +26,7 @@ export const createTemplateDirectLink = async ({
   const template = await prisma.template.findFirst({
     where: {
       id: templateId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
     include: {
       recipients: true,
diff --git a/packages/lib/server-only/template/create-template.ts b/packages/lib/server-only/template/create-template.ts
index 254146b6c..4d26ce5c9 100644
--- a/packages/lib/server-only/template/create-template.ts
+++ b/packages/lib/server-only/template/create-template.ts
@@ -5,10 +5,12 @@ import { TemplateSchema } from '@documenso/prisma/generated/zod/modelSchema//Tem
 import type { TCreateTemplateMutationSchema } from '@documenso/trpc/server/template-router/schema';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
+import { getTeamSettings } from '../team/get-team-settings';
 
 export type CreateTemplateOptions = TCreateTemplateMutationSchema & {
   userId: number;
-  teamId?: number;
+  teamId: number;
 };
 
 export const ZCreateTemplateResponseSchema = TemplateSchema;
@@ -22,47 +24,19 @@ export const createTemplate = async ({
   templateDocumentDataId,
   folderId,
 }: CreateTemplateOptions) => {
-  let team = null;
+  const team = await prisma.team.findFirst({
+    where: buildTeamWhereQuery({ teamId, userId }),
+  });
 
-  if (teamId) {
-    team = await prisma.team.findFirst({
-      where: {
-        id: teamId,
-        members: {
-          some: {
-            userId,
-          },
-        },
-      },
-      include: {
-        teamGlobalSettings: true,
-      },
-    });
-
-    if (!team) {
-      throw new AppError(AppErrorCode.NOT_FOUND);
-    }
+  if (!team) {
+    throw new AppError(AppErrorCode.NOT_FOUND);
   }
 
   if (folderId) {
     const folder = await prisma.folder.findFirst({
       where: {
         id: folderId,
-        ...(teamId
-          ? {
-              team: {
-                id: teamId,
-                members: {
-                  some: {
-                    userId,
-                  },
-                },
-              },
-            }
-          : {
-              userId,
-              teamId: null,
-            }),
+        teamId: team.id,
       },
     });
 
@@ -73,9 +47,10 @@ export const createTemplate = async ({
     }
   }
 
-  if (teamId && !team) {
-    throw new AppError(AppErrorCode.NOT_FOUND);
-  }
+  const settings = await getTeamSettings({
+    userId,
+    teamId,
+  });
 
   return await prisma.template.create({
     data: {
@@ -86,10 +61,10 @@ export const createTemplate = async ({
       folderId: folderId,
       templateMeta: {
         create: {
-          language: team?.teamGlobalSettings?.documentLanguage,
-          typedSignatureEnabled: team?.teamGlobalSettings?.typedSignatureEnabled ?? true,
-          uploadSignatureEnabled: team?.teamGlobalSettings?.uploadSignatureEnabled ?? true,
-          drawSignatureEnabled: team?.teamGlobalSettings?.drawSignatureEnabled ?? true,
+          language: settings.documentLanguage,
+          typedSignatureEnabled: settings.typedSignatureEnabled,
+          uploadSignatureEnabled: settings.uploadSignatureEnabled,
+          drawSignatureEnabled: settings.drawSignatureEnabled,
         },
       },
     },
diff --git a/packages/lib/server-only/template/delete-template-direct-link.ts b/packages/lib/server-only/template/delete-template-direct-link.ts
index 2ab99194e..e7971d19e 100644
--- a/packages/lib/server-only/template/delete-template-direct-link.ts
+++ b/packages/lib/server-only/template/delete-template-direct-link.ts
@@ -2,11 +2,12 @@ import { generateAvaliableRecipientPlaceholder } from '@documenso/lib/utils/temp
 import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export type DeleteTemplateDirectLinkOptions = {
   templateId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
 };
 
 export const deleteTemplateDirectLink = async ({
@@ -17,21 +18,7 @@ export const deleteTemplateDirectLink = async ({
   const template = await prisma.template.findFirst({
     where: {
       id: templateId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
     include: {
       directLink: true,
diff --git a/packages/lib/server-only/template/delete-template.ts b/packages/lib/server-only/template/delete-template.ts
index cf97d9f11..9d8920031 100644
--- a/packages/lib/server-only/template/delete-template.ts
+++ b/packages/lib/server-only/template/delete-template.ts
@@ -1,30 +1,18 @@
 import { prisma } from '@documenso/prisma';
 
+import { buildTeamWhereQuery } from '../../utils/teams';
+
 export type DeleteTemplateOptions = {
   id: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
 };
 
 export const deleteTemplate = async ({ id, userId, teamId }: DeleteTemplateOptions) => {
   return await prisma.template.delete({
     where: {
       id,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
   });
 };
diff --git a/packages/lib/server-only/template/duplicate-template.ts b/packages/lib/server-only/template/duplicate-template.ts
index bccc53253..f0be0d4e8 100644
--- a/packages/lib/server-only/template/duplicate-template.ts
+++ b/packages/lib/server-only/template/duplicate-template.ts
@@ -5,9 +5,11 @@ import { nanoid } from '@documenso/lib/universal/id';
 import { prisma } from '@documenso/prisma';
 import type { TDuplicateTemplateMutationSchema } from '@documenso/trpc/server/template-router/schema';
 
+import { buildTeamWhereQuery } from '../../utils/teams';
+
 export type DuplicateTemplateOptions = TDuplicateTemplateMutationSchema & {
   userId: number;
-  teamId?: number;
+  teamId: number;
 };
 
 export const duplicateTemplate = async ({
@@ -18,21 +20,7 @@ export const duplicateTemplate = async ({
   const template = await prisma.template.findUnique({
     where: {
       id: templateId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
     include: {
       recipients: true,
diff --git a/packages/lib/server-only/template/find-templates.ts b/packages/lib/server-only/template/find-templates.ts
index 206178eb4..a56bc22c4 100644
--- a/packages/lib/server-only/template/find-templates.ts
+++ b/packages/lib/server-only/template/find-templates.ts
@@ -3,12 +3,12 @@ import { match } from 'ts-pattern';
 
 import { prisma } from '@documenso/prisma';
 
-import { AppError, AppErrorCode } from '../../errors/app-error';
 import { type FindResultResponse } from '../../types/search-params';
+import { getMemberRoles } from '../team/get-member-roles';
 
 export type FindTemplatesOptions = {
   userId: number;
-  teamId?: number;
+  teamId: number;
   type?: Template['type'];
   page?: number;
   perPage?: number;
@@ -26,28 +26,23 @@ export const findTemplates = async ({
   const whereFilter: Prisma.TemplateWhereInput[] = [];
 
   if (teamId === undefined) {
-    whereFilter.push({ userId, teamId: null });
+    whereFilter.push({ userId });
   }
 
   if (teamId !== undefined) {
-    const teamMember = await prisma.teamMember.findFirst({
-      where: {
-        userId,
-        teamId,
+    const { teamRole } = await getMemberRoles({
+      teamId,
+      reference: {
+        type: 'User',
+        id: userId,
       },
     });
 
-    if (!teamMember) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You are not a member of this team.',
-      });
-    }
-
     whereFilter.push(
       { teamId },
       {
         OR: [
-          match(teamMember.role)
+          match(teamRole)
             .with(TeamMemberRole.ADMIN, () => ({
               visibility: {
                 in: [
diff --git a/packages/lib/server-only/template/get-template-by-id.ts b/packages/lib/server-only/template/get-template-by-id.ts
index 3652d1643..9a53056c4 100644
--- a/packages/lib/server-only/template/get-template-by-id.ts
+++ b/packages/lib/server-only/template/get-template-by-id.ts
@@ -1,11 +1,12 @@
 import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export type GetTemplateByIdOptions = {
   id: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
   folderId?: string | null;
 };
 
@@ -18,21 +19,7 @@ export const getTemplateById = async ({
   const template = await prisma.template.findFirst({
     where: {
       id,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
       ...(folderId ? { folderId } : {}),
     },
     include: {
diff --git a/packages/lib/server-only/template/move-template-to-team.ts b/packages/lib/server-only/template/move-template-to-team.ts
deleted file mode 100644
index e43382389..000000000
--- a/packages/lib/server-only/template/move-template-to-team.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { prisma } from '@documenso/prisma';
-
-import { AppError, AppErrorCode } from '../../errors/app-error';
-
-export type MoveTemplateToTeamOptions = {
-  templateId: number;
-  teamId: number;
-  userId: number;
-};
-
-export const moveTemplateToTeam = async ({
-  templateId,
-  teamId,
-  userId,
-}: MoveTemplateToTeamOptions) => {
-  return await prisma.$transaction(async (tx) => {
-    const template = await tx.template.findFirst({
-      where: {
-        id: templateId,
-        userId,
-        teamId: null,
-      },
-    });
-
-    if (!template) {
-      throw new AppError(AppErrorCode.NOT_FOUND, {
-        message: 'Template not found or already associated with a team.',
-      });
-    }
-
-    const team = await tx.team.findFirst({
-      where: {
-        id: teamId,
-        members: {
-          some: {
-            userId,
-          },
-        },
-      },
-    });
-
-    if (!team) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'Team does not exist or you are not a member of this team.',
-      });
-    }
-
-    const updatedTemplate = await tx.template.update({
-      where: { id: templateId },
-      data: { teamId },
-    });
-
-    return updatedTemplate;
-  });
-};
diff --git a/packages/lib/server-only/template/toggle-template-direct-link.ts b/packages/lib/server-only/template/toggle-template-direct-link.ts
index 097d5fe79..6641f5f5e 100644
--- a/packages/lib/server-only/template/toggle-template-direct-link.ts
+++ b/packages/lib/server-only/template/toggle-template-direct-link.ts
@@ -1,11 +1,12 @@
 import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export type ToggleTemplateDirectLinkOptions = {
   templateId: number;
   userId: number;
-  teamId?: number;
+  teamId: number;
   enabled: boolean;
 };
 
@@ -18,21 +19,7 @@ export const toggleTemplateDirectLink = async ({
   const template = await prisma.template.findFirst({
     where: {
       id: templateId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
     include: {
       recipients: true,
diff --git a/packages/lib/server-only/template/update-template.ts b/packages/lib/server-only/template/update-template.ts
index 54f7864d1..4485fdc66 100644
--- a/packages/lib/server-only/template/update-template.ts
+++ b/packages/lib/server-only/template/update-template.ts
@@ -1,15 +1,15 @@
 import type { DocumentVisibility, Template, TemplateMeta } from '@prisma/client';
 
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import type { TDocumentAccessAuthTypes, TDocumentActionAuthTypes } from '../../types/document-auth';
 import { createDocumentAuthOptions, extractDocumentAuthMethods } from '../../utils/document-auth';
+import { buildTeamWhereQuery } from '../../utils/teams';
 
 export type UpdateTemplateOptions = {
   userId: number;
-  teamId?: number;
+  teamId: number;
   templateId: number;
   data?: {
     title?: string;
@@ -32,30 +32,31 @@ export const updateTemplate = async ({
   meta = {},
   data = {},
 }: UpdateTemplateOptions) => {
-  const template = await prisma.template.findFirstOrThrow({
+  const template = await prisma.template.findFirst({
     where: {
       id: templateId,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({ teamId, userId }),
     },
     include: {
       templateMeta: true,
+      team: {
+        select: {
+          organisation: {
+            select: {
+              organisationClaim: true,
+            },
+          },
+        },
+      },
     },
   });
 
+  if (!template) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Template not found',
+    });
+  }
+
   if (Object.values(data).length === 0 && Object.keys(meta).length === 0) {
     return template;
   }
@@ -74,17 +75,10 @@ export const updateTemplate = async ({
     data?.globalActionAuth === undefined ? documentGlobalActionAuth : data.globalActionAuth;
 
   // Check if user has permission to set the global action auth.
-  if (newGlobalActionAuth && newGlobalActionAuth.length > 0) {
-    const isDocumentEnterprise = await isUserEnterprise({
-      userId,
-      teamId,
+  if (newGlobalActionAuth.length > 0 && !template.team.organisation.organisationClaim.flags.cfr21) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'You do not have permission to set the action auth',
     });
-
-    if (!isDocumentEnterprise) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You do not have permission to set the action auth',
-      });
-    }
   }
 
   const authOptions = createDocumentAuthOptions({
diff --git a/packages/lib/server-only/user/create-billing-portal.ts b/packages/lib/server-only/user/create-billing-portal.ts
deleted file mode 100644
index 4e00ecc79..000000000
--- a/packages/lib/server-only/user/create-billing-portal.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { User } from '@prisma/client';
-
-import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer';
-import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session';
-import { IS_BILLING_ENABLED, NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-
-export type CreateBillingPortalOptions = {
-  user: Pick<User, 'id' | 'customerId' | 'email' | 'name'>;
-};
-
-export const createBillingPortal = async ({ user }: CreateBillingPortalOptions) => {
-  if (!IS_BILLING_ENABLED()) {
-    throw new Error('Billing is not enabled');
-  }
-
-  const { stripeCustomer } = await getStripeCustomerByUser(user);
-
-  return getPortalSession({
-    customerId: stripeCustomer.id,
-    returnUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/settings/billing`,
-  });
-};
diff --git a/packages/lib/server-only/user/create-checkout-session.ts b/packages/lib/server-only/user/create-checkout-session.ts
deleted file mode 100644
index 3b6a45d47..000000000
--- a/packages/lib/server-only/user/create-checkout-session.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import type { User } from '@prisma/client';
-
-import { getCheckoutSession } from '@documenso/ee/server-only/stripe/get-checkout-session';
-import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer';
-import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session';
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-
-import { getSubscriptionsByUserId } from '../subscription/get-subscriptions-by-user-id';
-
-export type CreateCheckoutSession = {
-  user: Pick<User, 'id' | 'customerId' | 'email' | 'name'>;
-  priceId: string;
-};
-
-export const createCheckoutSession = async ({ user, priceId }: CreateCheckoutSession) => {
-  const { stripeCustomer } = await getStripeCustomerByUser(user);
-
-  const existingSubscriptions = await getSubscriptionsByUserId({ userId: user.id });
-
-  const foundSubscription = existingSubscriptions.find(
-    (subscription) =>
-      subscription.priceId === priceId &&
-      subscription.periodEnd &&
-      subscription.periodEnd >= new Date(),
-  );
-
-  if (foundSubscription) {
-    return getPortalSession({
-      customerId: stripeCustomer.id,
-      returnUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/settings/billing`,
-    });
-  }
-
-  return getCheckoutSession({
-    customerId: stripeCustomer.id,
-    priceId,
-    returnUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/settings/billing`,
-  });
-};
diff --git a/packages/lib/server-only/user/create-user.ts b/packages/lib/server-only/user/create-user.ts
index 1b8a15a60..53f813c82 100644
--- a/packages/lib/server-only/user/create-user.ts
+++ b/packages/lib/server-only/user/create-user.ts
@@ -1,25 +1,20 @@
 import { hash } from '@node-rs/bcrypt';
 import type { User } from '@prisma/client';
-import { TeamMemberInviteStatus } from '@prisma/client';
 
-import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer';
-import { updateSubscriptionItemQuantity } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
 import { prisma } from '@documenso/prisma';
 
-import { IS_BILLING_ENABLED } from '../../constants/app';
 import { SALT_ROUNDS } from '../../constants/auth';
 import { AppError, AppErrorCode } from '../../errors/app-error';
-import { buildLogger } from '../../utils/logger';
+import { createPersonalOrganisation } from '../organisation/create-organisation';
 
 export interface CreateUserOptions {
   name: string;
   email: string;
   password: string;
   signature?: string | null;
-  url?: string;
 }
 
-export const createUser = async ({ name, email, password, signature, url }: CreateUserOptions) => {
+export const createUser = async ({ name, email, password, signature }: CreateUserOptions) => {
   const hashedPassword = await hash(password, SALT_ROUNDS);
 
   const userExists = await prisma.user.findFirst({
@@ -32,21 +27,6 @@ export const createUser = async ({ name, email, password, signature, url }: Crea
     throw new AppError(AppErrorCode.ALREADY_EXISTS);
   }
 
-  if (url) {
-    const urlExists = await prisma.user.findFirst({
-      where: {
-        url,
-      },
-    });
-
-    if (urlExists) {
-      throw new AppError('PROFILE_URL_TAKEN', {
-        message: 'Profile username is taken',
-        userMessage: 'The profile username is already taken',
-      });
-    }
-  }
-
   const user = await prisma.$transaction(async (tx) => {
     const user = await tx.user.create({
       data: {
@@ -54,7 +34,6 @@ export const createUser = async ({ name, email, password, signature, url }: Crea
         email: email.toLowerCase(),
         password: hashedPassword, // Todo: (RR7) Drop password.
         signature,
-        url,
       },
     });
 
@@ -72,6 +51,7 @@ export const createUser = async ({ name, email, password, signature, url }: Crea
     return user;
   });
 
+  // Not used at the moment, uncomment if required.
   await onCreateUserHook(user).catch((err) => {
     // Todo: (RR7) Add logging.
     console.error(err);
@@ -81,105 +61,12 @@ export const createUser = async ({ name, email, password, signature, url }: Crea
 };
 
 /**
- * Should be run after a user is created.
+ * Should be run after a user is created, example during email password signup or google sign in.
  *
  * @returns User
  */
 export const onCreateUserHook = async (user: User) => {
-  const { email } = user;
-
-  const acceptedTeamInvites = await prisma.teamMemberInvite.findMany({
-    where: {
-      status: TeamMemberInviteStatus.ACCEPTED,
-      email: {
-        equals: email,
-        mode: 'insensitive',
-      },
-    },
-  });
-
-  // For each team invite, add the user to the team and delete the team invite.
-  // If an error occurs, reset the invitation to not accepted.
-  await Promise.allSettled(
-    acceptedTeamInvites.map(async (invite) =>
-      prisma
-        .$transaction(
-          async (tx) => {
-            await tx.teamMember.create({
-              data: {
-                teamId: invite.teamId,
-                userId: user.id,
-                role: invite.role,
-              },
-            });
-
-            await tx.teamMemberInvite.delete({
-              where: {
-                id: invite.id,
-              },
-            });
-
-            if (!IS_BILLING_ENABLED()) {
-              return;
-            }
-
-            const team = await tx.team.findFirstOrThrow({
-              where: {
-                id: invite.teamId,
-              },
-              include: {
-                members: {
-                  select: {
-                    id: true,
-                  },
-                },
-                subscription: true,
-              },
-            });
-
-            if (team.subscription) {
-              await updateSubscriptionItemQuantity({
-                priceId: team.subscription.priceId,
-                subscriptionId: team.subscription.planId,
-                quantity: team.members.length,
-              });
-            }
-          },
-          { timeout: 30_000 },
-        )
-        .catch(async () => {
-          await prisma.teamMemberInvite.update({
-            where: {
-              id: invite.id,
-            },
-            data: {
-              status: TeamMemberInviteStatus.PENDING,
-            },
-          });
-        }),
-    ),
-  );
-
-  // Update the user record with a new or existing Stripe customer record.
-  if (IS_BILLING_ENABLED()) {
-    try {
-      return await getStripeCustomerByUser(user).then((session) => session.user);
-    } catch (err) {
-      console.error(err);
-
-      const error = AppError.parseError(err);
-
-      const logger = buildLogger();
-
-      logger.error(error, {
-        method: 'createUser',
-        context: {
-          appError: AppError.toJSON(error),
-          userId: user.id,
-        },
-      });
-    }
-  }
+  await createPersonalOrganisation({ userId: user.id });
 
   return user;
 };
diff --git a/packages/lib/server-only/user/get-all-users.ts b/packages/lib/server-only/user/get-all-users.ts
index 2a05ababc..69e07813d 100644
--- a/packages/lib/server-only/user/get-all-users.ts
+++ b/packages/lib/server-only/user/get-all-users.ts
@@ -35,7 +35,6 @@ export const findUsers = async ({
   const [users, count] = await Promise.all([
     prisma.user.findMany({
       include: {
-        subscriptions: true,
         documents: {
           select: {
             id: true,
diff --git a/packages/lib/server-only/user/get-user-public-profile.ts b/packages/lib/server-only/user/get-user-public-profile.ts
deleted file mode 100644
index e40cc5b29..000000000
--- a/packages/lib/server-only/user/get-user-public-profile.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import type { UserProfile } from '@prisma/client';
-
-import { prisma } from '@documenso/prisma';
-
-import { AppError, AppErrorCode } from '../../errors/app-error';
-import { updatePublicProfile } from './update-public-profile';
-
-export type GetUserPublicProfileOptions = {
-  userId: number;
-};
-
-type GetUserPublicProfileResponse = {
-  profile: UserProfile;
-  url: string | null;
-};
-
-export const getUserPublicProfile = async ({
-  userId,
-}: GetUserPublicProfileOptions): Promise<GetUserPublicProfileResponse> => {
-  const user = await prisma.user.findFirst({
-    where: {
-      id: userId,
-    },
-    include: {
-      profile: true,
-    },
-  });
-
-  if (!user) {
-    throw new AppError(AppErrorCode.NOT_FOUND, { message: 'User not found' });
-  }
-
-  // Create and return the public profile.
-  if (!user.profile) {
-    const { url, profile } = await updatePublicProfile({
-      userId: user.id,
-      data: {
-        enabled: false,
-      },
-    });
-
-    if (!profile) {
-      throw new AppError(AppErrorCode.NOT_FOUND, { message: 'Failed to create public profile' });
-    }
-
-    return {
-      profile,
-      url,
-    };
-  }
-
-  return {
-    profile: user.profile,
-    url: user.url,
-  };
-};
diff --git a/packages/lib/server-only/user/update-public-profile.ts b/packages/lib/server-only/user/update-public-profile.ts
deleted file mode 100644
index 0a9c85ffc..000000000
--- a/packages/lib/server-only/user/update-public-profile.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { prisma } from '@documenso/prisma';
-
-import { AppError, AppErrorCode } from '../../errors/app-error';
-
-export type UpdatePublicProfileOptions = {
-  userId: number;
-  data: {
-    url?: string;
-    bio?: string;
-    enabled?: boolean;
-  };
-};
-
-export const updatePublicProfile = async ({ userId, data }: UpdatePublicProfileOptions) => {
-  if (Object.values(data).length === 0) {
-    throw new AppError(AppErrorCode.INVALID_BODY, { message: 'Missing data to update' });
-  }
-
-  const { url, bio, enabled } = data;
-
-  const user = await prisma.user.findFirst({
-    where: {
-      id: userId,
-    },
-  });
-
-  if (!user) {
-    throw new AppError(AppErrorCode.NOT_FOUND, { message: 'User not found' });
-  }
-
-  const finalUrl = url ?? user.url;
-
-  if (!finalUrl && enabled) {
-    throw new AppError(AppErrorCode.INVALID_REQUEST, {
-      message: 'Cannot enable a profile without a URL',
-    });
-  }
-
-  if (url) {
-    const isUrlTakenByAnotherUser = await prisma.user.findFirst({
-      select: {
-        id: true,
-      },
-      where: {
-        id: {
-          not: userId,
-        },
-        url,
-      },
-    });
-
-    const isUrlTakenByAnotherTeam = await prisma.team.findFirst({
-      select: {
-        id: true,
-      },
-      where: {
-        url,
-      },
-    });
-
-    if (isUrlTakenByAnotherUser || isUrlTakenByAnotherTeam) {
-      throw new AppError('PROFILE_URL_TAKEN', {
-        message: 'The profile username is already taken',
-      });
-    }
-  }
-
-  return await prisma.user.update({
-    where: {
-      id: userId,
-    },
-    data: {
-      url,
-      profile: {
-        upsert: {
-          create: {
-            bio,
-            enabled,
-          },
-          update: {
-            bio,
-            enabled,
-          },
-        },
-      },
-    },
-    include: {
-      profile: true,
-    },
-  });
-};
diff --git a/packages/lib/server-only/webhooks/create-webhook.ts b/packages/lib/server-only/webhooks/create-webhook.ts
index 53e75bc7d..c14565a6a 100644
--- a/packages/lib/server-only/webhooks/create-webhook.ts
+++ b/packages/lib/server-only/webhooks/create-webhook.ts
@@ -2,13 +2,17 @@ import type { WebhookTriggerEvents } from '@prisma/client';
 
 import { prisma } from '@documenso/prisma';
 
+import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams';
+import { AppError, AppErrorCode } from '../../errors/app-error';
+import { buildTeamWhereQuery } from '../../utils/teams';
+
 export interface CreateWebhookOptions {
   webhookUrl: string;
   eventTriggers: WebhookTriggerEvents[];
   secret: string | null;
   enabled: boolean;
   userId: number;
-  teamId?: number;
+  teamId: number;
 }
 
 export const createWebhook = async ({
@@ -19,16 +23,17 @@ export const createWebhook = async ({
   userId,
   teamId,
 }: CreateWebhookOptions) => {
-  if (teamId) {
-    await prisma.team.findFirstOrThrow({
-      where: {
-        id: teamId,
-        members: {
-          some: {
-            userId,
-          },
-        },
-      },
+  const team = await prisma.team.findFirst({
+    where: buildTeamWhereQuery({
+      teamId,
+      userId,
+      roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+    }),
+  });
+
+  if (!team) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Team not found',
     });
   }
 
diff --git a/packages/lib/server-only/webhooks/delete-webhook-by-id.ts b/packages/lib/server-only/webhooks/delete-webhook-by-id.ts
index 9af93bc50..620421b05 100644
--- a/packages/lib/server-only/webhooks/delete-webhook-by-id.ts
+++ b/packages/lib/server-only/webhooks/delete-webhook-by-id.ts
@@ -1,30 +1,23 @@
 import { prisma } from '@documenso/prisma';
 
+import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams';
+import { buildTeamWhereQuery } from '../../utils/teams';
+
 export type DeleteWebhookByIdOptions = {
   id: string;
   userId: number;
-  teamId?: number;
+  teamId: number;
 };
 
 export const deleteWebhookById = async ({ id, userId, teamId }: DeleteWebhookByIdOptions) => {
   return await prisma.webhook.delete({
     where: {
       id,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({
+        teamId,
+        userId,
+        roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+      }),
     },
   });
 };
diff --git a/packages/lib/server-only/webhooks/edit-webhook.ts b/packages/lib/server-only/webhooks/edit-webhook.ts
index e582ebebe..265139c8a 100644
--- a/packages/lib/server-only/webhooks/edit-webhook.ts
+++ b/packages/lib/server-only/webhooks/edit-webhook.ts
@@ -2,32 +2,25 @@ import type { Prisma } from '@prisma/client';
 
 import { prisma } from '@documenso/prisma';
 
+import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams';
+import { buildTeamWhereQuery } from '../../utils/teams';
+
 export type EditWebhookOptions = {
   id: string;
   data: Omit<Prisma.WebhookUpdateInput, 'id' | 'userId' | 'teamId'>;
   userId: number;
-  teamId?: number;
+  teamId: number;
 };
 
 export const editWebhook = async ({ id, data, userId, teamId }: EditWebhookOptions) => {
   return await prisma.webhook.update({
     where: {
       id,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+      team: buildTeamWhereQuery({
+        teamId,
+        userId,
+        roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+      }),
     },
     data: {
       ...data,
diff --git a/packages/lib/server-only/webhooks/get-all-webhooks-by-event-trigger.ts b/packages/lib/server-only/webhooks/get-all-webhooks-by-event-trigger.ts
index 57b1032d7..d1acc1962 100644
--- a/packages/lib/server-only/webhooks/get-all-webhooks-by-event-trigger.ts
+++ b/packages/lib/server-only/webhooks/get-all-webhooks-by-event-trigger.ts
@@ -5,7 +5,7 @@ import { prisma } from '@documenso/prisma';
 export type GetAllWebhooksByEventTriggerOptions = {
   event: WebhookTriggerEvents;
   userId: number;
-  teamId?: number;
+  teamId: number;
 };
 
 export const getAllWebhooksByEventTrigger = async ({
@@ -19,21 +19,22 @@ export const getAllWebhooksByEventTrigger = async ({
       eventTriggers: {
         has: event,
       },
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
+      team: {
+        id: teamId,
+        teamGroups: {
+          some: {
+            organisationGroup: {
+              organisationGroupMembers: {
                 some: {
-                  userId,
+                  organisationMember: {
+                    userId,
+                  },
                 },
               },
             },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+          },
+        },
+      },
     },
   });
 };
diff --git a/packages/lib/server-only/webhooks/get-webhook-by-id.ts b/packages/lib/server-only/webhooks/get-webhook-by-id.ts
index fe2ff62ff..48637f2a8 100644
--- a/packages/lib/server-only/webhooks/get-webhook-by-id.ts
+++ b/packages/lib/server-only/webhooks/get-webhook-by-id.ts
@@ -3,28 +3,30 @@ import { prisma } from '@documenso/prisma';
 export type GetWebhookByIdOptions = {
   id: string;
   userId: number;
-  teamId?: number;
+  teamId: number;
 };
 
 export const getWebhookById = async ({ id, userId, teamId }: GetWebhookByIdOptions) => {
   return await prisma.webhook.findFirstOrThrow({
     where: {
       id,
-      ...(teamId
-        ? {
-            team: {
-              id: teamId,
-              members: {
+      userId,
+      team: {
+        id: teamId,
+        teamGroups: {
+          some: {
+            organisationGroup: {
+              organisationGroupMembers: {
                 some: {
-                  userId,
+                  organisationMember: {
+                    userId,
+                  },
                 },
               },
             },
-          }
-        : {
-            userId,
-            teamId: null,
-          }),
+          },
+        },
+      },
     },
   });
 };
diff --git a/packages/lib/server-only/webhooks/get-webhooks-by-team-id.ts b/packages/lib/server-only/webhooks/get-webhooks-by-team-id.ts
index 82737a46d..d7412eb14 100644
--- a/packages/lib/server-only/webhooks/get-webhooks-by-team-id.ts
+++ b/packages/lib/server-only/webhooks/get-webhooks-by-team-id.ts
@@ -5,9 +5,17 @@ export const getWebhooksByTeamId = async (teamId: number, userId: number) => {
     where: {
       team: {
         id: teamId,
-        members: {
+        teamGroups: {
           some: {
-            userId,
+            organisationGroup: {
+              organisationGroupMembers: {
+                some: {
+                  organisationMember: {
+                    userId,
+                  },
+                },
+              },
+            },
           },
         },
       },
diff --git a/packages/lib/server-only/webhooks/get-webhooks-by-user-id.ts b/packages/lib/server-only/webhooks/get-webhooks-by-user-id.ts
deleted file mode 100644
index 0877d878f..000000000
--- a/packages/lib/server-only/webhooks/get-webhooks-by-user-id.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { prisma } from '@documenso/prisma';
-
-export const getWebhooksByUserId = async (userId: number) => {
-  return await prisma.webhook.findMany({
-    where: {
-      userId,
-      teamId: null,
-    },
-    orderBy: {
-      createdAt: 'desc',
-    },
-  });
-};
diff --git a/packages/lib/server-only/webhooks/trigger/schema.ts b/packages/lib/server-only/webhooks/trigger/schema.ts
index 0e1bee930..3f787d9b2 100644
--- a/packages/lib/server-only/webhooks/trigger/schema.ts
+++ b/packages/lib/server-only/webhooks/trigger/schema.ts
@@ -5,7 +5,7 @@ export const ZTriggerWebhookBodySchema = z.object({
   event: z.nativeEnum(WebhookTriggerEvents),
   data: z.unknown(),
   userId: z.number(),
-  teamId: z.number().optional(),
+  teamId: z.number(),
 });
 
 export type TTriggerWebhookBodySchema = z.infer<typeof ZTriggerWebhookBodySchema>;
diff --git a/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts b/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts
index 191de4147..0bb195501 100644
--- a/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts
+++ b/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts
@@ -8,7 +8,7 @@ export type TriggerWebhookOptions = {
   event: WebhookTriggerEvents;
   data: Record<string, unknown>;
   userId: number;
-  teamId?: number;
+  teamId: number;
 };
 
 export const triggerWebhook = async ({ event, data, userId, teamId }: TriggerWebhookOptions) => {
diff --git a/packages/lib/server-only/webhooks/zapier/list-documents.ts b/packages/lib/server-only/webhooks/zapier/list-documents.ts
index 8835b6581..73077d40f 100644
--- a/packages/lib/server-only/webhooks/zapier/list-documents.ts
+++ b/packages/lib/server-only/webhooks/zapier/list-documents.ts
@@ -4,7 +4,6 @@ import { findDocuments } from '@documenso/lib/server-only/document/find-document
 import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
 
 import { getWebhooksByTeamId } from '../get-webhooks-by-team-id';
-import { getWebhooksByUserId } from '../get-webhooks-by-user-id';
 import { validateApiToken } from './validateApiToken';
 
 export const listDocumentsHandler = async (req: Request) => {
@@ -21,23 +20,17 @@ export const listDocumentsHandler = async (req: Request) => {
 
     const documents = await findDocuments({
       userId: userId ?? user.id,
-      teamId: teamId ?? undefined,
+      teamId,
       perPage: 1,
     });
 
     const recipients = await getRecipientsForDocument({
       documentId: documents.data[0].id,
       userId: userId ?? user.id,
-      teamId: teamId ?? undefined,
+      teamId,
     });
 
-    if (userId) {
-      allWebhooks = await getWebhooksByUserId(userId);
-    }
-
-    if (teamId) {
-      allWebhooks = await getWebhooksByTeamId(teamId, user.id);
-    }
+    allWebhooks = await getWebhooksByTeamId(teamId, user.id);
 
     if (documents && documents.data.length > 0 && allWebhooks.length > 0 && recipients.length > 0) {
       const testWebhook = {
diff --git a/packages/lib/translations/de/web.po b/packages/lib/translations/de/web.po
index 2cc308b6e..d7b7aa92a 100644
--- a/packages/lib/translations/de/web.po
+++ b/packages/lib/translations/de/web.po
@@ -22,19 +22,10 @@ msgstr ""
 msgid " Enable direct link signing"
 msgstr " Direktlink-Signierung aktivieren"
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
-msgid " The events that will trigger a webhook to be sent to your URL."
-msgstr " Die Ereignisse, die einen Webhook auslösen, der an Ihre URL gesendet wird."
-
 #: apps/remix/app/components/embed/authoring/configure-document-upload.tsx
 msgid ".PDF documents accepted (max {APP_DOCUMENT_UPLOAD_SIZE_LIMIT}MB)"
 msgstr ".PDF-Dokumente akzeptiert (max. {APP_DOCUMENT_UPLOAD_SIZE_LIMIT} MB)"
 
-#. placeholder {0}: team.name
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-msgid "\"{0}\" has invited you to sign \"example document\"."
-msgstr "\"{0}\" hat Sie eingeladen, \"Beispieldokument\" zu unterschreiben."
-
 #. placeholder {0}: field.customText
 #. placeholder {1}: timezone || ''
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
@@ -57,10 +48,13 @@ msgstr "„{documentName}“ wurde von allen Unterzeichnern signiert"
 msgid "\"{documentTitle}\" has been successfully deleted"
 msgstr "\"{documentTitle}\" wurde erfolgreich gelöscht"
 
-#. placeholder {0}: team.name
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-msgid "\"{placeholderEmail}\" on behalf of \"{0}\" has invited you to sign \"example document\"."
-msgstr "\"{placeholderEmail}\" im Namen von \"{0}\" hat Sie eingeladen, \"Beispieldokument\" zu unterzeichnen."
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "\"{placeholderEmail}\" on behalf of \"Team Name\" has invited you to sign \"example document\"."
+msgstr ""
+
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "\"Team Name\" has invited you to sign \"example document\"."
+msgstr ""
 
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
@@ -83,16 +77,16 @@ msgstr "{0, plural, one {# Zeichen über dem Limit} other {# Zeichen über dem L
 msgid "{0, plural, one {# recipient} other {# recipients}}"
 msgstr "{0, plural, one {# Empfänger} other {# Empfänger}}"
 
-#. placeholder {0}: row.original.quantity
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "{0, plural, one {# Seat} other {# Seats}}"
-msgstr "{0, plural, one {# Sitz} other {# Sitze}}"
+#. placeholder {0}: org.teams.length
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "{0, plural, one {# team} other {# teams}}"
+msgstr ""
 
 #. placeholder {0}: data.length
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "{0, plural, one {<0>You have <1>1</1> pending team invitation</0>} other {<2>You have <3>#</3> pending team invitations</2>}}"
-msgstr "{0, plural, one {<0>Du hast <1>1</1> ausstehende Team-Einladung</0>} other {<2>Du hast <3>#</3> ausstehende Team-Einladungen</2>}}"
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "{0, plural, one {<0>You have <1>1</1> pending invitation</0>} other {<2>You have <3>#</3> pending invitations</2>}}"
+msgstr ""
 
 #. placeholder {0}: autoSignableFields.filter((f) => f.type === fieldType).length
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
@@ -100,18 +94,18 @@ msgid "{0, plural, one {1 matching field} other {# matching fields}}"
 msgstr "{0, plural, one {1 passendes Feld} other {# passende Felder}}"
 
 #. placeholder {0}: recipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
 msgid "{0, plural, one {1 Recipient} other {# Recipients}}"
 msgstr "{0, plural, one {1 Empfänger} other {# Empfänger}}"
 
 #. placeholder {0}: pendingRecipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "{0, plural, one {Waiting on 1 recipient} other {Waiting on # recipients}}"
 msgstr "{0, plural, one {Warte auf 1 Empfänger} other {Warte auf # Empfänger}}"
 
+#. placeholder {0}: route.label
 #. placeholder {0}: _(FRIENDLY_FIELD_TYPE[fieldType as FieldType])
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
 msgid "{0}"
 msgstr "{0}"
@@ -132,16 +126,6 @@ msgstr "{0} hat Sie eingeladen, das Dokument \"{1}\" {recipientActionVerb}."
 msgid "{0} invited you to {recipientActionVerb} a document"
 msgstr "{0} hat dich eingeladen, ein Dokument {recipientActionVerb}"
 
-#. placeholder {0}: memberName || memberEmail
-#: packages/email/templates/team-join.tsx
-msgid "{0} joined the team {teamName} on Documenso"
-msgstr "{0} ist dem Team {teamName} bei Documenso beigetreten"
-
-#. placeholder {0}: memberName || memberEmail
-#: packages/email/templates/team-leave.tsx
-msgid "{0} left the team {teamName} on Documenso"
-msgstr "{0} hat das Team {teamName} bei Documenso verlassen"
-
 #. placeholder {0}: remaining.documents
 #. placeholder {1}: quota.documents
 #: apps/remix/app/components/general/document/document-upload.tsx
@@ -163,11 +147,15 @@ msgid "{0} on behalf of \"{1}\" has invited you to {recipientActionVerb} the doc
 msgstr "{0} im Namen von \"{1}\" hat Sie eingeladen, das Dokument \"{2}\" {recipientActionVerb}."
 
 #. placeholder {0}: recipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "{0} Recipient(s)"
 msgstr "{0} Empfänger(in)"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "{0} Teams"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 msgid "{charactersRemaining, plural, one {1 character remaining} other {{charactersRemaining} characters remaining}}"
 msgstr "{charactersRemaining, plural, one {1 Zeichen verbleibend} other {{charactersRemaining} Zeichen verbleibend}}"
@@ -220,18 +208,6 @@ msgstr "{inviterName} im Namen von \"{teamName}\" hat dich eingeladen, {0}<0/>\"
 msgid "{inviterName} on behalf of \"{teamName}\" has invited you to {action} {documentName}"
 msgstr "{inviterName} im Namen von \"{teamName}\" hat Sie eingeladen, das Dokument {documentName} {action}"
 
-#: packages/email/templates/team-join.tsx
-msgid "{memberEmail} joined the following team"
-msgstr "{memberEmail} ist dem folgenden Team beigetreten"
-
-#: packages/email/templates/team-leave.tsx
-msgid "{memberEmail} left the following team"
-msgstr "{memberEmail} hat das folgende Team verlassen"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "{numberOfSeats, plural, one {# member} other {# members}}"
-msgstr "{numberOfSeats, plural, one {# Mitglied} other {# Mitglieder}}"
-
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} added a field"
 msgstr "{prefix} hat ein Feld hinzugefügt"
@@ -377,10 +353,6 @@ msgstr "{teamName} hat dich eingeladen, {0}<0/>\"{documentName}\""
 msgid "{teamName} has invited you to {action} {documentName}"
 msgstr "{teamName} hat Sie eingeladen, {action} {documentName}"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "{teamName} ownership transfer request"
-msgstr "Anfrage zur Übertragung des Eigentums von {teamName}"
-
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{userName} approved the document"
 msgstr "{userName} hat das Dokument genehmigt"
@@ -414,10 +386,6 @@ msgstr "{visibleRows, plural, one {Eine # Ergebnis wird angezeigt.} other {# Erg
 msgid "<0>\"{0}\"</0>is no longer available to sign"
 msgstr "<0>\"{0}\"</0> steht nicht mehr zur Unterschrift zur Verfügung"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "<0>{senderName}</0> has requested that you take ownership of the following team"
-msgstr "<0>{senderName}</0> hat angefordert, dass du das folgende Team übernimmst"
-
 #: packages/email/templates/confirm-team-email.tsx
 msgid "<0>{teamName}</0> has requested to use your email address for their team on Documenso."
 msgstr "<0>{teamName}</0> hat angefragt, Ihre E-Mail-Adresse für ihr Team bei Documenso zu verwenden."
@@ -472,6 +440,10 @@ msgstr "<0>Konto erforderlich</0> - Der Empfänger muss angemeldet sein, um das
 msgid "<0>Require passkey</0> - The recipient must have an account and passkey configured via their settings"
 msgstr "<0>Passkey erforderlich</0> - Der Empfänger muss ein Konto haben und den Passkey über seine Einstellungen konfiguriert haben"
 
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "<0>Require password</0> - The recipient must have an account and password configured via their settings, the password will be verified during signing"
+msgstr ""
+
 #: apps/remix/app/components/tables/documents-table-sender-filter.tsx
 msgid "<0>Sender:</0> All"
 msgstr "<0>Absender:</0> Alle"
@@ -497,6 +469,14 @@ msgstr "<0>Sie sind dabei, die Unterzeichnung von \"<1>{documentTitle}</1>\" abz
 msgid "<0>You are about to complete viewing \"<1>{documentTitle}</1>\".</0><2/> Are you sure?"
 msgstr "<0>Sie sind dabei, die Ansicht von \"<1>{documentTitle}</1>\" abzuschließen.</0><2/> Sind Sie sicher?"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "0 Free organisations left"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "1 Free organisations left"
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "1 month"
 msgstr "1 Monat"
@@ -505,22 +485,53 @@ msgstr "1 Monat"
 msgid "12 months"
 msgstr "12 Monate"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "2FA"
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "3 months"
 msgstr "3 Monate"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+msgid "401 Unauthorized"
+msgstr ""
+
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "404 not found"
 msgstr "404 nicht gefunden"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "404 Organisation group not found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "404 Organisation not found"
+msgstr ""
+
 #: apps/remix/app/routes/_profile+/_layout.tsx
 msgid "404 Profile not found"
 msgstr "404 Profil nicht gefunden"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "404 Team not found"
 msgstr "404 Team nicht gefunden"
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "404 User not found"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "5 documents a month"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "5 Documents a month"
+msgstr ""
+
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "500 Internal Server Error"
 msgstr "500 Interner Serverfehler"
@@ -565,9 +576,29 @@ msgstr "Ein Feld wurde aktualisiert"
 msgid "A means to print or download documents for your records"
 msgstr "Ein Mittel, um Dokumente für Ihre Unterlagen zu drucken oder herunterzuladen"
 
-#: packages/lib/jobs/definitions/emails/send-team-member-joined-email.handler.ts
-msgid "A new member has joined your team"
-msgstr "Ein neues Mitglied ist deinem Team beigetreten"
+#: packages/email/templates/organisation-join.tsx
+msgid "A member has joined your organisation on Documenso"
+msgstr ""
+
+#: packages/lib/jobs/definitions/emails/send-organisation-member-left-email.handler.ts
+msgid "A member has left your organisation"
+msgstr ""
+
+#: packages/email/templates/organisation-leave.tsx
+msgid "A member has left your organisation {organisationName}"
+msgstr ""
+
+#: packages/email/templates/organisation-leave.tsx
+msgid "A member has left your organisation on Documenso"
+msgstr ""
+
+#: packages/lib/jobs/definitions/emails/send-organisation-member-joined-email.handler.ts
+msgid "A new member has joined your organisation"
+msgstr ""
+
+#: packages/email/templates/organisation-join.tsx
+msgid "A new member has joined your organisation {organisationName}"
+msgstr ""
 
 #: apps/remix/app/components/forms/token.tsx
 msgid "A new token was created successfully."
@@ -590,12 +621,6 @@ msgstr "Ein Empfänger wurde entfernt"
 msgid "A recipient was updated"
 msgstr "Ein Empfänger wurde aktualisiert"
 
-#. placeholder {0}: transferVerification.name
-#. placeholder {1}: transferVerification.email
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "A request to transfer the ownership of this team has been sent to <0>{0} ({1})</0>"
-msgstr "Eine Anfrage zur Übertragung des Eigentums dieses Teams wurde an <0>{0} ({1})</0> gesendet"
-
 #. placeholder {0}: team.name
 #: packages/lib/server-only/team/create-team-email-verification.ts
 msgid "A request to use your email has been initiated by {0} on Documenso"
@@ -606,7 +631,6 @@ msgid "A secret that will be sent to your URL so you can verify that the request
 msgstr "Ein Geheimnis, das an deine URL gesendet wird, damit du überprüfen kannst, dass die Anfrage von Documenso gesendet wurde"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "A secret that will be sent to your URL so you can verify that the request has been sent by Documenso."
 msgstr "Ein Geheimnis, das an deine URL gesendet wird, damit du überprüfen kannst, dass die Anfrage von Documenso gesendet wurde."
 
@@ -614,19 +638,6 @@ msgstr "Ein Geheimnis, das an deine URL gesendet wird, damit du überprüfen kan
 msgid "A stable internet connection"
 msgstr "Eine stabile Internetverbindung"
 
-#: packages/email/templates/team-join.tsx
-msgid "A team member has joined a team on Documenso"
-msgstr "Ein Teammitglied ist einem Team bei Documenso beigetreten"
-
-#. placeholder {0}: team.name
-#: packages/lib/jobs/definitions/emails/send-team-member-left-email.handler.ts
-msgid "A team member has left {0}"
-msgstr "Ein Teammitglied hat {0} verlassen"
-
-#: packages/email/templates/team-leave.tsx
-msgid "A team member has left a team on Documenso"
-msgstr "Ein Teammitglied hat ein Team auf Documenso verlassen"
-
 #: packages/email/templates/team-delete.tsx
 #: packages/email/templates/team-delete.tsx
 msgid "A team you were a part of has been deleted"
@@ -636,6 +647,14 @@ msgstr "Ein Team, dem du angehörtest, wurde gelöscht"
 msgid "A unique URL to access your profile"
 msgstr "Eine eindeutige URL, um auf dein Profil zuzugreifen"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "A unique URL to identify the organisation"
+msgstr ""
+
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "A unique URL to identify your organisation"
+msgstr ""
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "A unique URL to identify your team"
@@ -645,32 +664,36 @@ msgstr "Eine eindeutige URL, um dein Team zu identifizieren"
 msgid "A verification email will be sent to the provided email."
 msgstr "Eine Bestätigungs-E-Mail wird an die angegebene E-Mail-Adresse gesendet."
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: packages/email/templates/team-transfer-request.tsx
-#: packages/email/templates/team-invite.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: packages/email/templates/organisation-invite.tsx
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Accept"
 msgstr "Akzeptieren"
 
-#: packages/email/templates/team-invite.tsx
-msgid "Accept invitation to join a team on Documenso"
-msgstr "Einladung annehmen, um einem Team auf Documenso beizutreten"
+#: packages/email/templates/organisation-invite.tsx
+msgid "Accept invitation to join an organisation on Documenso"
+msgstr ""
 
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Accept team email request for {teamName} on Documenso"
 msgstr "Akzeptiere die Team-E-Mail-Anfrage für {teamName} bei Documenso"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "Accept team transfer request on Documenso"
-msgstr "Übertragungsanfrage des Teams auf Documenso annehmen"
-
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Acceptance and Consent"
 msgstr "Zustimmung und Einverständnis"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Accepted team invitation"
-msgstr "Team-Einladung akzeptiert"
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "Access disabled"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Access enabled"
+msgstr ""
+
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Account"
+msgstr ""
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 msgid "Account Authentication"
@@ -707,18 +730,25 @@ msgid "Action"
 msgstr "Aktion"
 
 #: apps/remix/app/components/tables/templates-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Actions"
 msgstr "Aktionen"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
 msgid "Active"
 msgstr "Aktiv"
 
@@ -783,7 +813,29 @@ msgstr "E-Mail hinzufügen"
 msgid "Add Fields"
 msgstr "Felder hinzufügen"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add group roles"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add groups"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Add Members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Add members roles"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Add more"
 msgstr "Mehr hinzufügen"
 
@@ -841,15 +893,12 @@ msgstr "Fügen Sie die Personen hinzu, die das Dokument unterschreiben werden."
 msgid "Add the recipients to create the document with"
 msgstr "Fügen Sie die Empfänger hinzu, um das Dokument zu erstellen"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Adding and removing seats will adjust your invoice accordingly."
-msgstr "Das Hinzufügen und Entfernen von Sitzplätzen wird Ihre Rechnung entsprechend anpassen."
-
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Additional brand information to display at the bottom of emails"
 msgstr "Zusätzliche Markeninformationen, die am Ende von E-Mails angezeigt werden sollen"
 
-#: packages/lib/constants/teams.ts
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Admin"
 msgstr "Administrator"
 
@@ -857,10 +906,15 @@ msgstr "Administrator"
 msgid "Admin Actions"
 msgstr "Admin-Aktionen"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 msgid "Admin panel"
 msgstr "Admin-Panel"
 
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+msgid "Admin Panel"
+msgstr ""
+
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
 #: packages/ui/primitives/document-flow/add-settings.tsx
 msgid "Advanced Options"
@@ -893,6 +947,10 @@ msgstr "Alle"
 msgid "All documents"
 msgstr "Alle Dokumente"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "All documents have been completed!"
+msgstr ""
+
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "All documents have been processed. Any new documents that are sent or received will show here."
 msgstr "Alle Dokumente wurden verarbeitet. Alle neuen Dokumente, die gesendet oder empfangen werden, werden hier angezeigt."
@@ -901,8 +959,8 @@ msgstr "Alle Dokumente wurden verarbeitet. Alle neuen Dokumente, die gesendet od
 msgid "All documents related to the electronic signing process will be provided to you electronically through our platform or via email. It is your responsibility to ensure that your email address is current and that you can receive and open our emails."
 msgstr "Alle Dokumente, die mit dem elektronischen Unterzeichnungsprozess zusammenhängen, werden Ihnen elektronisch über unsere Plattform oder per E-Mail zur Verfügung gestellt. Es liegt in Ihrer Verantwortung, sicherzustellen, dass Ihre E-Mail-Adresse aktuell ist und dass Sie unsere E-Mails empfangen und öffnen können."
 
-#: apps/remix/app/routes/_authenticated+/templates.folders._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.folders._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.folders._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.folders._index.tsx
 msgid "All Folders"
 msgstr "Alle Ordner"
 
@@ -930,6 +988,10 @@ msgstr "Alle Vorlagen"
 msgid "All Time"
 msgstr "Alle Zeiten"
 
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
+msgid "Allow all organisation members to access this team"
+msgstr ""
+
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Allow document recipients to reply directly to this email address"
 msgstr "Erlauben Sie den Dokumentempfängern, direkt an diese E-Mail-Adresse zu antworten"
@@ -946,6 +1008,10 @@ msgstr "Unterzeichner können nächsten Unterzeichner bestimmen"
 msgid "Allowed Signature Types"
 msgstr "Erlaubte Signaturtypen"
 
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "Allowed teams"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security._index.tsx
 msgid "Allows authenticating using biometrics, password managers, hardware keys, etc."
 msgstr "Erlaubt die Authentifizierung mit biometrischen Daten, Passwort-Managern, Hardware-Schlüsseln usw."
@@ -954,7 +1020,7 @@ msgstr "Erlaubt die Authentifizierung mit biometrischen Daten, Passwort-Managern
 msgid "Already have an account? <0>Sign in instead</0>"
 msgstr "Hast du bereits ein Konto? <0>Stattdessen anmelden</0>"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
 msgid "Amount"
 msgstr "Betrag"
 
@@ -970,14 +1036,13 @@ msgstr "Eine elektronische Unterschrift, die Sie auf unserer Plattform bereitste
 msgid "An email account"
 msgstr "Ein E-Mail-Konto"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "An email containing an invitation will be sent to each member."
 msgstr "Eine E-Mail mit einer Einladung wird an jedes Mitglied gesendet."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "An email requesting the transfer of this team has been sent."
-msgstr "Eine E-Mail, in der die Übertragung dieses Teams angefordert wird, wurde gesendet."
-
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/token.tsx
 #: apps/remix/app/components/forms/signup.tsx
@@ -1024,6 +1089,7 @@ msgstr "Ein Fehler ist aufgetreten, während das direkte Links-Signieren deaktiv
 msgid "An error occurred while disabling the user."
 msgstr "Ein Fehler ist aufgetreten, während der Benutzer deaktiviert wurde."
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
@@ -1046,21 +1112,15 @@ msgstr "Ein Fehler ist aufgetreten, während das direkte Links-Signieren aktivie
 msgid "An error occurred while enabling the user."
 msgstr "Ein Fehler ist aufgetreten, während der Benutzer aktiviert wurde."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "An error occurred while loading team members. Please try again later."
-msgstr "Ein Fehler ist aufgetreten, während die Teammitglieder geladen wurden. Bitte versuchen Sie es später erneut."
-
 #: packages/ui/primitives/pdf-viewer.tsx
 msgid "An error occurred while loading the document."
 msgstr "Ein Fehler ist beim Laden des Dokuments aufgetreten."
 
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "An error occurred while moving the document."
 msgstr "Ein Fehler ist aufgetreten, während das Dokument verschoben wurde."
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 msgid "An error occurred while moving the template."
 msgstr "Ein Fehler ist aufgetreten, während die Vorlage verschoben wurde."
 
@@ -1113,6 +1173,7 @@ msgstr "Beim Unterschreiben als Assistent ist ein Fehler aufgetreten."
 #: apps/remix/app/components/general/document-signing/document-signing-dropdown-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-checkbox-field.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "An error occurred while signing the document."
 msgstr "Ein Fehler ist aufgetreten, während das Dokument unterzeichnet wurde."
 
@@ -1144,7 +1205,6 @@ msgstr "Ein unerwarteter Fehler ist aufgetreten."
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/forms/signup.tsx
@@ -1153,20 +1213,31 @@ msgstr "Ein unerwarteter Fehler ist aufgetreten."
 #: apps/remix/app/components/forms/signin.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
 #: apps/remix/app/components/forms/profile.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/account-delete-dialog.tsx
 msgid "An unknown error occurred"
@@ -1187,9 +1258,9 @@ msgstr "Ein unbekannter Fehler ist beim Löschen des Ordners aufgetreten."
 msgid "An unknown error occurred while moving the folder."
 msgstr "Ein unbekannter Fehler ist beim Verschieben des Ordners aufgetreten."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Any payment methods attached to this team will remain attached to this team. Please contact us if you need to update this information."
-msgstr "Alle Zahlungsmethoden, die mit diesem Team verbunden sind, bleiben diesem Team zugeordnet. Bitte kontaktiere uns, wenn du diese Informationen aktualisieren möchtest."
+#: apps/remix/app/routes/_authenticated+/inbox.tsx
+msgid "Any documents that you have been invited to will appear here"
+msgstr ""
 
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Any Source"
@@ -1199,7 +1270,7 @@ msgstr "Jede Quelle"
 msgid "Any Status"
 msgstr "Jeder Status"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -1211,6 +1282,7 @@ msgstr "API-Token"
 msgid "App Version"
 msgstr "App-Version"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
@@ -1246,6 +1318,10 @@ msgstr "Genehmigung"
 msgid "Are you sure you want to complete the document? This action cannot be undone. Please ensure that you have completed prefilling all relevant fields before proceeding."
 msgstr "Sind Sie sicher, dass Sie das Dokument abschließen möchten? Diese Aktion kann nicht rückgängig gemacht werden. Bitte stellen Sie sicher, dass Sie alle relevanten Felder vorab ausgefüllt haben, bevor Sie fortfahren."
 
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Are you sure you want to delete the following claim?"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 msgid "Are you sure you want to delete this token?"
 msgstr "Bist du sicher, dass du dieses Token löschen möchtest?"
@@ -1258,6 +1334,10 @@ msgstr "Sind Sie sicher, dass Sie dieses Dokument ablehnen möchten? Diese Aktio
 msgid "Are you sure you want to remove the <0>{passkeyName}</0> passkey."
 msgstr "Bist du sicher, dass du den <0>{passkeyName}</0> Passkey entfernen möchtest."
 
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "Are you sure you wish to delete this organisation?"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Are you sure you wish to delete this team?"
 msgstr "Bist du dir sicher, dass du dieses Team löschen möchtest?"
@@ -1265,13 +1345,22 @@ msgstr "Bist du dir sicher, dass du dieses Team löschen möchtest?"
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "Are you sure?"
 msgstr "Bist du dir sicher?"
 
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+msgid "Assigned Teams"
+msgstr ""
+
 #: packages/lib/constants/recipient-roles.ts
 msgid "Assist"
 msgstr "Hilfe"
@@ -1297,6 +1386,10 @@ msgstr "Die Rolle des Assistenten ist nur verfügbar, wenn das Dokument im seque
 msgid "Assistants"
 msgstr "Assistenten"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Assistants and Copy roles are currently not compatible with the multi-sign experience."
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "Assisted"
@@ -1306,7 +1399,7 @@ msgstr "Unterstützt"
 msgid "Assisting"
 msgstr "Unterstützend"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.types.tsx
 #: packages/ui/primitives/document-flow/add-settings.types.ts
 #: packages/lib/types/document-meta.ts
@@ -1343,15 +1436,17 @@ msgid "Awaiting email confirmation"
 msgstr "Warte auf E-Mail-Bestätigung"
 
 #: apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx
-#: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/authoring/configure-fields-view.tsx
 #: apps/remix/app/components/embed/authoring/configure-fields-view.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Back"
 msgstr "Zurück"
 
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
-msgid "Back to Documents"
-msgstr "Zurück zu Dokumenten"
+msgid "Back home"
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "Background Color"
@@ -1370,20 +1465,14 @@ msgstr "Backup-Codes"
 msgid "Banner Updated"
 msgstr "Banner aktualisiert"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Basic details"
-msgstr "Basisdetails"
-
 #: packages/email/template-components/template-confirmation-email.tsx
 msgid "Before you get started, please confirm your email address by clicking the button below:"
 msgstr "Bitte bestätige vor dem Start deine E-Mail-Adresse, indem du auf den Button unten klickst:"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
-#: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
-#: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
 msgid "Billing"
 msgstr "Abrechnung"
 
@@ -1395,11 +1484,26 @@ msgstr "Schwarz"
 msgid "Blue"
 msgstr "Blau"
 
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Brand Details"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Brand Website"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Branding Logo"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Branding Preferences"
 msgstr "Markenpräferenzen"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Branding preferences updated"
 msgstr "Markenpräferenzen aktualisiert"
 
@@ -1412,7 +1516,7 @@ msgstr "Browser"
 msgid "Bulk Copy"
 msgstr "Massenkopie"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Bulk Import"
 msgstr "Bulk-Import"
 
@@ -1434,7 +1538,7 @@ msgstr "Bulk-Vorlage senden über CSV"
 msgid "Bulk Send via CSV"
 msgstr "Massenversand per CSV"
 
-#: packages/email/templates/team-invite.tsx
+#: packages/email/templates/organisation-invite.tsx
 msgid "by <0>{senderName}</0>"
 msgstr "von <0>{senderName}</0>"
 
@@ -1442,10 +1546,6 @@ msgstr "von <0>{senderName}</0>"
 msgid "By accepting this request, you will be granting <0>{teamName}</0> access to:"
 msgstr "Durch die Annahme dieser Anfrage gewähren Sie <0>{teamName}</0> Zugriff auf:"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "By accepting this request, you will take responsibility for any billing items associated with this team."
-msgstr "Indem du diese Anfrage annimmst, übernimmst du die Verantwortung für alle Abrechnungspunkte, die mit diesem Team verbunden sind."
-
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "By deleting this document, the following will occur:"
 msgstr "Durch das Löschen dieses Dokuments wird Folgendes passieren:"
@@ -1476,7 +1576,6 @@ msgstr "Kann vorbereiten"
 
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-signature-field.tsx
@@ -1487,6 +1586,7 @@ msgstr "Kann vorbereiten"
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-account.tsx
@@ -1497,30 +1597,44 @@ msgstr "Kann vorbereiten"
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/template-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 #: apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
 #: apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 #: packages/ui/primitives/signature-pad/signature-pad-dialog.tsx
 #: packages/ui/primitives/document-flow/send-document-action-dialog.tsx
 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx
@@ -1572,7 +1686,8 @@ msgstr "Kontrollkästchen"
 msgid "Checkbox values"
 msgstr "Checkbox-Werte"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Checkout"
 msgstr "Abrechnung"
 
@@ -1592,6 +1707,10 @@ msgstr "Wählen Sie, wie das Dokument die Empfänger erreichen soll"
 msgid "Choose how to distribute your document to recipients. Email will send notifications, None will generate signing links for manual distribution."
 msgstr "Wählen Sie, wie Sie Ihr Dokument an Empfänger verteilen möchten. E-Mail sendet Benachrichtigungen, Keine generiert Signatur-Links zur manuellen Verteilung."
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Choose your preferred authentication method:"
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "Choose..."
 msgstr "Wählen..."
@@ -1600,13 +1719,9 @@ msgstr "Wählen..."
 msgid "Claim account"
 msgstr "Konto beanspruchen"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Claim username"
-msgstr "Benutzername beanspruchen"
-
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Claim your username now"
-msgstr "Benutzername jetzt beanspruchen"
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+msgid "Claims"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Clear file"
@@ -1631,7 +1746,7 @@ msgstr "Klicken Sie hier, um zu beginnen"
 msgid "Click here to retry"
 msgstr "Klicken Sie hier, um es erneut zu versuchen"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Click here to upload"
 msgstr "Klicken Sie hier, um hochzuladen"
 
@@ -1644,10 +1759,11 @@ msgstr "Klicken Sie, um den Signatur-Link zu kopieren, um ihn an den Empfänger
 #: apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Click to insert field"
 msgstr "Klicken, um das Feld auszufüllen"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
@@ -1655,6 +1771,9 @@ msgstr "Klicken, um das Feld auszufüllen"
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: packages/ui/primitives/document-flow/missing-signature-field-dialog.tsx
@@ -1665,11 +1784,16 @@ msgstr "Schließen"
 msgid "Communication"
 msgstr "Kommunikation"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Compare all plans and features in detail"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Complete"
 msgstr "Abschließen"
 
@@ -1701,6 +1825,7 @@ msgstr "Betrachten abschließen"
 #: apps/remix/app/components/general/stack-avatars-with-tooltip.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/document.ts
 #: packages/email/template-components/template-document-self-signed.tsx
 #: packages/email/template-components/template-document-recipient-signed.tsx
@@ -1776,16 +1901,21 @@ msgstr "Konfigurieren Sie das Feld {0}"
 msgid "Configure the fields you want to place on the document."
 msgstr "Konfigurieren Sie die Felder, die Sie auf dem Dokument platzieren möchten."
 
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Configure the team roles for each group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Configure the team roles for each member"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Confirm by typing <0>{confirmTransferMessage}</0>"
-msgstr "Bestätigen Sie durch Eingabe von <0>{confirmTransferMessage}</0>"
-
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 msgid "Confirm by typing <0>{deleteMessage}</0>"
 msgstr "Bestätigen Sie durch Eingabe von <0>{deleteMessage}</0>"
 
@@ -1817,20 +1947,24 @@ msgstr "Zustimmung zu elektronischen Transaktionen"
 msgid "Contact Information"
 msgstr "Kontaktinformationen"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Contact sales here"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "Content"
 msgstr "Inhalt"
 
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-view.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx
 #: packages/ui/primitives/document-flow/document-flow-root.tsx
 msgid "Continue"
@@ -1856,19 +1990,19 @@ msgstr "Fahre fort, indem du das Dokument signierst."
 msgid "Continue by viewing the document."
 msgstr "Fahre fort, indem du das Dokument ansiehst."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "Continue to login"
 msgstr "Weiter zum Login"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the default language of an uploaded document. This will be used as the language in email communications with the recipients."
 msgstr "Steuert die Standardsprache eines hochgeladenen Dokuments. Diese wird als Sprache in der E-Mail-Kommunikation mit den Empfängern verwendet."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the default visibility of an uploaded document."
 msgstr "Steuert die Standard-sichtbarkeit eines hochgeladenen Dokuments."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the formatting of the message that will be sent when inviting a recipient to sign a document. If a custom message has been provided while configuring the document, it will be used instead."
 msgstr "Steuert das Format der Nachricht, die gesendet wird, wenn ein Empfänger eingeladen wird, ein Dokument zu unterschreiben. Wenn eine benutzerdefinierte Nachricht beim Konfigurieren des Dokuments bereitgestellt wurde, wird diese stattdessen verwendet."
 
@@ -1876,11 +2010,11 @@ msgstr "Steuert das Format der Nachricht, die gesendet wird, wenn ein Empfänger
 msgid "Controls the language for the document, including the language to be used for email notifications, and the final certificate that is generated and attached to the document."
 msgstr "Legt die Sprache des Dokuments fest, einschließlich der Sprache für E-Mail-Benachrichtigungen und des endgültigen Zertifikats, das generiert und dem Dokument angehängt wird."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls whether the signing certificate will be included in the document when it is downloaded. The signing certificate can still be downloaded from the logs page separately."
 msgstr "Legt fest, ob das Signaturzertifikat in das Dokument aufgenommen wird, wenn es heruntergeladen wird. Das Signaturzertifikat kann weiterhin separat von der Protokollseite heruntergeladen werden."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls which signatures are allowed to be used when signing a document."
 msgstr "Bestimmt, welche Signaturen beim Unterschreiben eines Dokuments verwendet werden dürfen."
 
@@ -1929,6 +2063,9 @@ msgstr "Token kopieren"
 
 #: apps/remix/app/routes/_profile+/_layout.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 msgid "Create"
 msgstr "Erstellen"
 
@@ -1940,16 +2077,31 @@ msgstr "Erstelle ein <0>kostenfreies Konto</0>, um jederzeit auf deine unterzeic
 msgid "Create a new account"
 msgstr "Ein neues Konto erstellen"
 
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Create a new organisation with {planName} plan. Keep your current organisation on it's current plan"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create a team to collaborate with your team members."
 msgstr "Ein Team erstellen, um mit Ihren Teammitgliedern zusammenzuarbeiten."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 #: packages/email/template-components/template-document-self-signed.tsx
 msgid "Create account"
 msgstr "Konto erstellen"
 
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Create an organisation for this user"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Create an organisation to collaborate with teams"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Create an organisation to get started."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Create and send"
 msgstr "Erstellen und senden"
@@ -1962,6 +2114,14 @@ msgstr "Als Entwurf erstellen"
 msgid "Create as pending"
 msgstr "Als ausstehend erstellen"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create claim"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create Claim"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog-wrapper.tsx
 msgid "Create Direct Link"
 msgstr "Direkten Link erstellen"
@@ -1974,6 +2134,15 @@ msgstr "Direkten Signatur-Link erstellen"
 msgid "Create document from template"
 msgstr "Dokument aus der Vorlage erstellen"
 
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Create group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Create Groups"
+msgstr ""
+
 #: apps/remix/app/routes/_profile+/_layout.tsx
 msgid "Create now"
 msgstr "Jetzt erstellen"
@@ -1982,17 +2151,47 @@ msgstr "Jetzt erstellen"
 msgid "Create one automatically"
 msgstr "Einen automatisch erstellen"
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Create organisation"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/menu-switcher.tsx
+msgid "Create Organisation"
+msgstr ""
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Create separate organisation"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Create signing links"
 msgstr "Unterzeichnung Links erstellen"
 
-#: apps/remix/app/components/general/menu-switcher.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Create Stripe customer"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Create subscription"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create Subscription Claim"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create team"
 msgstr "Team erstellen"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create Team"
 msgstr "Team erstellen"
@@ -2025,6 +2224,8 @@ msgstr "Erstellen Sie Ihr Konto und beginnen Sie mit dem modernen Dokumentensign
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 #: apps/remix/app/components/tables/templates-table.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/tables/admin-leaderboard-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-information.tsx
@@ -2035,25 +2236,23 @@ msgid "Created"
 msgstr "Erstellt"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Created At"
 msgstr "Erstellt am"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Created by"
 msgstr "Erstellt von"
 
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table.tsx
 msgid "Created on"
 msgstr "Erstellt am"
 
 #. placeholder {0}: i18n.date(webhook.createdAt, DateTime.DATETIME_FULL)
 #. placeholder {0}: i18n.date(token.createdAt, DateTime.DATETIME_FULL)
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Created on {0}"
 msgstr "Erstellt am {0}"
 
@@ -2073,14 +2272,26 @@ msgstr "Aktuelles Passwort ist falsch."
 msgid "Current recipients:"
 msgstr "Aktuelle Empfänger:"
 
-#: apps/remix/app/components/general/billing-plans.tsx
-msgid "Daily"
-msgstr "Täglich"
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "Currently all organisation members can access this team"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Currently branding can only be configured for Teams and above plans."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups._index.tsx
+msgid "Custom Organisation Groups"
+msgstr ""
 
 #: apps/remix/app/components/general/app-command-menu.tsx
 msgid "Dark Mode"
 msgstr "Dunkelmodus"
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Dashboard"
+msgstr ""
+
 #: apps/remix/app/components/tables/settings-security-activity-table.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
@@ -2089,8 +2300,7 @@ msgstr "Dunkelmodus"
 msgid "Date"
 msgstr "Datum"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Date created"
 msgstr "Erstellungsdatum"
 
@@ -2100,24 +2310,20 @@ msgstr "Erstellungsdatum"
 msgid "Date Format"
 msgstr "Datumsformat"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: packages/email/templates/team-invite.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: packages/email/templates/organisation-invite.tsx
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Declined team invitation"
-msgstr "Team-Einladung abgelehnt"
-
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Document Language"
 msgstr "Standardsprache des Dokuments"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Document Visibility"
 msgstr "Standard Sichtbarkeit des Dokuments"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Signature Settings"
 msgstr "Standard-Signatureinstellungen"
 
@@ -2125,20 +2331,30 @@ msgstr "Standard-Signatureinstellungen"
 msgid "delete"
 msgstr "löschen"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/document/document-page-view-dropdown.tsx
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
 msgid "Delete"
 msgstr "Löschen"
 
@@ -2148,6 +2364,7 @@ msgstr "Löschen"
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-folder-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/folder-delete-dialog.tsx
 msgid "delete {0}"
 msgstr "löschen {0}"
@@ -2178,18 +2395,33 @@ msgstr "Dokument löschen"
 msgid "Delete Document"
 msgstr "Dokument löschen"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "Delete organisation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "Delete organisation group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "Delete organisation member"
+msgstr ""
+
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "Delete passkey"
 msgstr "Passkey löschen"
 
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Delete Subscription Claim"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Delete team"
 msgstr "Team löschen"
 
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-msgid "Delete team member"
-msgstr "Teammitglied löschen"
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "Delete team group"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 msgid "Delete the document. This action is irreversible so proceed with caution."
@@ -2278,6 +2510,7 @@ msgstr "Direkter Vorlagenlink gelöscht"
 msgid "Direct template link usage exceeded ({0}/{1})"
 msgstr "Die Verwendung des direkten Vorlagenlinks wurde überschritten ({0}/{1})"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Disable"
 msgstr "Deaktivieren"
@@ -2288,6 +2521,10 @@ msgstr "Deaktivieren"
 msgid "Disable 2FA"
 msgstr "2FA deaktivieren"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "Disable access"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
 msgid "Disable account"
 msgstr "Konto deaktivieren"
@@ -2302,7 +2539,6 @@ msgid "Disable Two Factor Authentication before deleting your account."
 msgstr "Deaktivieren Sie die Zwei-Faktor-Authentifizierung, bevor Sie Ihr Konto löschen."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "Disabled"
 msgstr "Deaktiviert"
 
@@ -2338,8 +2574,7 @@ msgstr "Möchten Sie diese Vorlage duplizieren?"
 msgid "Documenso will delete <0>all of your documents</0>, along with all of your completed documents, signatures, and all other resources belonging to your Account."
 msgstr "Documenso wird <0>alle Ihre Dokumente</0> löschen, zusammen mit allen abgeschlossenen Dokumenten, Unterschriften und allen anderen Ressourcen, die zu Ihrem Konto gehören."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Document"
 msgstr "Dokument"
@@ -2426,8 +2661,7 @@ msgstr "Dokument erstellt mit einem <0>direkten Link</0>"
 msgid "Document Creation"
 msgstr "Dokumenterstellung"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 #: packages/lib/utils/document-audit-logs.ts
@@ -2463,15 +2697,13 @@ msgstr "Externe ID des Dokuments aktualisiert"
 msgid "Document found in your account"
 msgstr "Dokument in Ihrem Konto gefunden"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/components/general/document/document-history-sheet.tsx
 msgid "Document history"
 msgstr "Dokumentverlauf"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document ID"
 msgstr "Dokument-ID"
 
@@ -2496,7 +2728,6 @@ msgid "Document metrics"
 msgstr "Dokumentmetrik"
 
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "Document moved"
 msgstr "Dokument verschoben"
 
@@ -2520,7 +2751,8 @@ msgstr "Dokument ausstehend"
 msgid "Document pending email"
 msgstr "E-Mail über ausstehende Dokumente"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Document preferences updated"
 msgstr "Dokumentpräferenzen aktualisiert"
 
@@ -2559,13 +2791,11 @@ msgstr "Dokument unterzeichnen Authentifizierung aktualisiert"
 msgid "Document signing process will be cancelled"
 msgstr "Der Dokumentenunterzeichnungsprozess wird abgebrochen"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document status"
 msgstr "Dokumentenstatus"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document title"
 msgstr "Dokumenttitel"
 
@@ -2603,16 +2833,13 @@ msgid "Document will be permanently deleted"
 msgstr "Dokument wird dauerhaft gelöscht"
 
 #: apps/remix/app/routes/_profile+/p.$url.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
 #: apps/remix/app/components/general/user-profile-timur.tsx
-#: apps/remix/app/components/general/generic-error-layout.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -2620,8 +2847,7 @@ msgstr "Dokument wird dauerhaft gelöscht"
 msgid "Documents"
 msgstr "Dokumente"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Documents created from template"
 msgstr "Dokumente erstellt aus Vorlage"
 
@@ -2629,6 +2855,10 @@ msgstr "Dokumente erstellt aus Vorlage"
 msgid "Documents Received"
 msgstr "Dokumente empfangen"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
+msgid "Documents that require your attention will appear here"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
 msgid "Documents Viewed"
 msgstr "Dokumente angesehen"
@@ -2638,7 +2868,8 @@ msgstr "Dokumente angesehen"
 msgid "Don't have an account? <0>Sign up</0>"
 msgstr "Haben Sie kein Konto? <0>Registrieren</0>"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/share-document-download-button.tsx
@@ -2711,7 +2942,7 @@ msgstr "Dropdown"
 msgid "Dropdown options"
 msgstr "Dropdown-Optionen"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Due to an unpaid invoice, your team has been restricted. Please settle the payment to restore full access to your team."
 msgstr "Aufgrund einer unbezahlten Rechnung wurde Ihrem Team der Zugriff eingeschränkt. Bitte begleichen Sie die Zahlung, um den vollumfänglichen Zugang zu Ihrem Team wiederherzustellen."
 
@@ -2730,7 +2961,6 @@ msgid "Duplicate on all pages"
 msgstr "Auf allen Seiten duplizieren"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
@@ -2741,13 +2971,11 @@ msgstr "Auf allen Seiten duplizieren"
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Edit Template"
 msgstr "Vorlage bearbeiten"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Edit webhook"
 msgstr "Webhook bearbeiten"
 
@@ -2762,6 +2990,7 @@ msgstr "Offenlegung der elektronischen Unterschrift"
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/tables/admin-document-recipient-item-table.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-email-field.tsx
@@ -2772,6 +3001,7 @@ msgstr "Offenlegung der elektronischen Unterschrift"
 #: apps/remix/app/components/forms/forgot-password.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
@@ -2793,7 +3023,7 @@ msgstr "E-Mail"
 
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/send-confirmation-email.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
@@ -2837,15 +3067,27 @@ msgstr "E-Mail-Verifizierung wurde entfernt"
 msgid "Email verification has been resent"
 msgstr "E-Mail-Verifizierung wurde erneut gesendet"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Embedding, 5 members included and more"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "Empty field"
 msgstr "Leeres Feld"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Enable"
+msgstr ""
+
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "Enable 2FA"
 msgstr "2FA aktivieren"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Enable access"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 msgid "Enable account"
 msgstr "Konto aktivieren"
@@ -2859,9 +3101,17 @@ msgstr "Konto Aktivieren"
 msgid "Enable Authenticator App"
 msgstr "Authenticator-App aktivieren"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
-msgid "Enable custom branding for all documents in this team."
-msgstr "Aktivieren Sie individuelles Branding für alle Dokumente in diesem Team."
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable Custom Branding"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable custom branding for all documents in this organisation"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable custom branding for all documents in this team"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: packages/lib/constants/template.ts
@@ -2876,8 +3126,6 @@ msgstr "Aktiviere die Signaturreihenfolge"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Enabled"
@@ -2891,11 +3139,15 @@ msgstr "Das Aktivieren des Kontos führt dazu, dass der Benutzer das Konto wiede
 msgid "Enclosed Document"
 msgstr "Beigefügte Dokument"
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "Ends On"
-msgstr "Endet am"
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Enter claim name"
+msgstr ""
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Enter your 2FA code"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Enter your brand details"
 msgstr "Geben Sie Ihre Markendaten ein"
 
@@ -2911,15 +3163,24 @@ msgstr "Geben Sie Ihre E-Mail-Adresse ein, um das abgeschlossene Dokument zu erh
 msgid "Enter your name"
 msgstr "Geben Sie Ihren Namen ein"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Enter your password"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 msgid "Enter your text here"
 msgstr "Geben Sie hier Ihren Text ein"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Enterprise"
+msgstr ""
+
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
 #: apps/remix/app/components/general/verify-email-banner.tsx
 #: apps/remix/app/components/general/template/template-edit-form.tsx
@@ -2954,15 +3215,14 @@ msgstr "Geben Sie hier Ihren Text ein"
 #: apps/remix/app/components/general/document/document-edit-form.tsx
 #: apps/remix/app/components/general/document/document-edit-form.tsx
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/template-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx
@@ -2975,7 +3235,7 @@ msgstr "Fehler"
 msgid "Error uploading file"
 msgstr "Fehler beim Hochladen der Datei"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Everyone can access and view the document"
 msgstr "Jeder kann auf das Dokument zugreifen und es anzeigen"
 
@@ -2996,7 +3256,7 @@ msgid "Expired"
 msgstr "Abgelaufen"
 
 #. placeholder {0}: i18n.date(token.expires, DateTime.DATETIME_FULL)
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Expires on {0}"
 msgstr "Läuft ab am {0}"
 
@@ -3010,6 +3270,18 @@ msgstr "Externe ID"
 msgid "Failed to create folder"
 msgstr "Ordner konnte nicht erstellt werden"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Failed to create subscription claim."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Failed to delete subscription claim."
+msgstr ""
+
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
+msgid "Failed to load document"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
 msgid "Failed to reseal document"
 msgstr "Dokument konnte nicht erneut versiegelt werden"
@@ -3026,12 +3298,15 @@ msgstr "Dokument konnte nicht aktualisiert werden"
 msgid "Failed to update recipient"
 msgstr "Empfänger konnte nicht aktualisiert werden"
 
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Failed to update subscription claim."
+msgstr ""
+
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 msgid "Failed to update template"
 msgstr "Vorlage konnte nicht aktualisiert werden"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Failed to update webhook"
 msgstr "Webhook konnte nicht aktualisiert werden"
 
@@ -3039,6 +3314,12 @@ msgstr "Webhook konnte nicht aktualisiert werden"
 msgid "Failed: {failedCount}"
 msgstr "Fehlgeschlagen: {failedCount}"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Feature Flags"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 msgid "Field character limit"
 msgstr "Zeichenbeschränkung des Feldes"
@@ -3096,6 +3377,10 @@ msgstr "Die Datei darf nicht größer als {APP_DOCUMENT_UPLOAD_SIZE_LIMIT} MB se
 msgid "File size exceeds the limit of {APP_DOCUMENT_UPLOAD_SIZE_LIMIT} MB"
 msgstr "Dateigröße überschreitet das Limit von {APP_DOCUMENT_UPLOAD_SIZE_LIMIT} MB"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Fill in the details to create a new subscription claim."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
 msgid "Folder"
@@ -3132,6 +3417,10 @@ msgstr "Für Fragen zu dieser Offenlegung, elektronischen Unterschriften oder ei
 msgid "For each recipient, provide their email (required) and name (optional) in separate columns. Download the template CSV below for the correct format."
 msgstr "Für jeden Empfänger geben Sie dessen E-Mail (erforderlich) und Namen (optional) in separaten Spalten an. Laden Sie unten die CSV-Vorlage für das korrekte Format herunter."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "For example, if the claim has a new flag \"FLAG_1\" set to true, then this organisation will get that flag added."
+msgstr ""
+
 #: packages/lib/server-only/auth/send-forgot-password.ts
 msgid "Forgot Password?"
 msgstr "Passwort vergessen?"
@@ -3142,6 +3431,10 @@ msgstr "Passwort vergessen?"
 msgid "Forgot your password?"
 msgstr "Hast du dein Passwort vergessen?"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Free"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/types.ts
 msgid "Free Signature"
 msgstr "Freie Unterschrift"
@@ -3153,9 +3446,12 @@ msgstr "Freie Unterschrift"
 #: apps/remix/app/components/forms/profile.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/template/template-edit-form.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
@@ -3173,8 +3469,16 @@ msgstr "Links generieren"
 msgid "Global recipient action authentication"
 msgstr "Globale Empfängerauthentifizierung"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Go back"
+msgstr ""
+
 #: apps/remix/app/routes/_recipient+/_layout.tsx
 #: apps/remix/app/routes/_profile+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
 #: packages/ui/primitives/document-flow/document-flow-root.tsx
 msgid "Go Back"
@@ -3192,6 +3496,10 @@ msgstr "Zurück nach Hause"
 msgid "Go Back Home"
 msgstr "Zurück nach Hause"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid "Go home"
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "Go to document"
 msgstr "Zum Dokument gehen"
@@ -3200,6 +3508,10 @@ msgstr "Zum Dokument gehen"
 msgid "Go to owner"
 msgstr "Zum Eigentümer gehen"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Go to team"
+msgstr ""
+
 #: apps/remix/app/routes/_profile+/p.$url.tsx
 msgid "Go to your <0>public profile settings</0> to add documents."
 msgstr "Gehen Sie zu Ihren <0>öffentlichen Profileinstellungen</0>, um Dokumente hinzuzufügen."
@@ -3208,6 +3520,34 @@ msgstr "Gehen Sie zu Ihren <0>öffentlichen Profileinstellungen</0>, um Dokument
 msgid "Green"
 msgstr "Grün"
 
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Group has been created."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Group has been updated successfully"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Group Name"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
+#: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Groups"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
 msgid "has invited you to approve this document"
 msgstr "hat Sie eingeladen, dieses Dokument zu genehmigen"
@@ -3237,6 +3577,10 @@ msgstr "Einen Assistenten als letzten Unterzeichner zu haben bedeutet, dass er k
 msgid "Help complete the document for other signers."
 msgstr "Hilfe beim Abschließen des Dokuments für andere Unterzeichner."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "Here you can edit your organisation details."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/profile.tsx
 msgid "Here you can edit your personal details."
 msgstr "Hier können Sie Ihre persönlichen Daten bearbeiten."
@@ -3245,14 +3589,23 @@ msgstr "Hier können Sie Ihre persönlichen Daten bearbeiten."
 msgid "Here you can manage your password and security settings."
 msgstr "Hier können Sie Ihre Passwort- und Sicherheitseinstellungen verwalten."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Here you can set preferences and defaults for branding."
 msgstr "Hier können Sie Präferenzen und Voreinstellungen für das Branding festlegen."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Here you can set preferences and defaults for your organisation. Teams will inherit these settings by default."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Here you can set preferences and defaults for your team."
 msgstr "Hier können Sie Präferenzen und Voreinstellungen für Ihr Team festlegen."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Here you can set your general preferences"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "Here's how it works:"
 msgstr "So funktioniert es:"
@@ -3269,7 +3622,7 @@ msgstr "Hallo, {userName},"
 msgid "Hi, {userName} <0>({userEmail})</0>"
 msgstr "Hallo, {userName} <0>({userEmail})</0>"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "Hide"
@@ -3279,6 +3632,10 @@ msgstr "Ausblenden"
 msgid "Hide additional information"
 msgstr "Zusätzliche Informationen ausblenden"
 
+#: apps/remix/app/components/general/generic-error-layout.tsx
+msgid "Home"
+msgstr ""
+
 #: packages/lib/constants/recipient-roles.ts
 msgid "I am a signer of this document"
 msgstr "Ich bin ein Unterzeichner dieses Dokuments"
@@ -3308,9 +3665,13 @@ msgstr "Ich bin der Besitzer dieses Dokuments"
 msgid "I'm sure! Delete it"
 msgstr "Ich bin mir sicher! Löschen"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "If they accept this request, the team will be transferred to their account."
-msgstr "Wenn sie diese Anfrage akzeptieren, wird das Team auf ihr Konto übertragen."
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "ID"
+msgstr ""
+
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "ID copied to clipboard"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "If you do not want to use the authenticator prompted, you can close it, which will then display the next available authenticator."
@@ -3324,6 +3685,8 @@ msgstr "Wenn Sie den Bestätigungslink nicht in Ihrem Posteingang finden, könne
 msgid "If your authenticator app does not support QR codes, you can use the following code instead:"
 msgstr "Wenn Ihre Authenticator-App keine QR-Codes unterstützt, können Sie stattdessen den folgenden Code verwenden:"
 
+#: apps/remix/app/components/general/app-nav-mobile.tsx
+#: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 msgid "Inbox"
 msgstr "Posteingang"
@@ -3332,7 +3695,7 @@ msgstr "Posteingang"
 msgid "Inbox documents"
 msgstr "Posteingang Dokumente"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Include the Signing Certificate in the Document"
 msgstr "Signaturzertifikat in das Dokument einfügen"
 
@@ -3341,11 +3704,27 @@ msgstr "Signaturzertifikat in das Dokument einfügen"
 msgid "Information"
 msgstr "Information"
 
-#: packages/ui/components/recipient/recipient-action-auth-select.tsx
 #: packages/ui/components/recipient/recipient-action-auth-select.tsx
 msgid "Inherit authentication method"
 msgstr "Authentifizierungsmethode erben"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Inherit from organisation"
+msgstr ""
+
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "Inherit organisation members"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Inherited subscription claim"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-initials-field.tsx
 #: packages/ui/primitives/document-flow/types.ts
 msgid "Initials"
@@ -3372,8 +3751,8 @@ msgstr "Ungültige E-Mail"
 msgid "Invalid link"
 msgstr "Ungültiger Link"
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Invalid token"
 msgstr "Ungültiges Token"
 
@@ -3381,43 +3760,52 @@ msgstr "Ungültiges Token"
 msgid "Invalid token provided. Please try again."
 msgstr "Ungültiges Token bereitgestellt. Bitte versuchen Sie es erneut."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Invitation accepted"
+msgstr ""
+
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "Invitation accepted!"
 msgstr "Einladung akzeptiert!"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "Invitation declined"
 msgstr "Einladung abgelehnt"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invitation has been deleted"
 msgstr "Einladung wurde gelöscht"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invitation has been resent"
 msgstr "Einladung wurde erneut gesendet"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite"
 msgstr "Einladen"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite member"
 msgstr "Mitglied einladen"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite Members"
 msgstr "Mitglieder einladen"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "Invite team members"
-msgstr "Teammitglieder einladen"
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Invite organisation members"
+msgstr ""
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Invite team members to collaborate"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invited At"
 msgstr "Eingeladen am"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
 msgid "Invoice"
 msgstr "Rechnung"
 
@@ -3435,6 +3823,10 @@ msgstr "Es ist entscheidend, dass Sie Ihre Kontaktinformationen, insbesondere Ih
 msgid "It looks like {0} hasn't added any documents to their profile yet."
 msgstr "Es sieht so aus, als ob {0} noch keine Dokumente zu ihrem Profil hinzugefügt hat."
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "It looks like we ran into an issue!"
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
 msgid "It seems that the provided token has expired. We've just sent you another token, please check your email and try again."
 msgstr "Es scheint, dass das bereitgestellte Token abgelaufen ist. Wir haben Ihnen gerade ein weiteres Token gesendet, bitte überprüfen Sie Ihre E-Mails und versuchen Sie es erneut."
@@ -3451,9 +3843,14 @@ msgstr "Es ist momentan nicht Ihre Runde zum Unterschreiben. Bitte schauen Sie b
 msgid "It's currently not your turn to sign. You will receive an email with instructions once it's your turn to sign the document."
 msgstr "Es ist derzeit nicht deine Reihe zu unterschreiben. Du erhältst eine E-Mail mit Anweisungen, sobald es deine Reihe ist, das Dokument zu unterschreiben."
 
-#: packages/email/templates/team-invite.tsx
-msgid "Join {teamName} on Documenso"
-msgstr "Tritt {teamName} auf Documenso bei"
+#: packages/email/templates/organisation-invite.tsx
+msgid "Join {organisationName} on Documenso"
+msgstr ""
+
+#. placeholder {0}: DateTime.fromJSDate(team.createdAt).toRelative({ style: 'short' })
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Joined {0}"
+msgstr ""
 
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
@@ -3463,6 +3860,7 @@ msgstr "Tritt {teamName} auf Documenso bei"
 msgid "Label"
 msgstr "Beschriftung"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
@@ -3487,8 +3885,7 @@ msgstr "Die letzten 7 Tage"
 msgid "Last modified"
 msgstr "Zuletzt geändert"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Last updated"
 msgstr "Zuletzt aktualisiert"
 
@@ -3508,14 +3905,20 @@ msgstr "Zuletzt verwendet"
 msgid "Leaderboard"
 msgstr "Bestenliste"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
 msgid "Leave"
 msgstr "Verlassen"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "Leave team"
-msgstr "Team verlassen"
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Leave blank to inherit from the organisation."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "Leave organisation"
+msgstr ""
 
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Legality of Electronic Signatures"
@@ -3529,12 +3932,11 @@ msgstr "Lichtmodus"
 msgid "Like to have your own public profile with agreements?"
 msgstr "Möchten Sie Ihr eigenes öffentliches Profil mit Vereinbarungen haben?"
 
-#: packages/email/templates/team-transfer-request.tsx
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Link expires in 1 hour."
 msgstr "Link läuft in 1 Stunde ab."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Link template"
 msgstr "Vorlage verlinken"
 
@@ -3544,7 +3946,6 @@ msgstr "Links generiert"
 
 #. placeholder {0}: webhook.eventTriggers .map((trigger) => toFriendlyWebhookEventName(trigger)) .join(', ')
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "Listening to {0}"
 msgstr "Anhören von {0}"
 
@@ -3553,6 +3954,7 @@ msgid "Load older activity"
 msgstr "Ältere Aktivitäten laden"
 
 #: apps/remix/app/components/general/skeletons/document-edit-skeleton.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: packages/ui/primitives/pdf-viewer.tsx
 msgid "Loading document..."
 msgstr "Lade Dokument..."
@@ -3562,11 +3964,6 @@ msgstr "Lade Dokument..."
 msgid "Loading Document..."
 msgstr "Dokument wird geladen..."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Loading teams..."
-msgstr "Teams werden geladen..."
-
 #: apps/remix/app/components/general/document/document-page-view-recent-activity.tsx
 msgid "Loading..."
 msgstr "Wird geladen..."
@@ -3577,7 +3974,9 @@ msgstr "Wird geladen..."
 msgid "Login"
 msgstr "Anmelden"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Manage"
 msgstr "Verwalten"
 
@@ -3586,16 +3985,19 @@ msgstr "Verwalten"
 msgid "Manage {0}'s profile"
 msgstr "Verwalten Sie das Profil von {0}"
 
-#: apps/remix/app/routes/_authenticated+/settings+/teams.tsx
-msgid "Manage all teams you are currently associated with."
-msgstr "Verwalten Sie alle Teams, mit denen Sie derzeit verbunden sind."
+#: apps/remix/app/routes/_authenticated+/settings+/organisations.tsx
+msgid "Manage all organisations you are currently associated with."
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Manage all subscription claims"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Manage and view template"
 msgstr "Vorlage verwalten und anzeigen"
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
 msgid "Manage billing"
 msgstr "Rechnungsmanagement"
 
@@ -3611,42 +4013,69 @@ msgstr "Direktlink verwalten"
 msgid "Manage documents"
 msgstr "Dokumente verwalten"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage organisation"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Manage organisations"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security._index.tsx
 msgid "Manage passkeys"
 msgstr "Passkeys verwalten"
 
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Manage permissions and access controls"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 msgid "Manage subscription"
 msgstr "Abonnement verwalten"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-msgid "Manage Subscription"
-msgstr "Abonnement verwalten"
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage the {0} organisation"
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "Manage subscriptions"
-msgstr "Abonnements verwalten"
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage the {0} organisation subscription"
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Manage team subscription."
-msgstr "Teamabonnement verwalten."
-
-#: apps/remix/app/components/general/menu-switcher.tsx
-msgid "Manage teams"
-msgstr "Teams verwalten"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups._index.tsx
+msgid "Manage the custom groups of members for your organisation."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "Manage the direct link signing for this template"
 msgstr "Die direkte Linkunterzeichnung für diese Vorlage verwalten"
 
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
+msgid "Manage the groups assigned to this team."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+msgid "Manage the members of your team."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 msgid "Manage the members or invite new members."
 msgstr "Die Mitglieder verwalten oder neue Mitglieder einladen."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+msgid "Manage the teams in this organisation."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/users._index.tsx
 msgid "Manage users"
 msgstr "Benutzer verwalten"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Manage your organisation group settings."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.passkeys.tsx
 msgid "Manage your passkeys."
 msgstr "Verwalten Sie Ihre Passkeys."
@@ -3655,7 +4084,8 @@ msgstr "Verwalten Sie Ihre Passkeys."
 msgid "Manage your site settings here"
 msgstr "Verwalten Sie hier Ihre Seiteneinstellungen"
 
-#: packages/lib/constants/teams.ts
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Manager"
 msgstr "Manager"
 
@@ -3684,18 +4114,33 @@ msgstr "Max"
 msgid "Maximum file size: 4MB. Maximum 100 rows per upload. Blank values will use template defaults."
 msgstr "Maximale Dateigröße: 4MB. Maximal 100 Zeilen pro Upload. Leere Werte verwenden die Vorlagenstandards."
 
-#: packages/lib/constants/teams.ts
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Member"
 msgstr "Mitglied"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Member Count"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
 msgid "Member Since"
 msgstr "Mitglied seit"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
 msgid "Members"
 msgstr "Mitglieder"
 
@@ -3714,8 +4159,12 @@ msgstr "Min"
 msgid "Modify recipients"
 msgstr "Empfänger ändern"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Modify the details of the subscription claim."
+msgstr ""
+
 #: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Monthly"
 msgstr "Monatlich"
 
@@ -3728,9 +4177,7 @@ msgid "Monthly Active Users: Users that had at least one of their documents comp
 msgstr "Monatlich aktive Benutzer: Benutzer, die mindestens eines ihrer Dokumente abgeschlossen haben"
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "Move"
 msgstr "Verschieben"
 
@@ -3742,36 +4189,18 @@ msgstr "\"{templateTitle}\" in einen Ordner verschieben"
 msgid "Move Document to Folder"
 msgstr "Dokument in Ordner verschieben"
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Move Document to Team"
-msgstr "Dokument in Team verschieben"
-
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 msgid "Move Template to Folder"
 msgstr "Vorlage in Ordner verschieben"
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Move Template to Team"
-msgstr "Vorlage in Team verschieben"
-
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
-#: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
-msgid "Move to Team"
-msgstr "In Team verschieben"
-
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Moving..."
-msgstr "Verschieben..."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "My templates"
-msgstr "Meine Vorlagen"
+#: packages/ui/components/document/document-global-auth-access-select.tsx
+msgid "Multiple access methods can be selected."
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table.tsx
@@ -3779,9 +4208,11 @@ msgstr "Meine Vorlagen"
 #: apps/remix/app/components/tables/admin-leaderboard-table.tsx
 #: apps/remix/app/components/tables/admin-document-recipient-item-table.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-name-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
@@ -3799,6 +4230,10 @@ msgstr "Meine Vorlagen"
 msgid "Name"
 msgstr "Name"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Name is required"
+msgstr ""
+
 #: apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
 msgid "Need to sign documents?"
 msgstr "Müssen Dokumente signieren?"
@@ -3827,18 +4262,16 @@ msgstr "Nie ablaufen"
 msgid "New Password"
 msgstr "Neues Passwort"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "New team owner"
-msgstr "Neuer Teamowner"
-
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
 msgid "New Template"
 msgstr "Neue Vorlage"
 
-#: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: packages/ui/primitives/signature-pad/signature-pad-dialog.tsx
 msgid "Next"
 msgstr "Nächster"
@@ -3847,6 +4280,11 @@ msgstr "Nächster"
 msgid "Next field"
 msgstr "Nächstes Feld"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "No"
+msgstr ""
+
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "No active drafts"
 msgstr "Keine aktiven Entwürfe"
@@ -3856,9 +4294,9 @@ msgstr "Keine aktiven Entwürfe"
 msgid "No further action is required from you at this time."
 msgstr "Es sind derzeit keine weiteren Maßnahmen Ihrerseits erforderlich."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "No payment required"
-msgstr "Keine Zahlung erforderlich"
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "No organisations found"
+msgstr ""
 
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
 msgid "No public profile templates found"
@@ -3890,8 +4328,6 @@ msgid "No recipients with this role"
 msgstr "Keine Empfänger mit dieser Rolle"
 
 #: packages/ui/components/document/document-global-auth-action-select.tsx
-#: packages/ui/components/document/document-global-auth-action-select.tsx
-#: packages/ui/components/document/document-global-auth-access-select.tsx
 #: packages/ui/components/document/document-global-auth-access-select.tsx
 msgid "No restrictions"
 msgstr "Keine Einschränkungen"
@@ -3908,6 +4344,18 @@ msgstr "Keine Ergebnisse gefunden."
 msgid "No signature field found"
 msgstr "Kein Unterschriftsfeld gefunden"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "No Stripe customer attached"
+msgstr ""
+
+#: apps/remix/app/components/tables/team-groups-table.tsx
+msgid "No team groups found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "No teams yet"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "No valid direct templates found"
 msgstr "Keine gültigen direkten Vorlagen gefunden"
@@ -3926,6 +4374,7 @@ msgstr "Kein Wert gefunden."
 msgid "No worries, it happens! Enter your email and we'll email you a special link to reset your password."
 msgstr "Keine Sorge, das passiert! Geben Sie Ihre E-Mail ein, und wir senden Ihnen einen speziellen Link zum Zurücksetzen Ihres Passworts."
 
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/lib/constants/document.ts
 msgid "None"
@@ -3951,6 +4400,16 @@ msgstr "Nummer"
 msgid "Number format"
 msgstr "Zahlenformat"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Number of members allowed. 0 = Unlimited"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Number of teams allowed. 0 = Unlimited"
+msgstr ""
+
 #. placeholder {0}: document.team?.name
 #: apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
 msgid "on behalf of \"{0}\" has invited you to approve this document"
@@ -3975,17 +4434,15 @@ msgstr "im Auftrag von \"{0}\" hat Sie eingeladen, dieses Dokument anzusehen"
 msgid "On this page, you can create a new webhook."
 msgstr "Auf dieser Seite können Sie einen neuen Webhook erstellen."
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "On this page, you can create and manage API tokens. See our <0>Documentation</0> for more information."
 msgstr "Auf dieser Seite können Sie API-Token erstellen und verwalten. Weitere Informationen finden Sie in unserer <0>Dokumentation</0>."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "On this page, you can create new Webhooks and manage the existing ones."
 msgstr "Auf dieser Seite können Sie neue Webhooks erstellen und die vorhandenen verwalten."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "On this page, you can edit the webhook and its settings."
 msgstr "Auf dieser Seite können Sie den Webhook und seine Einstellungen bearbeiten."
 
@@ -4005,18 +4462,18 @@ msgstr "Sobald Sie den QR-Code gescannt oder den Code manuell eingegeben haben,
 msgid "Once your template is set up, share the link anywhere you want. The person who opens the link will be able to enter their information in the direct link recipient field and complete any other fields assigned to them."
 msgstr "Sobald Ihre Vorlage eingerichtet ist, teilen Sie den Link überall, wo Sie möchten. Die Person, die den Link öffnet, kann ihre Informationen im Feld für direkte Empfänger eingeben und alle anderen ihr zugewiesenen Felder ausfüllen."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "One of the documents in the current bundle has a signing role that is not compatible with the current signing experience."
+msgstr ""
+
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Only admins can access and view the document"
 msgstr "Nur Administratoren können auf das Dokument zugreifen und es anzeigen"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Only managers and above can access and view the document"
 msgstr "Nur Manager und darüber können auf das Dokument zugreifen und es anzeigen"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Only subscribers can have a username shorter than 6 characters"
-msgstr "Nur Abonnenten können einen Benutzernamen mit weniger als 6 Zeichen haben"
-
 #: apps/remix/app/routes/_profile+/_layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
@@ -4036,15 +4493,131 @@ msgstr "Oder"
 msgid "Or continue with"
 msgstr "Oder fahren Sie fort mit"
 
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "Organisation"
+msgstr ""
+
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Admin"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Organisation created"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Organisation group not found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Organisation Group Settings"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation has been updated successfully"
+msgstr ""
+
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "Organisation invitation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Organisation invitations have been sent."
+msgstr ""
+
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Manager"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Member"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation Members"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Organisation Name"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation not found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Organisation Preferences"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Organisation role"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Organisation Role"
+msgstr ""
+
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Organisation settings"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+msgid "Organisation Settings"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation Teams"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Organisation URL"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/routes/_authenticated+/settings+/organisations.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+#: apps/remix/app/components/general/settings-nav-mobile.tsx
+#: apps/remix/app/components/general/settings-nav-desktop.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Organisations"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "Organisations that the user is a member of."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Organise your members into groups which can be assigned to teams"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Organize your documents and templates"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Otherwise, the document will be created as a draft."
 msgstr "Andernfalls wird das Dokument als Entwurf erstellt."
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Owner"
 msgstr "Besitzer"
 
@@ -4059,10 +4632,7 @@ msgstr "Seite {0} von {1}"
 msgid "Page {0} of {numPages}"
 msgstr "Seite {0} von {numPages}"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "Paid"
-msgstr "Bezahlt"
-
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/forms/signin.tsx
 msgid "Passkey"
 msgstr "Passkey"
@@ -4105,12 +4675,18 @@ msgid "Passkeys are not supported on this browser"
 msgstr "Passkeys werden von diesem Browser nicht unterstützt"
 
 #: apps/remix/app/components/general/app-command-menu.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/forms/signin.tsx
 #: apps/remix/app/components/forms/reset-password.tsx
 msgid "Password"
 msgstr "Passwort"
 
+#: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
+msgid "Password Re-Authentication"
+msgstr ""
+
 #: packages/email/templates/forgot-password.tsx
 msgid "Password Reset Requested"
 msgstr "Passwortzurücksetzung angefordert"
@@ -4133,21 +4709,12 @@ msgstr "Passwort aktualisiert"
 msgid "Password updated!"
 msgstr "Passwort aktualisiert!"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "Pay"
-msgstr "Bezahle"
-
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Payment is required to finalise the creation of your team."
-msgstr "Zahlung ist erforderlich, um die Erstellung Ihres Teams abzuschließen."
-
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Payment overdue"
 msgstr "Zahlung überfällig"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
@@ -4168,22 +4735,36 @@ msgstr "Ausstehende Dokumente"
 msgid "Pending Documents"
 msgstr "Ausstehende Dokumente"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "Pending invitations"
 msgstr "Ausstehende Einladungen"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "Pending team deleted."
-msgstr "Ausstehendes Team gelöscht."
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "per month"
+msgstr ""
 
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "per year"
+msgstr ""
+
+#: apps/remix/app/components/tables/user-organisations-table.tsx
 msgid "Personal"
 msgstr "Persönlich"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 msgid "Personal Account"
 msgstr "Persönliches Konto"
 
+#: apps/remix/app/routes/_authenticated+/inbox.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/menu-switcher.tsx
+msgid "Personal Inbox"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
 msgid "Pick a number"
 msgstr "Wählen Sie eine Zahl"
@@ -4223,7 +4804,7 @@ msgstr "Bitte {recipientActionVerb} dieses Dokument, das von deiner direkten Vor
 msgid "Please {recipientActionVerb} your document"
 msgstr "Bitte {recipientActionVerb} dein Dokument"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Please check the CSV file and make sure it is according to our format"
 msgstr "Bitte prüfen Sie die CSV-Datei und stellen Sie sicher, dass sie unserem Format entspricht"
 
@@ -4256,6 +4837,10 @@ msgstr "Bitte bestätige deine E-Mail-Adresse"
 msgid "Please contact support if you would like to revert this action."
 msgstr "Bitte kontaktieren Sie den Support, wenn Sie diese Aktion rückgängig machen möchten."
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Please contact the site owner for further assistance."
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "Please enter a meaningful name for your token. This will help you identify it later."
 msgstr "Bitte geben Sie einen aussagekräftigen Namen für Ihr Token ein. Dies wird Ihnen helfen, es später zu identifizieren."
@@ -4341,17 +4926,25 @@ msgstr "Bitte {0} eingeben, um zu bestätigen"
 msgid "Please type <0>{0}</0> to confirm."
 msgstr "Bitte geben Sie <0>{0}</0> ein, um zu bestätigen."
 
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Please upload a logo"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
 msgid "Pre-formatted CSV template with example data."
 msgstr "Vorformatiertes CSV-Template mit Beispieldaten."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/components/general/settings-nav-mobile.tsx
+#: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Preview"
 msgstr "Vorschau"
 
@@ -4379,11 +4972,11 @@ msgstr "Fortfahren"
 msgid "Profile"
 msgstr "Profil"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Profile is currently <0>hidden</0>."
 msgstr "Profil ist derzeit <0>versteckt</0>."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Profile is currently <0>visible</0>."
 msgstr "Profil ist derzeit <0>sichtbar</0>."
 
@@ -4392,12 +4985,16 @@ msgstr "Profil ist derzeit <0>sichtbar</0>."
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Progress"
+msgstr ""
+
 #: apps/remix/app/components/tables/templates-table.tsx
 #: apps/remix/app/components/general/template/template-type.tsx
 msgid "Public"
 msgstr "Öffentlich"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -4409,10 +5006,6 @@ msgstr "Öffentliches Profil"
 msgid "Public profile URL"
 msgstr "Öffentlicher Profil-URL"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Public profile username"
-msgstr "Öffentlicher Profil-Benutzername"
-
 #: apps/remix/app/components/tables/templates-table.tsx
 msgid "Public templates are connected to your public profile. Any modifications to public templates will also appear in your public profile."
 msgstr "Öffentliche Vorlagen sind mit Ihrem öffentlichen Profil verbunden. Änderungen an öffentlichen Vorlagen erscheinen auch in Ihrem öffentlichen Profil."
@@ -4482,6 +5075,7 @@ msgstr "Aktuelle Aktivitäten"
 msgid "Recent documents"
 msgstr "Neueste Dokumente"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
@@ -4562,6 +5156,7 @@ msgstr "Dokument Ablehnen"
 #: apps/remix/app/components/general/stack-avatars-with-tooltip.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/document.ts
 msgid "Rejected"
 msgstr "Abgelehnt"
@@ -4596,43 +5191,47 @@ msgstr "Erinnerung: Bitte {recipientActionVerb} dieses Dokument"
 msgid "Reminder: Please {recipientActionVerb} your document"
 msgstr "Erinnerung: Bitte {recipientActionVerb} dein Dokument"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-field-container.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: packages/ui/primitives/document-flow/field-item.tsx
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "Remove"
 msgstr "Entfernen"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+msgid "Remove organisation group"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+msgid "Remove organisation member"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 msgid "Remove team email"
 msgstr "Team-E-Mail entfernen"
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "Remove team member"
 msgstr "Teammitglied entfernen"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Renews: {formattedDate}"
-msgstr "Erneuert: {formattedDate}"
-
 #: apps/remix/app/components/forms/reset-password.tsx
 #: apps/remix/app/components/forms/password.tsx
 msgid "Repeat Password"
 msgstr "Passwort wiederholen"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Request transfer"
-msgstr "Übertragung anfordern"
-
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx
@@ -4645,7 +5244,7 @@ msgstr "Pflichtfeld"
 msgid "Reseal document"
 msgstr "Dokument wieder versiegeln"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Resend"
@@ -4661,6 +5260,7 @@ msgstr "Bestätigung erneut senden"
 
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 msgid "Reset"
 msgstr "Zurücksetzen"
 
@@ -4679,11 +5279,11 @@ msgstr "Passwort zurücksetzen"
 msgid "Resetting Password..."
 msgstr "Passwort wird zurückgesetzt..."
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Resolve"
 msgstr "Zahlung klären"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Resolve payment"
 msgstr "Zahlung klären"
 
@@ -4691,6 +5291,10 @@ msgstr "Zahlung klären"
 msgid "Rest assured, your document is strictly confidential and will never be shared. Only your signing experience will be highlighted. Share your personalized signing card to showcase your signature!"
 msgstr "Seien Sie versichert, Ihr Dokument ist streng vertraulich und wird niemals geteilt. Nur Ihre Unterzeichnungserfahrung wird hervorgehoben. Teilen Sie Ihre personalisierte Unterschriftkarte, um Ihre Unterschrift zu präsentieren!"
 
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
+msgid "Restricted Access"
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Retention of Documents"
 msgstr "Aufbewahrung von Dokumenten"
@@ -4701,16 +5305,12 @@ msgstr "Wiederholen"
 
 #: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Return"
 msgstr "Zurück"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "Return to Dashboard"
-msgstr "Zurück zum Dashboard"
-
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Return to Home"
 msgstr "Zurück zur Startseite"
 
@@ -4727,13 +5327,17 @@ msgstr "Zugriff widerrufen"
 msgid "Revoke access"
 msgstr "Zugriff widerrufen"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
 msgid "Role"
 msgstr "Rolle"
 
@@ -4764,13 +5368,23 @@ msgstr "Speichern"
 msgid "Save Template"
 msgstr "Vorlage speichern"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
 #: apps/remix/app/components/tables/documents-table-sender-filter.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 msgid "Search"
 msgstr "Suchen"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Search and manage all organisations"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Search by claim ID or name"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 msgid "Search by document title"
 msgstr "Nach Dokumenttitel suchen"
@@ -4780,6 +5394,10 @@ msgstr "Nach Dokumenttitel suchen"
 msgid "Search by name or email"
 msgstr "Nach Name oder E-Mail suchen"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Search by organisation ID, name, customer ID or owner email"
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-search.tsx
 msgid "Search documents..."
 msgstr "Dokumente suchen..."
@@ -4788,7 +5406,6 @@ msgstr "Dokumente suchen..."
 msgid "Search languages..."
 msgstr "Sprachen suchen..."
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Secret"
 msgstr "Geheim"
@@ -4813,18 +5430,17 @@ msgstr "Auswählen"
 msgid "Select a folder to move this document to."
 msgstr "Wählen Sie einen Ordner, um dieses Dokument zu verschieben."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Select a team"
-msgstr "Wählen Sie ein Team aus"
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Select a plan"
+msgstr ""
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Select a team to move this document to. This action cannot be undone."
-msgstr "Wählen Sie ein Team aus, um dieses Dokument dorthin zu verschieben. Diese Aktion kann nicht rückgängig gemacht werden."
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Select a plan to continue"
+msgstr ""
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Select a team to move this template to. This action cannot be undone."
-msgstr "Wählen Sie ein Team aus, um diese Vorlage dorthin zu verschieben. Diese Aktion kann nicht rückgängig gemacht werden."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Select a team to view its dashboard"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Select a template you'd like to display on your public profile"
@@ -4834,22 +5450,70 @@ msgstr "Wählen Sie eine Vorlage aus, die Sie in Ihrem öffentlichen Profil anze
 msgid "Select a template you'd like to display on your team's public profile"
 msgstr "Wählen Sie eine Vorlage aus, die Sie im öffentlichen Profil Ihres Teams anzeigen möchten"
 
+#: packages/ui/components/document/document-global-auth-access-select.tsx
+msgid "Select access methods"
+msgstr ""
+
 #: packages/ui/primitives/combobox.tsx
 msgid "Select an option"
 msgstr "Option auswählen"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Select an organisation to view teams"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
 msgid "Select at least"
 msgstr "Wählen Sie mindestens"
 
+#: packages/ui/components/recipient/recipient-action-auth-select.tsx
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "Select authentication methods"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/dropdown-field.tsx
 msgid "Select default option"
 msgstr "Standardoption auswählen"
 
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select groups"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select groups to add to this team"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Select members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select members or groups of members to add to the team."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Select members to add to this team"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 msgid "Select passkey"
 msgstr "Passkey auswählen"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Select signature types"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Select the members to add to this group"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Select the members to include in this group"
+msgstr ""
+
 #: apps/remix/app/components/general/webhook-multiselect-combobox.tsx
 #: apps/remix/app/components/general/webhook-multiselect-combobox.tsx
 msgid "Select triggers"
@@ -4898,7 +5562,7 @@ msgstr "Dokumente im Namen des Teams über die E-Mail-Adresse senden"
 msgid "Send documents to recipients immediately"
 msgstr "Dokumente sofort an Empfänger senden"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Send on Behalf of Team"
 msgstr "Im Namen des Teams senden"
 
@@ -4918,6 +5582,7 @@ msgstr "E-Mail über Unterzeichnungsanfrage des Empfängers senden"
 msgid "Send reminder"
 msgstr "Erinnerung senden"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 msgid "Sender"
 msgstr "Absender"
@@ -4947,7 +5612,10 @@ msgstr "Richten Sie Ihre Dokumenteigenschaften und Empfängerinformationen ein"
 msgid "Set up your template properties and recipient information"
 msgstr "Richten Sie Ihre Vorlageneigenschaften und Empfängerinformationen ein"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/routes/_authenticated+/settings+/_layout.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -4980,7 +5648,7 @@ msgstr "Link teilen"
 msgid "Share your signing experience!"
 msgstr "Teilen Sie Ihre Unterzeichnungserfahrung!"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Show"
 msgstr "Anzeigen"
 
@@ -4993,15 +5661,12 @@ msgstr "Zusätzliche Informationen anzeigen"
 msgid "Show advanced settings"
 msgstr "Erweiterte Einstellungen anzeigen"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Show templates in your public profile for your audience to sign and get started quickly"
 msgstr "Vorlagen in Ihrem öffentlichen Profil anzeigen, damit Ihre Zielgruppe unterschreiben und schnell loslegen kann"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Show templates in your team public profile for your audience to sign and get started quickly"
-msgstr "Vorlagen in Ihrem Team-Öffentliches Profil anzeigen, damit Ihre Zielgruppe unterschreiben und schnell loslegen kann"
-
 #: apps/remix/app/routes/_profile+/p.$url.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/user-profile-timur.tsx
@@ -5010,6 +5675,7 @@ msgstr "Vorlagen in Ihrem Team-Öffentliches Profil anzeigen, damit Ihre Zielgru
 #: apps/remix/app/components/general/document-signing/document-signing-name-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 #: apps/remix/app/components/general/document/document-page-view-button.tsx
 #: packages/lib/constants/recipient-roles.ts
@@ -5030,6 +5696,7 @@ msgstr "Unterzeichnen als<0>{0} <1>({1})</1></0>"
 
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Sign document"
 msgstr "Dokument unterschreiben"
 
@@ -5038,6 +5705,11 @@ msgstr "Dokument unterschreiben"
 msgid "Sign Document"
 msgstr "Dokument signieren"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Sign Documents"
+msgstr ""
+
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 msgid "Sign field"
 msgstr "Unterzeichnen-Feld"
@@ -5053,9 +5725,11 @@ msgid "Sign In"
 msgstr "Anmelden"
 
 #: apps/remix/app/routes/_unauthenticated+/signin.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 msgid "Sign in to your account"
 msgstr "Melden Sie sich bei Ihrem Konto an"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 msgid "Sign Out"
@@ -5063,6 +5737,7 @@ msgstr "Ausloggen"
 
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Sign the document to complete the process."
 msgstr "Unterschreiben Sie das Dokument, um den Vorgang abzuschließen."
 
@@ -5086,6 +5761,7 @@ msgstr "Registrieren mit OIDC"
 #: apps/remix/app/components/forms/profile.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
 #: packages/ui/primitives/document-flow/types.ts
 #: packages/ui/primitives/document-flow/add-fields.tsx
@@ -5208,24 +5884,25 @@ msgstr "Einige Unterzeichner haben noch kein Unterschriftsfeld zugewiesen bekomm
 
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/share-document-download-button.tsx
-#: apps/remix/app/components/general/billing-portal-button.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-page.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-account.tsx
 #: apps/remix/app/components/general/document/document-page-view-dropdown.tsx
@@ -5235,7 +5912,6 @@ msgstr "Einige Unterzeichner haben noch kein Unterschriftsfeld zugewiesen bekomm
 #: apps/remix/app/components/general/document/document-audit-log-download-button.tsx
 #: apps/remix/app/components/general/direct-template/direct-template-signing-auth-page.tsx
 #: apps/remix/app/components/general/direct-template/direct-template-page.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
@@ -5243,11 +5919,11 @@ msgstr "Einige Unterzeichner haben noch kein Unterschriftsfeld zugewiesen bekomm
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
@@ -5255,11 +5931,6 @@ msgstr "Einige Unterzeichner haben noch kein Unterschriftsfeld zugewiesen bekomm
 msgid "Something went wrong"
 msgstr "Etwas ist schief gelaufen"
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Something went wrong while attempting to transfer the ownership of team <0>{0}</0> to your. Please try again later or contact support."
-msgstr "Etwas ist schiefgelaufen beim Versuch, das Eigentum des Teams <0>{0}</0> auf Ihre zu übertragen. Bitte versuchen Sie es später erneut oder kontaktieren Sie den Support."
-
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "Something went wrong while attempting to verify your email address for <0>{0}</0>. Please try again later."
@@ -5282,7 +5953,8 @@ msgstr "Etwas ist schiefgelaufen beim Senden der Bestätigungs-E-Mail."
 msgid "Something went wrong while updating the team billing subscription, please contact support."
 msgstr "Etwas ist schiefgelaufen beim Aktualisieren des Abonnements für die Team-Zahlung. Bitte kontaktieren Sie den Support."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Something went wrong!"
 msgstr "Etwas ist schiefgelaufen!"
 
@@ -5307,6 +5979,7 @@ msgstr "Entschuldigung, wir konnten die Prüfprotokolle nicht herunterladen. Bit
 msgid "Sorry, we were unable to download the certificate. Please try again later."
 msgstr "Entschuldigung, wir konnten das Zertifikat nicht herunterladen. Bitte versuchen Sie es später erneut."
 
+#: apps/remix/app/components/tables/team-members-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Source"
 msgstr "Quelle"
@@ -5316,10 +5989,11 @@ msgid "Stats"
 msgstr "Statistiken"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Status"
 msgstr "Status"
@@ -5328,48 +6002,78 @@ msgstr "Status"
 msgid "Step <0>{step} of {maxStep}</0>"
 msgstr "Schritt <0>{step} von {maxStep}</0>"
 
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "Stripe"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Stripe customer created successfully"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Stripe Customer ID"
+msgstr ""
+
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Subject <0>(Optional)</0>"
 msgstr "Betreff <0>(Optional)</0>"
 
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
-msgid "Subscriptions"
-msgstr "Abonnements"
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Subscription claim created successfully."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Subscription claim deleted successfully."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Subscription claim updated successfully."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Subscription Claims"
+msgstr ""
 
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/general/verify-email-banner.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
@@ -5378,6 +6082,15 @@ msgstr "Abonnements"
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 msgid "Success"
 msgstr "Erfolg"
 
@@ -5401,8 +6114,9 @@ msgstr "Systemanforderungen"
 msgid "System Theme"
 msgstr "Systemthema"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table.tsx
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
 msgid "Team"
 msgstr "Team"
 
@@ -5411,9 +6125,18 @@ msgstr "Team"
 msgid "Team \"{0}\" has been deleted on Documenso"
 msgstr "Team \"{0}\" wurde auf Documenso gelöscht"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Team checkout"
-msgstr "Teameinkaufs-Prüfung"
+#: packages/lib/constants/teams-translations.ts
+msgid "Team Admin"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Team Assignments"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Team Count"
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
@@ -5457,25 +6180,34 @@ msgstr "Team-E-Mail verifiziert!"
 msgid "Team email was updated."
 msgstr "Team-E-Mail wurde aktualisiert."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "Team invitation"
-msgstr "Teameinladung"
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
+msgid "Team Groups"
+msgstr ""
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "Team invitations have been sent."
-msgstr "Teameinladungen wurden gesendet."
+#: packages/lib/constants/teams-translations.ts
+msgid "Team Manager"
+msgstr ""
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: packages/lib/constants/teams-translations.ts
 msgid "Team Member"
 msgstr "Teammitglied"
 
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+msgid "Team Members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Team members have been added."
+msgstr ""
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Team Name"
 msgstr "Teamname"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "Team not found"
 msgstr "Team nicht gefunden"
@@ -5488,27 +6220,17 @@ msgstr "Nur Team"
 msgid "Team only templates are not linked anywhere and are visible only to your team."
 msgstr "Nur Teamvorlagen sind nirgendwo verlinkt und nur für Ihr Team sichtbar."
 
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transfer"
-msgstr "Team-Eigentumsübertragung"
-
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transfer already completed!"
-msgstr "Team-Eigentumsübertragung bereits abgeschlossen!"
-
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transferred!"
-msgstr "Team-Eigentum übertragen!"
-
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Team Preferences"
 msgstr "Teampräferenzen"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Team Public Profile"
-msgstr "Öffentliches Profil des Teams"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Team Role"
+msgstr ""
 
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 msgid "Team settings"
 msgstr "Teameinstellungen"
 
@@ -5516,44 +6238,37 @@ msgstr "Teameinstellungen"
 msgid "Team Settings"
 msgstr "Team-Einstellungen"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Team templates"
-msgstr "Teamvorlagen"
-
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "Team transfer in progress"
-msgstr "Teamübertragung im Gange"
-
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "Team transfer request expired"
-msgstr "Der Antrag auf Teamübertragung ist abgelaufen"
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Team url"
+msgstr ""
 
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Team URL"
 msgstr "Team-URL"
 
-#: apps/remix/app/routes/_authenticated+/settings+/teams.tsx
-#: apps/remix/app/components/general/settings-nav-mobile.tsx
-#: apps/remix/app/components/general/settings-nav-desktop.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
-#: apps/remix/app/components/general/app-nav-mobile.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 msgid "Teams"
 msgstr "Teams"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-msgid "Teams restricted"
-msgstr "Teams beschränkt"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Teams help you organise your work and collaborate with others. Create your first team to get started."
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Teams that this organisation group is currently assigned to"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Template"
 msgstr "Vorlage"
 
@@ -5586,14 +6301,9 @@ msgid "Template is using legacy field insertion"
 msgstr "Vorlage verwendet Altfeld-Integration"
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 msgid "Template moved"
 msgstr "Vorlage verschoben"
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Template not found or already associated with a team."
-msgstr "Vorlage nicht gefunden oder bereits mit einem Team verknüpft."
-
 #: apps/remix/app/components/general/template/template-edit-form.tsx
 msgid "Template saved"
 msgstr "Vorlage gespeichert"
@@ -5606,10 +6316,10 @@ msgstr "Vorlagentitel"
 msgid "Template updated successfully"
 msgstr "Vorlage erfolgreich aktualisiert"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -5641,6 +6351,10 @@ msgstr "Textausrichtung"
 msgid "Text Color"
 msgstr "Textfarbe"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Thank you for completing the signing process."
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Thank you for using Documenso to perform your electronic document signing. The purpose of this disclosure is to inform you about the process, legality, and your rights regarding the use of electronic signatures on our platform. By opting to use an electronic signature, you are agreeing to the terms and conditions outlined below."
 msgstr "Vielen Dank, dass Sie Documenso zur elektronischen Unterzeichnung Ihrer Dokumente verwenden. Der Zweck dieser Offenlegung besteht darin, Sie über den Prozess, die Rechtmäßigkeit und Ihre Rechte in Bezug auf die Verwendung elektronischer Unterschriften auf unserer Plattform zu informieren. Indem Sie sich entscheiden, eine elektronische Unterschrift zu verwenden, stimmen Sie den nachfolgend dargelegten Bedingungen zu."
@@ -5662,16 +6376,16 @@ msgid "The account has been enabled successfully."
 msgstr "Das Konto wurde erfolgreich aktiviert."
 
 #: packages/ui/components/recipient/recipient-action-auth-select.tsx
-msgid "The authentication required for recipients to sign fields"
-msgstr "Die Authentifizierung, die erforderlich ist, damit Empfänger Felder signieren"
+msgid "The authentication methods required for recipients to sign fields"
+msgstr ""
 
 #: packages/ui/components/document/document-global-auth-action-select.tsx
-msgid "The authentication required for recipients to sign the signature field."
-msgstr "Die Authentifizierung, die erforderlich ist, damit Empfänger das Signaturfeld signieren können."
+msgid "The authentication methods required for recipients to sign the signature field."
+msgstr ""
 
 #: packages/ui/components/document/document-global-auth-access-select.tsx
-msgid "The authentication required for recipients to view the document."
-msgstr "Die Authentifizierung, die erforderlich ist, damit Empfänger das Dokument anzeigen können."
+msgid "The authentication methods required for recipients to view the document."
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "The content to show in the banner, HTML is allowed"
@@ -5687,10 +6401,6 @@ msgstr "Der direkte Linkt wurde in die Zwischenablage kopiert"
 msgid "The document has been moved successfully."
 msgstr "Das Dokument wurde erfolgreich verschoben."
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "The document has been successfully moved to the selected team."
-msgstr "Das Dokument wurde erfolgreich in das ausgewählte Team verschoben."
-
 #: apps/remix/app/components/embed/authoring/configure-document-upload.tsx
 msgid "The document is already saved and cannot be changed."
 msgstr "Das Dokument ist bereits gespeichert und kann nicht geändert werden."
@@ -5760,17 +6470,30 @@ msgid "The following errors occurred:"
 msgstr "Die folgenden Fehler sind aufgetreten:"
 
 #: packages/email/templates/team-delete.tsx
-msgid "The following team has been deleted by its owner. You will no longer be able to access this team and its documents"
-msgstr "Das folgende Team wurde von seinem Besitzer gelöscht. Du kannst nicht mehr auf dieses Team und seine Dokumente zugreifen"
+msgid "The following team has been deleted. You will no longer be able to access this team and its documents"
+msgstr ""
 
-#: packages/email/templates/team-delete.tsx
-msgid "The following team has been deleted by you"
-msgstr "Das folgende Team wurde von dir gelöscht"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid ""
+"The organisation group you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "The ownership of team <0>{0}</0> has been successfully transferred to you."
-msgstr "Die Inhaberschaft des Teams <0>{0}</0> wurde erfolgreich auf Sie übertragen."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "The organisation role that will be applied to all members in this group."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid ""
+"The organisation you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid ""
+"The organisation you are looking for may have been removed, renamed or may have never\n"
+"                  existed."
+msgstr ""
 
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "The page you are looking for was moved, removed, renamed or might never have existed."
@@ -5820,10 +6543,6 @@ msgstr "Der Empfänger muss das Dokument unterschreiben, damit es abgeschlossen
 msgid "The recipient is required to view the document for it to be completed."
 msgstr "Der Empfänger muss das Dokument anzeigen, damit es abgeschlossen werden kann."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "The selected team member will receive an email which they must accept before the team is transferred"
-msgstr "Das ausgewählte Teammitglied erhält eine E-Mail, die es akzeptieren muss, bevor das Team übertragen wird"
-
 #: packages/ui/components/document/document-share-button.tsx
 msgid "The sharing link could not be created at this time. Please try again."
 msgstr "Der Freigabelink konnte in diesem Moment nicht erstellt werden. Bitte versuchen Sie es erneut."
@@ -5855,14 +6574,11 @@ msgstr "Das Seitenbanner ist eine Nachricht, die oben auf der Seite angezeigt wi
 msgid "The team email <0>{teamEmail}</0> has been removed from the following team"
 msgstr "Die Team-E-Mail <0>{teamEmail}</0> wurde aus dem folgenden Team entfernt"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "The team transfer invitation has been successfully deleted."
-msgstr "Die Einladung zur Teamübertragung wurde erfolgreich gelöscht."
-
-#. placeholder {0}: transferVerification.name
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "The team transfer request to <0>{0}</0> has expired."
-msgstr "Die Teamübertragungsanfrage an <0>{0}</0> ist abgelaufen."
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid ""
+"The team you are looking for may have been removed, renamed or may have never\n"
+"                  existed."
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "The team you are looking for may have been removed, renamed or may have never\n"
@@ -5873,10 +6589,6 @@ msgstr "Das Team, das Sie suchen, könnte entfernt, umbenannt oder nie existiert
 msgid "The template has been moved successfully."
 msgstr "Die Vorlage wurde erfolgreich verschoben."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "The template has been successfully moved to the selected team."
-msgstr "Die Vorlage wurde erfolgreich in das ausgewählte Team verschoben."
-
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "The template will be removed from your profile"
 msgstr "Die Vorlage wird von Ihrem Profil entfernt"
@@ -5902,17 +6614,21 @@ msgid "The types of signatures that recipients are allowed to use when signing t
 msgstr "Die Signaturtypen, die Empfänger beim Unterschreiben des Dokuments verwenden dürfen."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "The URL for Documenso to send webhook events to."
 msgstr "Die URL für Documenso, um Webhook-Ereignisse zu senden."
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid ""
+"The user you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 msgid "The webhook has been successfully deleted."
 msgstr "Das Webhook wurde erfolgreich gelöscht."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "The webhook has been updated successfully."
 msgstr "Der Webhook wurde erfolgreich aktualisiert."
 
@@ -5932,6 +6648,14 @@ msgstr "Es gibt noch keine abgeschlossenen Dokumente. Dokumente, die Sie erstell
 msgid "There was an error uploading your file. Please try again."
 msgstr "Beim Hochladen Ihrer Datei ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut."
 
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "These can be overriden by setting the authentication requirements directly on each recipient in the next step. Multiple methods can be selected."
+msgstr ""
+
+#: packages/ui/components/recipient/recipient-action-auth-select.tsx
+msgid "These will override any global settings. Multiple methods can be selected."
+msgstr ""
+
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 msgid "They have permission on your behalf to:"
 msgstr "Sie haben in Ihrem Namen die Erlaubnis, zu:"
@@ -5954,9 +6678,9 @@ msgstr "Diese Aktion ist nicht umkehrbar. Bitte seien Sie sicher."
 msgid "This action is reversible, but please be careful as the account may be affected permanently (e.g. their settings and contents not being restored properly)."
 msgstr "Diese Aktion ist umkehrbar, jedoch bitte seien Sie vorsichtig, da das Konto dauerhaft betroffen sein könnte (z.B. könnten deren Einstellungen und Inhalte nicht richtig wiederhergestellt werden)."
 
-#: packages/ui/components/document/document-global-auth-action-select.tsx
-msgid "This can be overriden by setting the authentication requirements directly on each recipient in the next step."
-msgstr "Dies kann überschrieben werden, indem die Authentifizierungsanforderungen im nächsten Schritt direkt für jeden Empfänger festgelegt werden."
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "This claim is locked and cannot be deleted."
+msgstr ""
 
 #: packages/email/template-components/template-document-super-delete.tsx
 msgid "This document can not be recovered, if you would like to dispute the reason for future documents please contact support."
@@ -5990,13 +6714,11 @@ msgstr "Dieses Dokument wurde vom Eigentümer storniert und steht anderen nicht
 msgid "This document has been cancelled by the owner."
 msgstr "Dieses Dokument wurde vom Eigentümer storniert."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document has been rejected by a recipient"
 msgstr "Dieses Dokument wurde von einem Empfänger abgelehnt"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document has been signed by all recipients"
 msgstr "Dieses Dokument wurde von allen Empfängern unterschrieben"
 
@@ -6004,8 +6726,7 @@ msgstr "Dieses Dokument wurde von allen Empfängern unterschrieben"
 msgid "This document is available in your Documenso account. You can view more details, recipients, and audit logs there."
 msgstr "Dieses Dokument ist in Ihrem Documenso-Konto verfügbar. Dort können Sie weitere Details, Empfänger und Protokolle einsehen."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document is currently a draft and has not been sent"
 msgstr "Dieses Dokument ist momentan ein Entwurf und wurde nicht gesendet"
 
@@ -6062,14 +6783,22 @@ msgstr "Dieser Ordnername ist bereits vergeben."
 msgid "This is how the document will reach the recipients once the document is ready for signing."
 msgstr "So wird das Dokument die Empfänger erreichen, sobald es zum Unterschreiben bereit ist."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "This is the claim that this organisation was initially created with. Any feature flag changes to this claim will be backported into this organisation."
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "This link is invalid or has expired. Please contact your team to resend a transfer request."
-msgstr "Dieser Link ist ungültig oder abgelaufen. Bitte kontaktieren Sie Ihr Team, um eine erneute Überweisungsanfrage zu senden."
+msgid "This link is invalid or has expired."
+msgstr ""
 
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "This link is invalid or has expired. Please contact your team to resend a verification."
 msgstr "Dieser Link ist ungültig oder abgelaufen. Bitte kontaktieren Sie Ihr Team, um eine neue Bestätigungsanfrage zu senden."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "This organisation, and any associated data will be permanently deleted."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "This passkey has already been registered."
 msgstr "Dieser Zugangsschlüssel wurde bereits registriert."
@@ -6078,10 +6807,6 @@ msgstr "Dieser Zugangsschlüssel wurde bereits registriert."
 msgid "This passkey is not configured for this application. Please login and add one in the user settings."
 msgstr "Dieser Passkey ist für diese Anwendung nicht konfiguriert. Bitte melden Sie sich an und fügen Sie einen in den Benutzereinstellungen hinzu."
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "This price includes minimum 5 seats."
-msgstr "Dieser Preis beinhaltet mindestens 5 Plätze."
-
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "This recipient can no longer be modified as they have signed a field, or completed the document."
 msgstr "Dieser Empfänger kann nicht mehr bearbeitet werden, da er ein Feld unterschrieben oder das Dokument abgeschlossen hat."
@@ -6106,23 +6831,20 @@ msgstr "Diese Vorlage konnte derzeit nicht gelöscht werden. Bitte versuchen Sie
 msgid "This template is using legacy field insertion, we recommend using the new field insertion method for more accurate results."
 msgstr "Diese Vorlage verwendet Altfeld-Integration, wir empfehlen das Verwenden der neuen Methode für genauere Ergebnisse."
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "This token is invalid or has expired. No action is needed."
 msgstr "Dieses Token ist ungültig oder abgelaufen. Es sind keine weiteren Maßnahmen erforderlich."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "This token is invalid or has expired. Please contact your team for a new invitation."
 msgstr "Dieser Token ist ungültig oder abgelaufen. Bitte kontaktieren Sie Ihr Team für eine neue Einladung."
 
 #: apps/remix/app/components/forms/team-update-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "This URL is already in use."
 msgstr "Diese URL wird bereits verwendet."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "This username has already been taken"
-msgstr "Dieser Benutzername ist bereits vergeben"
-
 #: packages/ui/components/document/document-email-checkboxes.tsx
 msgid "This will be sent to all recipients if a pending document has been deleted."
 msgstr "Dies wird an alle Empfänger gesendet, wenn ein ausstehendes Dokument gelöscht wurde."
@@ -6135,17 +6857,16 @@ msgstr "Dies wird an alle Empfänger gesendet, sobald das Dokument vollständig
 msgid "This will be sent to the document owner once the document has been fully completed."
 msgstr "Dies wird an den Dokumenteneigentümer gesendet, sobald das Dokument vollständig abgeschlossen wurde."
 
-#: packages/ui/components/recipient/recipient-action-auth-select.tsx
-msgid "This will override any global settings."
-msgstr "Dies überschreibt alle globalen Einstellungen."
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "This will ONLY backport feature flags which are set to true, anything disabled in the initial claim will not be backported"
+msgstr ""
 
 #: apps/remix/app/components/tables/internal-audit-log-table.tsx
 #: apps/remix/app/components/tables/document-logs-table.tsx
 msgid "Time"
 msgstr "Zeit"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Time zone"
 msgstr "Zeitzone"
 
@@ -6158,6 +6879,7 @@ msgstr "Zeitzone"
 
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 #: apps/remix/app/components/tables/templates-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-view.tsx
@@ -6169,7 +6891,7 @@ msgstr "Titel"
 msgid "Title cannot be empty"
 msgstr "Titel darf nicht leer sein"
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "To accept this invitation you must create an account."
 msgstr "Um diese Einladung anzunehmen, müssen Sie ein Konto erstellen."
 
@@ -6190,10 +6912,6 @@ msgstr "Um zu bestätigen, geben Sie bitte die E-Mail-Adresse des Kontos <0/>({0
 msgid "To confirm, please enter the reason"
 msgstr "Um zu bestätigen, geben Sie bitte den Grund ein"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "To decline this invitation you must create an account."
-msgstr "Um diese Einladung abzulehnen, müssen Sie ein Konto erstellen."
-
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "To enable two-factor authentication, scan the following QR code using your authenticator app."
 msgstr "Um die Zwei-Faktor-Authentifizierung zu aktivieren, scannen Sie den folgenden QR-Code mit Ihrer Authentifizierungs-App."
@@ -6222,11 +6940,11 @@ msgstr "Um unseren elektronischen Signaturdienst nutzen zu können, müssen Sie
 msgid "To view this document you need to be signed into your account, please sign in to continue."
 msgstr "Um dieses Dokument anzusehen, müssen Sie in Ihr Konto eingeloggt sein. Bitte melden Sie sich an, um fortzufahren."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Toggle the switch to hide your profile from the public."
 msgstr "Schalten Sie den Schalter um, um Ihr Profil vor der Öffentlichkeit zu verbergen."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Toggle the switch to show your profile to the public."
 msgstr "Schalten Sie den Schalter um, um Ihr Profil der Öffentlichkeit anzuzeigen."
 
@@ -6246,7 +6964,7 @@ msgstr "Token erstellt"
 msgid "Token deleted"
 msgstr "Token gelöscht"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Token doesn't have an expiration date"
 msgstr "Token hat kein Ablaufdatum"
 
@@ -6282,26 +7000,7 @@ msgstr "Gesamtanzahl der Unterzeichner, die sich angemeldet haben"
 msgid "Total Users"
 msgstr "Gesamtanzahl der Benutzer"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "transfer {teamName}"
-msgstr "übertragen {teamName}"
-
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Transfer ownership of this team to a selected team member."
-msgstr "Übertragen Sie die Inhaberschaft dieses Teams auf ein ausgewähltes Teammitglied."
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Transfer team"
-msgstr "Team übertragen"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-msgid "Transfer the ownership of the team to another team member."
-msgstr "Übertragen Sie das Eigentum des Teams auf ein anderes Teammitglied."
-
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Triggers"
 msgstr "Auslöser"
@@ -6368,11 +7067,11 @@ msgstr "Token kann nicht kopiert werden"
 msgid "Unable to create direct template access. Please try again later."
 msgstr "Direkter Zugriff auf die Vorlage kann nicht erstellt werden. Bitte versuche es später noch einmal."
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Unable to decline this team invitation at this time."
-msgstr "Zurzeit kann diese Teameinladung nicht abgelehnt werden."
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Unable to decline this invitation at this time."
+msgstr ""
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Unable to delete invitation. Please try again."
 msgstr "Einladung kann nicht gelöscht werden. Bitte versuchen Sie es erneut."
 
@@ -6384,9 +7083,9 @@ msgstr "Team konnte nicht gelöscht werden"
 msgid "Unable to disable two-factor authentication"
 msgstr "Zwei-Faktor-Authentifizierung kann nicht deaktiviert werden"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Unable to join this team at this time."
-msgstr "Zurzeit kann diesem Team nicht beigetreten werden."
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Unable to join this organisation at this time."
+msgstr ""
 
 #: apps/remix/app/components/general/document/document-page-view-recent-activity.tsx
 #: apps/remix/app/components/general/document/document-history-sheet.tsx
@@ -6409,7 +7108,7 @@ msgstr "Derzeit ist es nicht möglich, die E-Mail-Verifizierung zu entfernen. Bi
 msgid "Unable to remove team email at this time. Please try again."
 msgstr "Das Team-E-Mail kann zurzeit nicht entfernt werden. Bitte versuchen Sie es erneut."
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Unable to resend invitation. Please try again."
 msgstr "Einladung kann nicht erneut gesendet werden. Bitte versuchen Sie es erneut."
 
@@ -6431,7 +7130,10 @@ msgstr "Zwei-Faktor-Authentifizierung kann nicht eingerichtet werden"
 msgid "Unable to sign in"
 msgstr "Anmeldung nicht möglich"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 msgid "Unauthorized"
 msgstr "Nicht autorisiert"
@@ -6445,22 +7147,35 @@ msgstr "Unvollendet"
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "Unpaid"
-msgstr "Unbezahlt"
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "Unlimited"
+msgstr ""
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Unlimited documents, API and more"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Untitled Group"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Update"
@@ -6470,10 +7185,31 @@ msgstr "Aktualisieren"
 msgid "Update Banner"
 msgstr "Banner aktualisieren"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Update Billing"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Update Claim"
+msgstr ""
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Update current organisation"
+msgstr ""
+
 #: apps/remix/app/components/general/legacy-field-warning-popover.tsx
 msgid "Update Fields"
 msgstr "Felder aktualisieren"
 
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Update organisation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "Update organisation member"
+msgstr ""
+
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "Update passkey"
 msgstr "Passkey aktualisieren"
@@ -6492,10 +7228,16 @@ msgstr "Profil aktualisieren"
 msgid "Update Recipient"
 msgstr "Empfänger aktualisieren"
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
 msgid "Update role"
 msgstr "Rolle aktualisieren"
 
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Update Subscription Claim"
+msgstr ""
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 msgid "Update team"
 msgstr "Team aktualisieren"
@@ -6505,6 +7247,11 @@ msgstr "Team aktualisieren"
 msgid "Update team email"
 msgstr "Team-E-Mail aktualisieren"
 
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "Update team group"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 msgid "Update team member"
@@ -6519,7 +7266,6 @@ msgid "Update user"
 msgstr "Benutzer aktualisieren"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Update webhook"
 msgstr "Webhook aktualisieren"
 
@@ -6536,6 +7282,11 @@ msgstr "Aktualisierung Ihrer Informationen"
 msgid "Upgrade"
 msgstr "Upgrade"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Upgrade <0>{0}</0> to {planName}"
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
 msgid "Upgrade your plan to upload more documents"
 msgstr "Aktualisieren Sie Ihren Tarif, um mehr Dokumente hochzuladen"
@@ -6583,7 +7334,7 @@ msgstr "Signatur hochladen"
 msgid "Upload Template Document"
 msgstr "Vorlagendokument hochladen"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Upload your brand logo (max 5MB, JPG, PNG, or WebP)"
 msgstr "Laden Sie Ihr Markenlogo hoch (max. 5MB, JPG, PNG oder WebP)"
 
@@ -6608,8 +7359,7 @@ msgstr "Die hochgeladene Datei ist kein zulässiger Dateityp"
 msgid "Uploading document..."
 msgstr "Dokument wird hochgeladen..."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Use"
 msgstr "Verwenden"
 
@@ -6627,6 +7377,10 @@ msgstr "Backup-Code verwenden"
 msgid "Use Template"
 msgstr "Vorlage verwenden"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Use your passkey for authentication"
+msgstr ""
+
 #: apps/remix/app/components/tables/internal-audit-log-table.tsx
 #: apps/remix/app/components/tables/document-logs-table.tsx
 msgid "User"
@@ -6636,9 +7390,9 @@ msgstr "Benutzer"
 msgid "User has no password."
 msgstr "Benutzer hat kein Passwort."
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "User ID"
-msgstr "Benutzer-ID"
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "User not found"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
@@ -6646,6 +7400,10 @@ msgstr "Benutzer-ID"
 msgid "User not found."
 msgstr "Benutzer nicht gefunden."
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "User Organisations"
+msgstr ""
+
 #: apps/remix/app/components/forms/signup.tsx
 msgid "User profiles are here!"
 msgstr "Benutzerprofile sind hier!"
@@ -6658,10 +7416,6 @@ msgstr "Benutzereinstellungen"
 msgid "User with this email already exists. Please use a different email address."
 msgstr "Ein Benutzer mit dieser E-Mail existiert bereits. Bitte verwenden Sie eine andere E-Mail-Adresse."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Username can only container alphanumeric characters and dashes."
-msgstr "Der Benutzername darf nur alphanumerische Zeichen und Bindestriche enthalten."
-
 #: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
 msgid "Users"
 msgstr "Benutzer"
@@ -6709,12 +7463,15 @@ msgstr "Überprüfen Sie Ihre Team-E-Mail-Adresse"
 msgid "Version History"
 msgstr "Versionsverlauf"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/document/document-page-view-button.tsx
 #: apps/remix/app/components/forms/2fa/view-recovery-codes-dialog.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "View"
 msgstr "Betrachten"
@@ -6764,7 +7521,7 @@ msgstr "Dokument ansehen"
 msgid "View documents associated with this email"
 msgstr "Dokumente ansehen, die mit dieser E-Mail verknüpft sind"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "View invites"
 msgstr "Einladungen ansehen"
 
@@ -6772,10 +7529,18 @@ msgstr "Einladungen ansehen"
 msgid "View more"
 msgstr "Mehr anzeigen"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "View next document"
+msgstr ""
+
 #: apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
 msgid "View Original Document"
 msgstr "Originaldokument ansehen"
 
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "View owner"
+msgstr ""
+
 #: packages/email/template-components/template-document-self-signed.tsx
 msgid "View plans"
 msgstr "Pläne anzeigen"
@@ -6791,6 +7556,7 @@ msgstr "Teams ansehen"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "Viewed"
 msgstr "Betrachtet"
@@ -6845,9 +7611,8 @@ msgstr "Möchten Sie Ihr eigenes öffentliches Profil haben?"
 msgid "Warning: Assistant as last signer"
 msgstr "Warnung: Assistent als letzter Unterzeichner"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "We are unable to proceed to the billing portal at this time. Please try again, or contact support."
 msgstr "Wir können zurzeit nicht auf das Abrechnungsportal zugreifen. Bitte versuchen Sie es erneut oder wenden Sie sich an den Support."
 
@@ -6859,19 +7624,45 @@ msgstr "Wir können diesen Schlüssel im Moment nicht entfernen. Bitte versuchen
 msgid "We are unable to update this passkey at the moment. Please try again later."
 msgstr "Wir können diesen Schlüssel im Moment nicht aktualisieren. Bitte versuchen Sie es später erneut."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "We couldn't create a Stripe customer. Please try again."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "We couldn't update the group. Please try again."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "We couldn't update the organisation. Please try again."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "We encountered an error while removing the direct template link. Please try again later."
 msgstr "Wir sind auf einen Fehler gestoßen, während wir den direkten Vorlagenlink entfernt haben. Bitte versuchen Sie es später erneut."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "We encountered an error while updating the webhook. Please try again later."
 msgstr "Wir sind auf einen Fehler gestoßen, während wir den Webhook aktualisieren wollten. Bitte versuchen Sie es später erneut."
 
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to add team members. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 msgid "We encountered an unknown error while attempting to add this email. Please try again later."
 msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht haben, diese E-Mail hinzuzufügen. Bitte versuchen Sie es später erneut."
 
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to create a group. Please try again later."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to create a organisation. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "We encountered an unknown error while attempting to create a team. Please try again later."
 msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht haben, ein Team zu erstellen. Bitte versuchen Sie es später erneut."
@@ -6880,9 +7671,9 @@ msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht h
 msgid "We encountered an unknown error while attempting to delete it. Please try again later."
 msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht haben, es zu löschen. Bitte versuchen Sie es später erneut."
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "We encountered an unknown error while attempting to delete the pending team. Please try again later."
-msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht haben, das ausstehende Team zu löschen. Bitte versuchen Sie es später erneut."
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "We encountered an unknown error while attempting to delete this organisation. Please try again later."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "We encountered an unknown error while attempting to delete this team. Please try again later."
@@ -6896,30 +7687,36 @@ msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht h
 msgid "We encountered an unknown error while attempting to delete your account. Please try again later."
 msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht haben, Ihr Konto zu löschen. Bitte versuchen Sie es später erneut."
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "We encountered an unknown error while attempting to invite team members. Please try again later."
-msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht haben, Teammitglieder einzuladen. Bitte versuchen Sie es später erneut."
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "We encountered an unknown error while attempting to disable access."
+msgstr ""
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "We encountered an unknown error while attempting to leave this team. Please try again later."
-msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht haben, dieses Team zu verlassen. Bitte versuchen Sie es später erneut."
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "We encountered an unknown error while attempting to enable access."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "We encountered an unknown error while attempting to invite organisation members. Please try again later."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "We encountered an unknown error while attempting to leave this organisation. Please try again later."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "We encountered an unknown error while attempting to remove this group. Please try again later."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "We encountered an unknown error while attempting to remove this template from your profile. Please try again later."
 msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht haben, diese Vorlage aus Ihrem Profil zu entfernen. Bitte versuchen Sie es später erneut."
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "We encountered an unknown error while attempting to remove this transfer. Please try again or contact support."
-msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht haben, diese Übertragung zu entfernen. Bitte versuchen Sie es später oder kontaktieren Sie den Support."
-
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
 msgid "We encountered an unknown error while attempting to remove this user. Please try again later."
 msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht haben, diesen Benutzer zu entfernen. Bitte versuchen Sie es später erneut."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "We encountered an unknown error while attempting to request a transfer of this team. Please try again later."
-msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht haben, eine Übertragung dieses Teams anzufordern. Bitte versuchen Sie es später erneut."
-
 #: apps/remix/app/components/forms/reset-password.tsx
 msgid "We encountered an unknown error while attempting to reset your password. Please try again later."
 msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht haben, Ihr Passwort zurückzusetzen. Bitte versuchen Sie es später erneut."
@@ -6946,10 +7743,19 @@ msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht h
 msgid "We encountered an unknown error while attempting to update the template. Please try again later."
 msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht haben, die Vorlage zu aktualisieren. Bitte versuchen Sie es später erneut."
 
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "We encountered an unknown error while attempting to update this organisation member. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
 msgid "We encountered an unknown error while attempting to update this team member. Please try again later."
 msgstr "Wir sind auf einen unbekannten Fehler gestoßen, während wir versucht haben, dieses Teammitglied zu aktualisieren. Bitte versuchen Sie es später erneut."
 
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "We encountered an unknown error while attempting to update your organisation. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/forms/password.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 msgid "We encountered an unknown error while attempting to update your password. Please try again later."
@@ -6975,10 +7781,6 @@ msgstr "Wir haben einen unbekannten Fehler festgestellt, während wir versuchten
 msgid "We have sent a confirmation email for verification."
 msgstr "Wir haben eine Bestätigungs-E-Mail zur Überprüfung gesendet."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "We need a username to create your profile"
-msgstr "Wir benötigen einen Benutzernamen, um Ihr Profil zu erstellen"
-
 #: apps/remix/app/components/forms/signup.tsx
 msgid "We need your signature to sign documents"
 msgstr "Wir benötigen Ihre Unterschrift, um Dokumente zu unterschreiben"
@@ -6991,10 +7793,6 @@ msgstr "Wir konnten das Token nicht in Ihre Zwischenablage kopieren. Bitte versu
 msgid "We were unable to copy your recovery code to your clipboard. Please try again."
 msgstr "Wir konnten Ihren Wiederherstellungscode nicht in Ihre Zwischenablage kopieren. Bitte versuchen Sie es erneut."
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "We were unable to create a checkout session. Please try again, or contact support"
-msgstr "Wir konnten keine Checkout-Sitzung erstellen. Bitte versuchen Sie es erneut oder kontaktieren Sie den Support"
-
 #: apps/remix/app/components/forms/signup.tsx
 msgid "We were unable to create your account. Please review the information you provided and try again."
 msgstr "Wir konnten Ihr Konto nicht erstellen. Bitte überprüfen Sie die von Ihnen angegebenen Informationen und versuchen Sie es erneut."
@@ -7009,7 +7807,7 @@ msgstr "Wir konnten die Zwei-Faktor-Authentifizierung für Ihr Konto nicht deakt
 msgid "We were unable to log you out at this time."
 msgstr "Wir konnten Sie zurzeit nicht abmelden."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "We were unable to set your public profile to public. Please try again."
 msgstr "Wir konnten Ihr öffentliches Profil nicht auf öffentlich setzen. Bitte versuchen Sie es erneut."
 
@@ -7024,14 +7822,17 @@ msgstr "Wir konnten die Zwei-Faktor-Authentifizierung für Ihr Konto nicht einri
 msgid "We were unable to submit this document at this time. Please try again later."
 msgstr "Wir konnten dieses Dokument zurzeit nicht einreichen. Bitte versuchen Sie es später erneut."
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "We were unable to update your branding preferences at this time, please try again later"
 msgstr "Wir konnten Ihre Markenpräferenzen zu diesem Zeitpunkt nicht aktualisieren, bitte versuchen Sie es später noch einmal"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "We were unable to update your document preferences at this time, please try again later"
 msgstr "Wir konnten Ihre Dokumentpräferenzen zu diesem Zeitpunkt nicht aktualisieren, bitte versuchen Sie es später noch einmal"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 msgid "We were unable to verify your details. Please try again or contact support"
 msgstr "Wir konnten Ihre Angaben nicht verifizieren. Bitte versuchen Sie es erneut oder kontaktieren Sie den Support"
@@ -7057,8 +7858,8 @@ msgstr "Wir werden Unterzeichnungslinks für Sie erstellen, die Sie an die Empf
 msgid "We won't send anything to notify recipients."
 msgstr "Wir werden nichts senden, um die Empfänger zu benachrichtigen."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "We're all empty"
 msgstr "Wir sind alle leer"
@@ -7084,17 +7885,14 @@ msgid "Webhook deleted"
 msgstr "Webhook gelöscht"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Webhook updated"
 msgstr "Webhook aktualisiert"
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Webhook URL"
 msgstr "Webhook-URL"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -7102,10 +7900,6 @@ msgstr "Webhook-URL"
 msgid "Webhooks"
 msgstr "Webhooks"
 
-#: apps/remix/app/components/general/billing-plans.tsx
-msgid "Weekly"
-msgstr "Wöchentlich"
-
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Welcome"
 msgstr "Willkommen"
@@ -7114,6 +7908,10 @@ msgstr "Willkommen"
 msgid "Welcome back, we are lucky to have you."
 msgstr "Willkommen zurück, wir freuen uns, Sie zu haben."
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Welcome back! Here's an overview of your account."
+msgstr ""
+
 #: packages/email/template-components/template-confirmation-email.tsx
 msgid "Welcome to Documenso!"
 msgstr "Willkommen bei Documenso!"
@@ -7122,6 +7920,10 @@ msgstr "Willkommen bei Documenso!"
 msgid "Were you trying to edit this document instead?"
 msgstr "Hast du stattdessen versucht, dieses Dokument zu bearbeiten?"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "What you can do with teams:"
+msgstr ""
+
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
 #: packages/ui/primitives/document-flow/add-signers.tsx
@@ -7144,6 +7946,10 @@ msgstr "Wenn Sie unsere Plattform nutzen, um Ihre elektronische Unterschrift auf
 msgid "While waiting for them to do so you can create your own Documenso account and get started with document signing right away."
 msgstr "Während Sie darauf warten, können Sie Ihr eigenes Documenso-Konto erstellen und sofort mit der Dokumentenunterzeichnung beginnen."
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Whitelabeling, unlimited members and more"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 msgid "Who do you want to remind?"
 msgstr "Wen möchten Sie erinnern?"
@@ -7153,18 +7959,19 @@ msgid "Withdrawing Consent"
 msgstr "Zustimmung widerrufen"
 
 #: apps/remix/app/components/forms/public-profile-form.tsx
-msgid "Write about the team"
-msgstr "Schreiben Sie über das Team"
+msgid "Write a description to display on your public profile"
+msgstr ""
 
-#: apps/remix/app/components/forms/public-profile-form.tsx
-msgid "Write about yourself"
-msgstr "Schreiben Sie über sich selbst"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Yearly"
 msgstr "Jährlich"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Yes"
+msgstr ""
+
 #: apps/remix/app/components/general/template/template-page-view-information.tsx
 #: apps/remix/app/components/general/document/document-page-view-information.tsx
 #: packages/lib/utils/document-audit-logs.ts
@@ -7175,17 +7982,42 @@ msgstr "Du"
 msgid "You are about to delete <0>\"{documentTitle}\"</0>"
 msgstr "Sie sind dabei, <0>\"{documentTitle}\"</0> zu löschen"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "You are about to delete <0>{0}</0>. All data related to this organisation such as teams, documents, and all other resources will be deleted. This action is irreversible."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 msgid "You are about to delete the following team email from <0>{teamName}</0>."
 msgstr "Sie stehen kurz davor, die folgende Team-E-Mail von <0>{teamName}</0> zu löschen."
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "You are about to give all organisation members access to this team under their organisation role."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "You are about to hide <0>\"{documentTitle}\"</0>"
 msgstr "Sie sind dabei, <0>\"{documentTitle}\"</0> zu verstecken"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "You are about to leave the following team."
-msgstr "Sie stehen kurz davor, das folgende Team zu verlassen."
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "You are about to leave the following organisation."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "You are about to remove default access to this team for all organisation members. Any members not explicitly added to this team will no longer have access."
+msgstr ""
+
+#. placeholder {0}: team.name
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "You are about to remove the following group from <0>{0}</0>."
+msgstr ""
+
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "You are about to remove the following user from <0>{0}</0>."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "You are about to remove the following user from <0>{teamName}</0>."
@@ -7201,21 +8033,38 @@ msgstr "Sie stehen kurz davor, den Zugriff für das Team <0>{0}</0> ({1}) zu wid
 msgid "You are about to send this document to the recipients. Are you sure you want to continue?"
 msgstr "Sie sind dabei, dieses Dokument an die Empfänger zu senden. Sind Sie sicher, dass Sie fortfahren möchten?"
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "You are about to subscribe to the {planName}"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
 msgid "You are currently on the <0>Free Plan</0>."
 msgstr "Sie befinden sich derzeit im <0>kostenlosen Plan</0>."
 
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-msgid "You are currently updating <0>{teamMemberName}.</0>"
-msgstr "Sie aktualisieren derzeit <0>{teamMemberName}.</0>"
+msgid "You are currently updating <0>{memberName}.</0>"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You are currently updating <0>{organisationMemberName}.</0>"
+msgstr ""
 
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "You are currently updating the <0>{passkeyName}</0> passkey."
 msgstr "Sie aktualisieren derzeit den <0>{passkeyName}</0> Passkey."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "You are not a member of this team."
-msgstr "Sie sind kein Mitglied dieses Teams."
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You are currently updating the <0>{teamGroupName}</0> team group."
+msgstr ""
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "You are currently updating your \"Personal\" organisation to a plan where you can add multiple members. These members may have access to the documents, templates and other data in this organisation, including documents sent to you."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+msgid "You are not authorized to access this page."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx
 msgid "You are not authorized to delete this user."
@@ -7233,18 +8082,18 @@ msgstr "Sie sind nicht berechtigt, diesen Benutzer zu aktivieren."
 msgid "You can also copy and paste this link into your browser: {confirmationLink} (link expires in 1 hour)"
 msgstr "Du kannst diesen Link auch kopieren und in deinen Browser einfügen: {confirmationLink} (Link läuft in 1 Stunde ab)"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You can choose to enable or disable your profile for public view."
-msgstr "Sie können wählen, ob Sie Ihr Profil für die öffentliche Ansicht aktivieren oder deaktivieren möchten."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You can choose to enable or disable your team profile for public view."
-msgstr "Sie können wählen, ob Sie Ihr Teamprofil für die öffentliche Ansicht aktivieren oder deaktivieren möchten."
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
+msgid "You can choose to enable or disable the profile for public view."
+msgstr ""
 
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 msgid "You can copy and share these links to recipients so they can action the document."
 msgstr "Sie können diese Links kopieren und mit den Empfängern teilen, damit sie das Dokument bearbeiten können."
 
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "You can enable access to allow all organisation members to access this team by default."
+msgstr ""
+
 #: packages/email/templates/confirm-team-email.tsx
 msgid "You can revoke access at any time in your team settings on Documenso <0>here.</0>"
 msgstr "Sie können den Zugriff jederzeit in Ihren Teameinstellungen auf Documenso <0>hier.</0> widerrufen"
@@ -7274,14 +8123,30 @@ msgstr "Sie können das Dokument und seinen Status einsehen, indem Sie auf die S
 msgid "You cannot add assistants when signing order is disabled."
 msgstr "Sie können keine Assistenten hinzufügen, wenn die Unterschriftenreihenfolge deaktiviert ist."
 
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "You cannot delete a group which has a higher role than you."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "You cannot have more than {MAXIMUM_PASSKEYS} passkeys."
 msgstr "Sie dürfen nicht mehr als {MAXIMUM_PASSKEYS} Passkeys haben."
 
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You cannot modify a group which has a higher role than you."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You cannot modify a organisation member who has a higher role than you."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 msgid "You cannot modify a team member who has a higher role than you."
 msgstr "Sie können ein Teammitglied, das eine höhere Rolle als Sie hat, nicht ändern."
 
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+msgid "You cannot remove members from this team if the inherit member feature is enabled."
+msgstr ""
+
 #: packages/ui/primitives/document-upload.tsx
 #: packages/ui/primitives/document-dropzone.tsx
 msgid "You cannot upload documents at this time."
@@ -7292,9 +8157,13 @@ msgstr "Sie können derzeit keine Dokumente hochladen."
 msgid "You cannot upload encrypted PDFs"
 msgstr "Sie können keine verschlüsselten PDFs hochladen"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-msgid "You do not currently have a customer record, this should not happen. Please contact support for assistance."
-msgstr "Sie haben derzeit keinen Kundenrecord, das sollte nicht passieren. Bitte kontaktieren Sie den Support um Hilfe."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "You currently have an inactive <0>{currentProductName}</0> subscription"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "You currently have no access to any teams within this organisation. Please contact your organisation to request access."
+msgstr ""
 
 #: apps/remix/app/components/forms/token.tsx
 msgid "You do not have permission to create a token for this team"
@@ -7304,50 +8173,43 @@ msgstr "Sie haben keine Berechtigung, ein Token für dieses Team zu erstellen"
 msgid "You don't need to sign it anymore."
 msgstr "Du musst es nicht mehr unterschreiben."
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-msgid "You have accepted an invitation from <0>{0}</0> to join their team."
-msgstr "Sie haben eine Einladung von <0>{0}</0> angenommen, um ihrem Team beizutreten."
-
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "You have already completed the ownership transfer for <0>{0}</0>."
-msgstr "Sie haben die Eigentumsübertragung für <0>{0}</0> bereits abgeschlossen."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "You have accepted an invitation from <0>{0}</0> to join their organisation."
+msgstr ""
 
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "You have already verified your email address for <0>{0}</0>."
 msgstr "Sie haben Ihre E-Mail-Adresse für <0>{0}</0> bereits bestätigt."
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "You have been invited by <0>{0}</0> to join their team."
-msgstr "Sie wurden von <0>{0}</0> eingeladen, ihrem Team beizutreten."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "You have been invited by <0>{0}</0> to join their organisation."
+msgstr ""
 
-#. placeholder {0}: team.name
-#: packages/lib/server-only/team/create-team-member-invites.ts
+#. placeholder {0}: organisation.name
+#: packages/lib/server-only/organisation/create-organisation-member-invites.ts
 msgid "You have been invited to join {0} on Documenso"
 msgstr "Du wurdest eingeladen, {0} auf Documenso beizutreten"
 
-#: packages/email/templates/team-invite.tsx
-msgid "You have been invited to join the following team"
-msgstr "Du wurdest eingeladen, dem folgenden Team beizutreten"
+#: packages/email/templates/organisation-invite.tsx
+msgid "You have been invited to join the following organisation"
+msgstr ""
 
 #: packages/lib/server-only/recipient/set-document-recipients.ts
 #: packages/lib/server-only/recipient/delete-document-recipient.ts
 msgid "You have been removed from a document"
 msgstr "Du wurdest von einem Dokument entfernt"
 
-#. placeholder {0}: team.name
-#: packages/lib/server-only/team/request-team-ownership-transfer.ts
-msgid "You have been requested to take ownership of team {0} on Documenso"
-msgstr "Du wurdest gebeten, das Team {0} auf Documenso zu übernehmen"
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "You have been requested to sign the following documents. Review each document carefully and complete the signing process."
+msgstr ""
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "You have declined the invitation from <0>{0}</0> to join their team."
-msgstr "Sie haben die Einladung von <0>{0}</0> abgelehnt, ihrem Team beizutreten."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
+msgid "You have declined the invitation from <0>{0}</0> to join their organisation."
+msgstr ""
 
 #. placeholder {0}: `"${document.title}"`
 #: packages/lib/server-only/document/resend-document.tsx
@@ -7356,12 +8218,11 @@ msgid "You have initiated the document {0} that requires you to {recipientAction
 msgstr "Du hast das Dokument {0} initiiert, das erfordert, dass du {recipientActionVerb}."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "You have no webhooks yet. Your webhooks will be shown here once you create them."
 msgstr "Sie haben noch keine Webhooks. Ihre Webhooks werden hier angezeigt, sobald Sie sie erstellt haben."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
 msgid "You have not yet created any templates. To create a template please upload one."
 msgstr "Sie haben noch keine Vorlagen erstellt. Bitte laden Sie eine Datei hoch, um eine Vorlage zu erstellen."
 
@@ -7374,6 +8235,10 @@ msgstr "Sie haben noch keine Dokumente erstellt oder erhalten. Bitte laden Sie e
 msgid "You have reached the maximum limit of {0} direct templates. <0>Upgrade your account to continue!</0>"
 msgstr "Sie haben das maximale Limit von {0} direkten Vorlagen erreicht. <0>Upgrade your account to continue!</0>"
 
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
+msgid "You have reached the maximum number of teams for your plan. Please contact sales at <0>support@documenso.com</0> if you would like to adjust your plan."
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-upload.tsx
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
 msgid "You have reached your document limit for this month. Please upgrade your plan."
@@ -7401,15 +8266,27 @@ msgstr "Sie haben dieses Dokument abgelehnt"
 msgid "You have signed “{documentName}”"
 msgstr "Du hast „{documentName}“ unterzeichnet"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "You have successfully left this team."
-msgstr "Sie haben dieses Team erfolgreich verlassen."
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "You have successfully left this organisation."
+msgstr ""
 
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/signup.tsx
 msgid "You have successfully registered. Please verify your account by clicking on the link you received in the email."
 msgstr "Sie haben sich erfolgreich registriert. Bitte bestätigen Sie Ihr Konto, indem Sie auf den Link klicken, den Sie per E-Mail erhalten haben."
 
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "You have successfully removed this group from the organisation."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "You have successfully removed this group from the team."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "You have successfully removed this user from the organisation."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "You have successfully removed this user from the team."
 msgstr "Sie haben diesen Benutzer erfolgreich aus dem Team entfernt."
@@ -7423,38 +8300,35 @@ msgid "You have the right to withdraw your consent to use electronic signatures
 msgstr "Sie haben das Recht, Ihre Zustimmung zur Verwendung elektronischer Unterschriften jederzeit vor Abschluss des Unterzeichnungsprozesses zu widerrufen. Um Ihre Zustimmung zu widerrufen, kontaktieren Sie bitte den Absender des Dokuments. Sollten Sie den Absender nicht erreichen, können Sie sich für Unterstützung an <0>{SUPPORT_EMAIL}</0> wenden. Seien Sie sich bewusst, dass der Widerruf der Zustimmung den Abschluss der zugehörigen Transaktion oder Dienstleistung verzögern oder stoppen kann."
 
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-msgid "You have updated {teamMemberName}."
-msgstr "Sie haben {teamMemberName} aktualisiert."
+msgid "You have updated {memberName}."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You have updated {organisationMemberName}."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You have updated the team group."
+msgstr ""
 
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "You have verified your email address for <0>{0}</0>."
 msgstr "Sie haben Ihre E-Mail-Adresse für <0>{0}</0> bestätigt."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "You must be an admin of this team to manage billing."
-msgstr "Sie müssen Administrator dieses Teams sein, um die Abrechnung zu verwalten."
-
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 msgid "You must enter '{deleteMessage}' to proceed"
 msgstr "Sie müssen '{deleteMessage}' eingeben, um fortzufahren"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "You must have at least one other team member to transfer ownership."
-msgstr "Sie müssen mindestens einen anderen Teamkollegen haben, um die Eigentumsübertragung durchzuführen."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You must set a profile URL before enabling your public profile."
-msgstr "Sie müssen eine Profil-URL festlegen, bevor Sie Ihr öffentliches Profil aktivieren."
-
 #: apps/remix/app/components/dialogs/template-folder-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/folder-delete-dialog.tsx
 msgid "You must type '{deleteMessage}' to confirm"
 msgstr "Sie müssen '{deleteMessage}' eingeben, um zu bestätigen"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "You need to be an admin to manage API tokens."
 msgstr "Sie müssen Administrator sein, um API-Token zu verwalten."
 
@@ -7470,9 +8344,9 @@ msgstr "Sie müssen angemeldet sein, um diese Seite anzuzeigen."
 msgid "You need to setup 2FA to mark this document as viewed."
 msgstr "Sie müssen 2FA einrichten, um dieses Dokument als angesehen zu markieren."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "You will get notified & be able to set up your documenso public profile when we launch the feature."
-msgstr "Sie werden benachrichtigt und können Ihr Documenso öffentliches Profil einrichten, wenn wir die Funktion starten."
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "You will need to configure any claims or subscription after creating this organisation"
+msgstr ""
 
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "You will now be required to enter a code from your authenticator app when signing in."
@@ -7494,11 +8368,12 @@ msgstr "Ihr Avatar wurde erfolgreich aktualisiert."
 msgid "Your banner has been updated successfully."
 msgstr "Ihr Banner wurde erfolgreich aktualisiert."
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Your brand website URL"
 msgstr "Ihre Marken-Website-URL"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Your branding preferences have been updated"
 msgstr "Ihre Markenpräferenzen wurden aktualisiert"
 
@@ -7510,9 +8385,17 @@ msgstr "Ihr Massenversand wurde gestartet. Sie erhalten eine E-Mail-Benachrichti
 msgid "Your bulk send operation for template \"{templateName}\" has completed."
 msgstr "Ihre Massenversandoperation für Vorlage \"{templateName}\" ist abgeschlossen."
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
-msgid "Your current plan is past due. Please update your payment information."
-msgstr "Ihr aktueller Plan ist überfällig. Bitte aktualisieren Sie Ihre Zahlungsinformationen."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current {currentProductName} plan is past due. Please update your payment information."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current plan is inactive."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current plan is past due."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Your direct signing templates"
@@ -7557,7 +8440,8 @@ msgstr "Ihr Dokument wurde erfolgreich hochgeladen."
 msgid "Your document has been uploaded successfully. You will be redirected to the template page."
 msgstr "Ihr Dokument wurde erfolgreich hochgeladen. Sie werden zur Vorlagenseite weitergeleitet."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Your document preferences have been updated"
 msgstr "Ihre Dokumentpräferenzen wurden aktualisiert"
 
@@ -7579,7 +8463,7 @@ msgstr "Ihre E-Mail wurde erfolgreich bestätigt! Sie können jetzt alle Funktio
 msgid "Your email is currently being used by team <0>{0}</0> ({1})."
 msgstr "Ihre E-Mail wird derzeit von Team <0>{0}</0> ({1}) verwendet."
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Your existing tokens"
 msgstr "Ihre vorhandenen Tokens"
 
@@ -7588,6 +8472,18 @@ msgstr "Ihre vorhandenen Tokens"
 msgid "Your new password cannot be the same as your old password."
 msgstr "Ihr neues Passwort darf nicht mit Ihrem alten Passwort identisch sein."
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Your organisation has been created."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "Your organisation has been successfully deleted."
+msgstr ""
+
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Your organisation has been successfully updated."
+msgstr ""
+
 #: apps/remix/app/components/forms/reset-password.tsx
 #: apps/remix/app/components/forms/password.tsx
 msgid "Your password has been updated successfully."
@@ -7597,10 +8493,18 @@ msgstr "Ihr Passwort wurde erfolgreich aktualisiert."
 msgid "Your password has been updated."
 msgstr "Dein Passwort wurde aktualisiert."
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Your payment for teams is overdue. Please settle the payment to avoid any service disruptions."
 msgstr "Ihre Zahlung für Teams ist überfällig. Bitte begleichen Sie die Zahlung, um Unterbrechungen des Dienstes zu vermeiden."
 
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+msgid "Your personal organisation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Your plan does not support inviting members. Please upgrade or your plan or contact sales at <0>support@documenso.com</0> if you would like to discuss your options."
+msgstr ""
+
 #: apps/remix/app/components/forms/profile.tsx
 msgid "Your profile has been updated successfully."
 msgstr "Ihr Profil wurde erfolgreich aktualisiert."
@@ -7622,19 +8526,10 @@ msgstr "Ihr Wiederherstellungscode wurde in die Zwischenablage kopiert."
 msgid "Your recovery codes are listed below. Please store them in a safe place."
 msgstr "Ihre Wiederherstellungscodes sind unten aufgeführt. Bitte bewahren Sie sie an einem sicheren Ort auf."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Your subscription is currently active."
-msgstr "Ihr Abonnement ist derzeit aktiv."
-
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Your team has been created."
 msgstr "Ihr Team wurde erstellt."
 
-#: packages/email/templates/team-delete.tsx
-#: packages/email/templates/team-delete.tsx
-msgid "Your team has been deleted"
-msgstr "Dein Team wurde gelöscht"
-
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Your team has been successfully deleted."
 msgstr "Ihr Team wurde erfolgreich gelöscht."
@@ -7671,7 +8566,7 @@ msgstr "Ihr Token ist abgelaufen!"
 msgid "Your token was created successfully! Make sure to copy it because you won't be able to see it again!"
 msgstr "Ihr Token wurde erfolgreich erstellt! Stellen Sie sicher, dass Sie es kopieren, da Sie es später nicht mehr sehen können!"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Your tokens will be shown here once you create them."
 msgstr "Ihre Tokens werden hier angezeigt, sobald Sie sie erstellt haben."
 
diff --git a/packages/lib/translations/en/web.po b/packages/lib/translations/en/web.po
index 474e1b9ca..5761f4f9b 100644
--- a/packages/lib/translations/en/web.po
+++ b/packages/lib/translations/en/web.po
@@ -17,19 +17,10 @@ msgstr ""
 msgid " Enable direct link signing"
 msgstr " Enable direct link signing"
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
-msgid " The events that will trigger a webhook to be sent to your URL."
-msgstr " The events that will trigger a webhook to be sent to your URL."
-
 #: apps/remix/app/components/embed/authoring/configure-document-upload.tsx
 msgid ".PDF documents accepted (max {APP_DOCUMENT_UPLOAD_SIZE_LIMIT}MB)"
 msgstr ".PDF documents accepted (max {APP_DOCUMENT_UPLOAD_SIZE_LIMIT}MB)"
 
-#. placeholder {0}: team.name
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-msgid "\"{0}\" has invited you to sign \"example document\"."
-msgstr "\"{0}\" has invited you to sign \"example document\"."
-
 #. placeholder {0}: field.customText
 #. placeholder {1}: timezone || ''
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
@@ -52,10 +43,13 @@ msgstr "“{documentName}” was signed by all signers"
 msgid "\"{documentTitle}\" has been successfully deleted"
 msgstr "\"{documentTitle}\" has been successfully deleted"
 
-#. placeholder {0}: team.name
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-msgid "\"{placeholderEmail}\" on behalf of \"{0}\" has invited you to sign \"example document\"."
-msgstr "\"{placeholderEmail}\" on behalf of \"{0}\" has invited you to sign \"example document\"."
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "\"{placeholderEmail}\" on behalf of \"Team Name\" has invited you to sign \"example document\"."
+msgstr "\"{placeholderEmail}\" on behalf of \"Team Name\" has invited you to sign \"example document\"."
+
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "\"Team Name\" has invited you to sign \"example document\"."
+msgstr "\"Team Name\" has invited you to sign \"example document\"."
 
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
@@ -78,16 +72,16 @@ msgstr "{0, plural, one {# character over the limit} other {# characters over th
 msgid "{0, plural, one {# recipient} other {# recipients}}"
 msgstr "{0, plural, one {# recipient} other {# recipients}}"
 
-#. placeholder {0}: row.original.quantity
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "{0, plural, one {# Seat} other {# Seats}}"
-msgstr "{0, plural, one {# Seat} other {# Seats}}"
+#. placeholder {0}: org.teams.length
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "{0, plural, one {# team} other {# teams}}"
+msgstr "{0, plural, one {# team} other {# teams}}"
 
 #. placeholder {0}: data.length
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "{0, plural, one {<0>You have <1>1</1> pending team invitation</0>} other {<2>You have <3>#</3> pending team invitations</2>}}"
-msgstr "{0, plural, one {<0>You have <1>1</1> pending team invitation</0>} other {<2>You have <3>#</3> pending team invitations</2>}}"
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "{0, plural, one {<0>You have <1>1</1> pending invitation</0>} other {<2>You have <3>#</3> pending invitations</2>}}"
+msgstr "{0, plural, one {<0>You have <1>1</1> pending invitation</0>} other {<2>You have <3>#</3> pending invitations</2>}}"
 
 #. placeholder {0}: autoSignableFields.filter((f) => f.type === fieldType).length
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
@@ -95,18 +89,18 @@ msgid "{0, plural, one {1 matching field} other {# matching fields}}"
 msgstr "{0, plural, one {1 matching field} other {# matching fields}}"
 
 #. placeholder {0}: recipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
 msgid "{0, plural, one {1 Recipient} other {# Recipients}}"
 msgstr "{0, plural, one {1 Recipient} other {# Recipients}}"
 
 #. placeholder {0}: pendingRecipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "{0, plural, one {Waiting on 1 recipient} other {Waiting on # recipients}}"
 msgstr "{0, plural, one {Waiting on 1 recipient} other {Waiting on # recipients}}"
 
+#. placeholder {0}: route.label
 #. placeholder {0}: _(FRIENDLY_FIELD_TYPE[fieldType as FieldType])
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
 msgid "{0}"
 msgstr "{0}"
@@ -127,16 +121,6 @@ msgstr "{0} has invited you to {recipientActionVerb} the document \"{1}\"."
 msgid "{0} invited you to {recipientActionVerb} a document"
 msgstr "{0} invited you to {recipientActionVerb} a document"
 
-#. placeholder {0}: memberName || memberEmail
-#: packages/email/templates/team-join.tsx
-msgid "{0} joined the team {teamName} on Documenso"
-msgstr "{0} joined the team {teamName} on Documenso"
-
-#. placeholder {0}: memberName || memberEmail
-#: packages/email/templates/team-leave.tsx
-msgid "{0} left the team {teamName} on Documenso"
-msgstr "{0} left the team {teamName} on Documenso"
-
 #. placeholder {0}: remaining.documents
 #. placeholder {1}: quota.documents
 #: apps/remix/app/components/general/document/document-upload.tsx
@@ -158,11 +142,15 @@ msgid "{0} on behalf of \"{1}\" has invited you to {recipientActionVerb} the doc
 msgstr "{0} on behalf of \"{1}\" has invited you to {recipientActionVerb} the document \"{2}\"."
 
 #. placeholder {0}: recipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "{0} Recipient(s)"
 msgstr "{0} Recipient(s)"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "{0} Teams"
+msgstr "{0} Teams"
+
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 msgid "{charactersRemaining, plural, one {1 character remaining} other {{charactersRemaining} characters remaining}}"
 msgstr "{charactersRemaining, plural, one {1 character remaining} other {{charactersRemaining} characters remaining}}"
@@ -215,18 +203,6 @@ msgstr "{inviterName} on behalf of \"{teamName}\" has invited you to {0}<0/>\"{d
 msgid "{inviterName} on behalf of \"{teamName}\" has invited you to {action} {documentName}"
 msgstr "{inviterName} on behalf of \"{teamName}\" has invited you to {action} {documentName}"
 
-#: packages/email/templates/team-join.tsx
-msgid "{memberEmail} joined the following team"
-msgstr "{memberEmail} joined the following team"
-
-#: packages/email/templates/team-leave.tsx
-msgid "{memberEmail} left the following team"
-msgstr "{memberEmail} left the following team"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "{numberOfSeats, plural, one {# member} other {# members}}"
-msgstr "{numberOfSeats, plural, one {# member} other {# members}}"
-
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} added a field"
 msgstr "{prefix} added a field"
@@ -372,10 +348,6 @@ msgstr "{teamName} has invited you to {0}<0/>\"{documentName}\""
 msgid "{teamName} has invited you to {action} {documentName}"
 msgstr "{teamName} has invited you to {action} {documentName}"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "{teamName} ownership transfer request"
-msgstr "{teamName} ownership transfer request"
-
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{userName} approved the document"
 msgstr "{userName} approved the document"
@@ -409,10 +381,6 @@ msgstr "{visibleRows, plural, one {Showing # result.} other {Showing # results.}
 msgid "<0>\"{0}\"</0>is no longer available to sign"
 msgstr "<0>\"{0}\"</0>is no longer available to sign"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "<0>{senderName}</0> has requested that you take ownership of the following team"
-msgstr "<0>{senderName}</0> has requested that you take ownership of the following team"
-
 #: packages/email/templates/confirm-team-email.tsx
 msgid "<0>{teamName}</0> has requested to use your email address for their team on Documenso."
 msgstr "<0>{teamName}</0> has requested to use your email address for their team on Documenso."
@@ -467,6 +435,10 @@ msgstr "<0>Require account</0> - The recipient must be signed in to view the doc
 msgid "<0>Require passkey</0> - The recipient must have an account and passkey configured via their settings"
 msgstr "<0>Require passkey</0> - The recipient must have an account and passkey configured via their settings"
 
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "<0>Require password</0> - The recipient must have an account and password configured via their settings, the password will be verified during signing"
+msgstr "<0>Require password</0> - The recipient must have an account and password configured via their settings, the password will be verified during signing"
+
 #: apps/remix/app/components/tables/documents-table-sender-filter.tsx
 msgid "<0>Sender:</0> All"
 msgstr "<0>Sender:</0> All"
@@ -492,6 +464,14 @@ msgstr "<0>You are about to complete signing \"<1>{documentTitle}</1>\".</0><2/>
 msgid "<0>You are about to complete viewing \"<1>{documentTitle}</1>\".</0><2/> Are you sure?"
 msgstr "<0>You are about to complete viewing \"<1>{documentTitle}</1>\".</0><2/> Are you sure?"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "0 Free organisations left"
+msgstr "0 Free organisations left"
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "1 Free organisations left"
+msgstr "1 Free organisations left"
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "1 month"
 msgstr "1 month"
@@ -500,22 +480,53 @@ msgstr "1 month"
 msgid "12 months"
 msgstr "12 months"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "2FA"
+msgstr "2FA"
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "3 months"
 msgstr "3 months"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+msgid "401 Unauthorized"
+msgstr "401 Unauthorized"
+
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "404 not found"
 msgstr "404 not found"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "404 Organisation group not found"
+msgstr "404 Organisation group not found"
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "404 Organisation not found"
+msgstr "404 Organisation not found"
+
 #: apps/remix/app/routes/_profile+/_layout.tsx
 msgid "404 Profile not found"
 msgstr "404 Profile not found"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "404 Team not found"
 msgstr "404 Team not found"
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "404 User not found"
+msgstr "404 User not found"
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "5 documents a month"
+msgstr "5 documents a month"
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "5 Documents a month"
+msgstr "5 Documents a month"
+
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "500 Internal Server Error"
 msgstr "500 Internal Server Error"
@@ -560,9 +571,29 @@ msgstr "A field was updated"
 msgid "A means to print or download documents for your records"
 msgstr "A means to print or download documents for your records"
 
-#: packages/lib/jobs/definitions/emails/send-team-member-joined-email.handler.ts
-msgid "A new member has joined your team"
-msgstr "A new member has joined your team"
+#: packages/email/templates/organisation-join.tsx
+msgid "A member has joined your organisation on Documenso"
+msgstr "A member has joined your organisation on Documenso"
+
+#: packages/lib/jobs/definitions/emails/send-organisation-member-left-email.handler.ts
+msgid "A member has left your organisation"
+msgstr "A member has left your organisation"
+
+#: packages/email/templates/organisation-leave.tsx
+msgid "A member has left your organisation {organisationName}"
+msgstr "A member has left your organisation {organisationName}"
+
+#: packages/email/templates/organisation-leave.tsx
+msgid "A member has left your organisation on Documenso"
+msgstr "A member has left your organisation on Documenso"
+
+#: packages/lib/jobs/definitions/emails/send-organisation-member-joined-email.handler.ts
+msgid "A new member has joined your organisation"
+msgstr "A new member has joined your organisation"
+
+#: packages/email/templates/organisation-join.tsx
+msgid "A new member has joined your organisation {organisationName}"
+msgstr "A new member has joined your organisation {organisationName}"
 
 #: apps/remix/app/components/forms/token.tsx
 msgid "A new token was created successfully."
@@ -585,12 +616,6 @@ msgstr "A recipient was removed"
 msgid "A recipient was updated"
 msgstr "A recipient was updated"
 
-#. placeholder {0}: transferVerification.name
-#. placeholder {1}: transferVerification.email
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "A request to transfer the ownership of this team has been sent to <0>{0} ({1})</0>"
-msgstr "A request to transfer the ownership of this team has been sent to <0>{0} ({1})</0>"
-
 #. placeholder {0}: team.name
 #: packages/lib/server-only/team/create-team-email-verification.ts
 msgid "A request to use your email has been initiated by {0} on Documenso"
@@ -601,7 +626,6 @@ msgid "A secret that will be sent to your URL so you can verify that the request
 msgstr "A secret that will be sent to your URL so you can verify that the request has been sent by Documenso"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "A secret that will be sent to your URL so you can verify that the request has been sent by Documenso."
 msgstr "A secret that will be sent to your URL so you can verify that the request has been sent by Documenso."
 
@@ -609,19 +633,6 @@ msgstr "A secret that will be sent to your URL so you can verify that the reques
 msgid "A stable internet connection"
 msgstr "A stable internet connection"
 
-#: packages/email/templates/team-join.tsx
-msgid "A team member has joined a team on Documenso"
-msgstr "A team member has joined a team on Documenso"
-
-#. placeholder {0}: team.name
-#: packages/lib/jobs/definitions/emails/send-team-member-left-email.handler.ts
-msgid "A team member has left {0}"
-msgstr "A team member has left {0}"
-
-#: packages/email/templates/team-leave.tsx
-msgid "A team member has left a team on Documenso"
-msgstr "A team member has left a team on Documenso"
-
 #: packages/email/templates/team-delete.tsx
 #: packages/email/templates/team-delete.tsx
 msgid "A team you were a part of has been deleted"
@@ -631,6 +642,14 @@ msgstr "A team you were a part of has been deleted"
 msgid "A unique URL to access your profile"
 msgstr "A unique URL to access your profile"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "A unique URL to identify the organisation"
+msgstr "A unique URL to identify the organisation"
+
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "A unique URL to identify your organisation"
+msgstr "A unique URL to identify your organisation"
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "A unique URL to identify your team"
@@ -640,32 +659,36 @@ msgstr "A unique URL to identify your team"
 msgid "A verification email will be sent to the provided email."
 msgstr "A verification email will be sent to the provided email."
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: packages/email/templates/team-transfer-request.tsx
-#: packages/email/templates/team-invite.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: packages/email/templates/organisation-invite.tsx
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Accept"
 msgstr "Accept"
 
-#: packages/email/templates/team-invite.tsx
-msgid "Accept invitation to join a team on Documenso"
-msgstr "Accept invitation to join a team on Documenso"
+#: packages/email/templates/organisation-invite.tsx
+msgid "Accept invitation to join an organisation on Documenso"
+msgstr "Accept invitation to join an organisation on Documenso"
 
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Accept team email request for {teamName} on Documenso"
 msgstr "Accept team email request for {teamName} on Documenso"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "Accept team transfer request on Documenso"
-msgstr "Accept team transfer request on Documenso"
-
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Acceptance and Consent"
 msgstr "Acceptance and Consent"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Accepted team invitation"
-msgstr "Accepted team invitation"
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "Access disabled"
+msgstr "Access disabled"
+
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Access enabled"
+msgstr "Access enabled"
+
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Account"
+msgstr "Account"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 msgid "Account Authentication"
@@ -702,18 +725,25 @@ msgid "Action"
 msgstr "Action"
 
 #: apps/remix/app/components/tables/templates-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Actions"
 msgstr "Actions"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
 msgid "Active"
 msgstr "Active"
 
@@ -778,7 +808,29 @@ msgstr "Add email"
 msgid "Add Fields"
 msgstr "Add Fields"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add group roles"
+msgstr "Add group roles"
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add groups"
+msgstr "Add groups"
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add members"
+msgstr "Add members"
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Add Members"
+msgstr "Add Members"
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Add members roles"
+msgstr "Add members roles"
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Add more"
 msgstr "Add more"
 
@@ -836,15 +888,12 @@ msgstr "Add the people who will sign the document."
 msgid "Add the recipients to create the document with"
 msgstr "Add the recipients to create the document with"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Adding and removing seats will adjust your invoice accordingly."
-msgstr "Adding and removing seats will adjust your invoice accordingly."
-
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Additional brand information to display at the bottom of emails"
 msgstr "Additional brand information to display at the bottom of emails"
 
-#: packages/lib/constants/teams.ts
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Admin"
 msgstr "Admin"
 
@@ -852,10 +901,15 @@ msgstr "Admin"
 msgid "Admin Actions"
 msgstr "Admin Actions"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 msgid "Admin panel"
 msgstr "Admin panel"
 
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+msgid "Admin Panel"
+msgstr "Admin Panel"
+
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
 #: packages/ui/primitives/document-flow/add-settings.tsx
 msgid "Advanced Options"
@@ -888,6 +942,10 @@ msgstr "All"
 msgid "All documents"
 msgstr "All documents"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "All documents have been completed!"
+msgstr "All documents have been completed!"
+
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "All documents have been processed. Any new documents that are sent or received will show here."
 msgstr "All documents have been processed. Any new documents that are sent or received will show here."
@@ -896,8 +954,8 @@ msgstr "All documents have been processed. Any new documents that are sent or re
 msgid "All documents related to the electronic signing process will be provided to you electronically through our platform or via email. It is your responsibility to ensure that your email address is current and that you can receive and open our emails."
 msgstr "All documents related to the electronic signing process will be provided to you electronically through our platform or via email. It is your responsibility to ensure that your email address is current and that you can receive and open our emails."
 
-#: apps/remix/app/routes/_authenticated+/templates.folders._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.folders._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.folders._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.folders._index.tsx
 msgid "All Folders"
 msgstr "All Folders"
 
@@ -925,6 +983,10 @@ msgstr "All templates"
 msgid "All Time"
 msgstr "All Time"
 
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
+msgid "Allow all organisation members to access this team"
+msgstr "Allow all organisation members to access this team"
+
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Allow document recipients to reply directly to this email address"
 msgstr "Allow document recipients to reply directly to this email address"
@@ -941,6 +1003,10 @@ msgstr "Allow signers to dictate next signer"
 msgid "Allowed Signature Types"
 msgstr "Allowed Signature Types"
 
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "Allowed teams"
+msgstr "Allowed teams"
+
 #: apps/remix/app/routes/_authenticated+/settings+/security._index.tsx
 msgid "Allows authenticating using biometrics, password managers, hardware keys, etc."
 msgstr "Allows authenticating using biometrics, password managers, hardware keys, etc."
@@ -949,7 +1015,7 @@ msgstr "Allows authenticating using biometrics, password managers, hardware keys
 msgid "Already have an account? <0>Sign in instead</0>"
 msgstr "Already have an account? <0>Sign in instead</0>"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
 msgid "Amount"
 msgstr "Amount"
 
@@ -965,14 +1031,13 @@ msgstr "An electronic signature provided by you on our platform, achieved throug
 msgid "An email account"
 msgstr "An email account"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "An email containing an invitation will be sent to each member."
 msgstr "An email containing an invitation will be sent to each member."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "An email requesting the transfer of this team has been sent."
-msgstr "An email requesting the transfer of this team has been sent."
-
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/token.tsx
 #: apps/remix/app/components/forms/signup.tsx
@@ -1019,6 +1084,7 @@ msgstr "An error occurred while disabling direct link signing."
 msgid "An error occurred while disabling the user."
 msgstr "An error occurred while disabling the user."
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
@@ -1041,21 +1107,15 @@ msgstr "An error occurred while enabling direct link signing."
 msgid "An error occurred while enabling the user."
 msgstr "An error occurred while enabling the user."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "An error occurred while loading team members. Please try again later."
-msgstr "An error occurred while loading team members. Please try again later."
-
 #: packages/ui/primitives/pdf-viewer.tsx
 msgid "An error occurred while loading the document."
 msgstr "An error occurred while loading the document."
 
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "An error occurred while moving the document."
 msgstr "An error occurred while moving the document."
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 msgid "An error occurred while moving the template."
 msgstr "An error occurred while moving the template."
 
@@ -1108,6 +1168,7 @@ msgstr "An error occurred while signing as assistant."
 #: apps/remix/app/components/general/document-signing/document-signing-dropdown-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-checkbox-field.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "An error occurred while signing the document."
 msgstr "An error occurred while signing the document."
 
@@ -1139,7 +1200,6 @@ msgstr "An unexpected error occurred."
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/forms/signup.tsx
@@ -1148,20 +1208,31 @@ msgstr "An unexpected error occurred."
 #: apps/remix/app/components/forms/signin.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
 #: apps/remix/app/components/forms/profile.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/account-delete-dialog.tsx
 msgid "An unknown error occurred"
@@ -1182,9 +1253,9 @@ msgstr "An unknown error occurred while deleting the folder."
 msgid "An unknown error occurred while moving the folder."
 msgstr "An unknown error occurred while moving the folder."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Any payment methods attached to this team will remain attached to this team. Please contact us if you need to update this information."
-msgstr "Any payment methods attached to this team will remain attached to this team. Please contact us if you need to update this information."
+#: apps/remix/app/routes/_authenticated+/inbox.tsx
+msgid "Any documents that you have been invited to will appear here"
+msgstr "Any documents that you have been invited to will appear here"
 
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Any Source"
@@ -1194,7 +1265,7 @@ msgstr "Any Source"
 msgid "Any Status"
 msgstr "Any Status"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -1206,6 +1277,7 @@ msgstr "API Tokens"
 msgid "App Version"
 msgstr "App Version"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
@@ -1241,6 +1313,10 @@ msgstr "Approving"
 msgid "Are you sure you want to complete the document? This action cannot be undone. Please ensure that you have completed prefilling all relevant fields before proceeding."
 msgstr "Are you sure you want to complete the document? This action cannot be undone. Please ensure that you have completed prefilling all relevant fields before proceeding."
 
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Are you sure you want to delete the following claim?"
+msgstr "Are you sure you want to delete the following claim?"
+
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 msgid "Are you sure you want to delete this token?"
 msgstr "Are you sure you want to delete this token?"
@@ -1253,6 +1329,10 @@ msgstr "Are you sure you want to reject this document? This action cannot be und
 msgid "Are you sure you want to remove the <0>{passkeyName}</0> passkey."
 msgstr "Are you sure you want to remove the <0>{passkeyName}</0> passkey."
 
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "Are you sure you wish to delete this organisation?"
+msgstr "Are you sure you wish to delete this organisation?"
+
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Are you sure you wish to delete this team?"
 msgstr "Are you sure you wish to delete this team?"
@@ -1260,13 +1340,22 @@ msgstr "Are you sure you wish to delete this team?"
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "Are you sure?"
 msgstr "Are you sure?"
 
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+msgid "Assigned Teams"
+msgstr "Assigned Teams"
+
 #: packages/lib/constants/recipient-roles.ts
 msgid "Assist"
 msgstr "Assist"
@@ -1292,6 +1381,10 @@ msgstr "Assistant role is only available when the document is in sequential sign
 msgid "Assistants"
 msgstr "Assistants"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Assistants and Copy roles are currently not compatible with the multi-sign experience."
+msgstr "Assistants and Copy roles are currently not compatible with the multi-sign experience."
+
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "Assisted"
@@ -1301,7 +1394,7 @@ msgstr "Assisted"
 msgid "Assisting"
 msgstr "Assisting"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.types.tsx
 #: packages/ui/primitives/document-flow/add-settings.types.ts
 #: packages/lib/types/document-meta.ts
@@ -1338,15 +1431,17 @@ msgid "Awaiting email confirmation"
 msgstr "Awaiting email confirmation"
 
 #: apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx
-#: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/authoring/configure-fields-view.tsx
 #: apps/remix/app/components/embed/authoring/configure-fields-view.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Back"
 msgstr "Back"
 
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
-msgid "Back to Documents"
-msgstr "Back to Documents"
+msgid "Back home"
+msgstr "Back home"
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "Background Color"
@@ -1365,20 +1460,14 @@ msgstr "Backup codes"
 msgid "Banner Updated"
 msgstr "Banner Updated"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Basic details"
-msgstr "Basic details"
-
 #: packages/email/template-components/template-confirmation-email.tsx
 msgid "Before you get started, please confirm your email address by clicking the button below:"
 msgstr "Before you get started, please confirm your email address by clicking the button below:"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
-#: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
-#: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
 msgid "Billing"
 msgstr "Billing"
 
@@ -1390,11 +1479,26 @@ msgstr "Black"
 msgid "Blue"
 msgstr "Blue"
 
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Brand Details"
+msgstr "Brand Details"
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Brand Website"
+msgstr "Brand Website"
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Branding Logo"
+msgstr "Branding Logo"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Branding Preferences"
 msgstr "Branding Preferences"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Branding preferences updated"
 msgstr "Branding preferences updated"
 
@@ -1407,7 +1511,7 @@ msgstr "Browser"
 msgid "Bulk Copy"
 msgstr "Bulk Copy"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Bulk Import"
 msgstr "Bulk Import"
 
@@ -1429,7 +1533,7 @@ msgstr "Bulk Send Template via CSV"
 msgid "Bulk Send via CSV"
 msgstr "Bulk Send via CSV"
 
-#: packages/email/templates/team-invite.tsx
+#: packages/email/templates/organisation-invite.tsx
 msgid "by <0>{senderName}</0>"
 msgstr "by <0>{senderName}</0>"
 
@@ -1437,10 +1541,6 @@ msgstr "by <0>{senderName}</0>"
 msgid "By accepting this request, you will be granting <0>{teamName}</0> access to:"
 msgstr "By accepting this request, you will be granting <0>{teamName}</0> access to:"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "By accepting this request, you will take responsibility for any billing items associated with this team."
-msgstr "By accepting this request, you will take responsibility for any billing items associated with this team."
-
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "By deleting this document, the following will occur:"
 msgstr "By deleting this document, the following will occur:"
@@ -1471,7 +1571,6 @@ msgstr "Can prepare"
 
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-signature-field.tsx
@@ -1482,6 +1581,7 @@ msgstr "Can prepare"
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-account.tsx
@@ -1492,30 +1592,44 @@ msgstr "Can prepare"
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/template-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 #: apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
 #: apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 #: packages/ui/primitives/signature-pad/signature-pad-dialog.tsx
 #: packages/ui/primitives/document-flow/send-document-action-dialog.tsx
 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx
@@ -1567,7 +1681,8 @@ msgstr "Checkbox"
 msgid "Checkbox values"
 msgstr "Checkbox values"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Checkout"
 msgstr "Checkout"
 
@@ -1587,6 +1702,10 @@ msgstr "Choose how the document will reach recipients"
 msgid "Choose how to distribute your document to recipients. Email will send notifications, None will generate signing links for manual distribution."
 msgstr "Choose how to distribute your document to recipients. Email will send notifications, None will generate signing links for manual distribution."
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Choose your preferred authentication method:"
+msgstr "Choose your preferred authentication method:"
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "Choose..."
 msgstr "Choose..."
@@ -1595,13 +1714,9 @@ msgstr "Choose..."
 msgid "Claim account"
 msgstr "Claim account"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Claim username"
-msgstr "Claim username"
-
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Claim your username now"
-msgstr "Claim your username now"
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+msgid "Claims"
+msgstr "Claims"
 
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Clear file"
@@ -1626,7 +1741,7 @@ msgstr "Click here to get started"
 msgid "Click here to retry"
 msgstr "Click here to retry"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Click here to upload"
 msgstr "Click here to upload"
 
@@ -1639,10 +1754,11 @@ msgstr "Click to copy signing link for sending to recipient"
 #: apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Click to insert field"
 msgstr "Click to insert field"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
@@ -1650,6 +1766,9 @@ msgstr "Click to insert field"
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: packages/ui/primitives/document-flow/missing-signature-field-dialog.tsx
@@ -1660,11 +1779,16 @@ msgstr "Close"
 msgid "Communication"
 msgstr "Communication"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Compare all plans and features in detail"
+msgstr "Compare all plans and features in detail"
+
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Complete"
 msgstr "Complete"
 
@@ -1696,6 +1820,7 @@ msgstr "Complete Viewing"
 #: apps/remix/app/components/general/stack-avatars-with-tooltip.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/document.ts
 #: packages/email/template-components/template-document-self-signed.tsx
 #: packages/email/template-components/template-document-recipient-signed.tsx
@@ -1771,16 +1896,21 @@ msgstr "Configure the {0} field"
 msgid "Configure the fields you want to place on the document."
 msgstr "Configure the fields you want to place on the document."
 
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Configure the team roles for each group"
+msgstr "Configure the team roles for each group"
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Configure the team roles for each member"
+msgstr "Configure the team roles for each member"
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Confirm"
 msgstr "Confirm"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Confirm by typing <0>{confirmTransferMessage}</0>"
-msgstr "Confirm by typing <0>{confirmTransferMessage}</0>"
-
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 msgid "Confirm by typing <0>{deleteMessage}</0>"
 msgstr "Confirm by typing <0>{deleteMessage}</0>"
 
@@ -1812,20 +1942,24 @@ msgstr "Consent to Electronic Transactions"
 msgid "Contact Information"
 msgstr "Contact Information"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Contact sales here"
+msgstr "Contact sales here"
+
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "Content"
 msgstr "Content"
 
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-view.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx
 #: packages/ui/primitives/document-flow/document-flow-root.tsx
 msgid "Continue"
@@ -1851,19 +1985,19 @@ msgstr "Continue by signing the document."
 msgid "Continue by viewing the document."
 msgstr "Continue by viewing the document."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "Continue to login"
 msgstr "Continue to login"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the default language of an uploaded document. This will be used as the language in email communications with the recipients."
 msgstr "Controls the default language of an uploaded document. This will be used as the language in email communications with the recipients."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the default visibility of an uploaded document."
 msgstr "Controls the default visibility of an uploaded document."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the formatting of the message that will be sent when inviting a recipient to sign a document. If a custom message has been provided while configuring the document, it will be used instead."
 msgstr "Controls the formatting of the message that will be sent when inviting a recipient to sign a document. If a custom message has been provided while configuring the document, it will be used instead."
 
@@ -1871,11 +2005,11 @@ msgstr "Controls the formatting of the message that will be sent when inviting a
 msgid "Controls the language for the document, including the language to be used for email notifications, and the final certificate that is generated and attached to the document."
 msgstr "Controls the language for the document, including the language to be used for email notifications, and the final certificate that is generated and attached to the document."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls whether the signing certificate will be included in the document when it is downloaded. The signing certificate can still be downloaded from the logs page separately."
 msgstr "Controls whether the signing certificate will be included in the document when it is downloaded. The signing certificate can still be downloaded from the logs page separately."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls which signatures are allowed to be used when signing a document."
 msgstr "Controls which signatures are allowed to be used when signing a document."
 
@@ -1924,6 +2058,9 @@ msgstr "Copy token"
 
 #: apps/remix/app/routes/_profile+/_layout.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 msgid "Create"
 msgstr "Create"
 
@@ -1935,16 +2072,31 @@ msgstr "Create a <0>free account</0> to access your signed documents at any time
 msgid "Create a new account"
 msgstr "Create a new account"
 
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Create a new organisation with {planName} plan. Keep your current organisation on it's current plan"
+msgstr "Create a new organisation with {planName} plan. Keep your current organisation on it's current plan"
+
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create a team to collaborate with your team members."
 msgstr "Create a team to collaborate with your team members."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 #: packages/email/template-components/template-document-self-signed.tsx
 msgid "Create account"
 msgstr "Create account"
 
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Create an organisation for this user"
+msgstr "Create an organisation for this user"
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Create an organisation to collaborate with teams"
+msgstr "Create an organisation to collaborate with teams"
+
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Create an organisation to get started."
+msgstr "Create an organisation to get started."
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Create and send"
 msgstr "Create and send"
@@ -1957,6 +2109,14 @@ msgstr "Create as draft"
 msgid "Create as pending"
 msgstr "Create as pending"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create claim"
+msgstr "Create claim"
+
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create Claim"
+msgstr "Create Claim"
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog-wrapper.tsx
 msgid "Create Direct Link"
 msgstr "Create Direct Link"
@@ -1969,6 +2129,15 @@ msgstr "Create Direct Signing Link"
 msgid "Create document from template"
 msgstr "Create document from template"
 
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Create group"
+msgstr "Create group"
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Create Groups"
+msgstr "Create Groups"
+
 #: apps/remix/app/routes/_profile+/_layout.tsx
 msgid "Create now"
 msgstr "Create now"
@@ -1977,17 +2146,47 @@ msgstr "Create now"
 msgid "Create one automatically"
 msgstr "Create one automatically"
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Create organisation"
+msgstr "Create organisation"
+
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/menu-switcher.tsx
+msgid "Create Organisation"
+msgstr "Create Organisation"
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Create separate organisation"
+msgstr "Create separate organisation"
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Create signing links"
 msgstr "Create signing links"
 
-#: apps/remix/app/components/general/menu-switcher.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Create Stripe customer"
+msgstr "Create Stripe customer"
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Create subscription"
+msgstr "Create subscription"
+
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create Subscription Claim"
+msgstr "Create Subscription Claim"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create team"
 msgstr "Create team"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create Team"
 msgstr "Create Team"
@@ -2020,6 +2219,8 @@ msgstr "Create your account and start using state-of-the-art document signing. O
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 #: apps/remix/app/components/tables/templates-table.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/tables/admin-leaderboard-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-information.tsx
@@ -2030,25 +2231,23 @@ msgid "Created"
 msgstr "Created"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Created At"
 msgstr "Created At"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Created by"
 msgstr "Created by"
 
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table.tsx
 msgid "Created on"
 msgstr "Created on"
 
 #. placeholder {0}: i18n.date(webhook.createdAt, DateTime.DATETIME_FULL)
 #. placeholder {0}: i18n.date(token.createdAt, DateTime.DATETIME_FULL)
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Created on {0}"
 msgstr "Created on {0}"
 
@@ -2068,14 +2267,26 @@ msgstr "Current password is incorrect."
 msgid "Current recipients:"
 msgstr "Current recipients:"
 
-#: apps/remix/app/components/general/billing-plans.tsx
-msgid "Daily"
-msgstr "Daily"
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "Currently all organisation members can access this team"
+msgstr "Currently all organisation members can access this team"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Currently branding can only be configured for Teams and above plans."
+msgstr "Currently branding can only be configured for Teams and above plans."
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups._index.tsx
+msgid "Custom Organisation Groups"
+msgstr "Custom Organisation Groups"
 
 #: apps/remix/app/components/general/app-command-menu.tsx
 msgid "Dark Mode"
 msgstr "Dark Mode"
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Dashboard"
+msgstr "Dashboard"
+
 #: apps/remix/app/components/tables/settings-security-activity-table.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
@@ -2084,8 +2295,7 @@ msgstr "Dark Mode"
 msgid "Date"
 msgstr "Date"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Date created"
 msgstr "Date created"
 
@@ -2095,24 +2305,20 @@ msgstr "Date created"
 msgid "Date Format"
 msgstr "Date Format"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: packages/email/templates/team-invite.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: packages/email/templates/organisation-invite.tsx
 msgid "Decline"
 msgstr "Decline"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Declined team invitation"
-msgstr "Declined team invitation"
-
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Document Language"
 msgstr "Default Document Language"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Document Visibility"
 msgstr "Default Document Visibility"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Signature Settings"
 msgstr "Default Signature Settings"
 
@@ -2120,20 +2326,30 @@ msgstr "Default Signature Settings"
 msgid "delete"
 msgstr "delete"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/document/document-page-view-dropdown.tsx
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
 msgid "Delete"
 msgstr "Delete"
 
@@ -2143,6 +2359,7 @@ msgstr "Delete"
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-folder-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/folder-delete-dialog.tsx
 msgid "delete {0}"
 msgstr "delete {0}"
@@ -2173,18 +2390,33 @@ msgstr "Delete document"
 msgid "Delete Document"
 msgstr "Delete Document"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "Delete organisation"
+msgstr "Delete organisation"
+
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "Delete organisation group"
+msgstr "Delete organisation group"
+
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "Delete organisation member"
+msgstr "Delete organisation member"
+
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "Delete passkey"
 msgstr "Delete passkey"
 
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Delete Subscription Claim"
+msgstr "Delete Subscription Claim"
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Delete team"
 msgstr "Delete team"
 
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-msgid "Delete team member"
-msgstr "Delete team member"
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "Delete team group"
+msgstr "Delete team group"
 
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 msgid "Delete the document. This action is irreversible so proceed with caution."
@@ -2273,6 +2505,7 @@ msgstr "Direct template link deleted"
 msgid "Direct template link usage exceeded ({0}/{1})"
 msgstr "Direct template link usage exceeded ({0}/{1})"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Disable"
 msgstr "Disable"
@@ -2283,6 +2516,10 @@ msgstr "Disable"
 msgid "Disable 2FA"
 msgstr "Disable 2FA"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "Disable access"
+msgstr "Disable access"
+
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
 msgid "Disable account"
 msgstr "Disable account"
@@ -2297,7 +2534,6 @@ msgid "Disable Two Factor Authentication before deleting your account."
 msgstr "Disable Two Factor Authentication before deleting your account."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "Disabled"
 msgstr "Disabled"
 
@@ -2333,8 +2569,7 @@ msgstr "Do you want to duplicate this template?"
 msgid "Documenso will delete <0>all of your documents</0>, along with all of your completed documents, signatures, and all other resources belonging to your Account."
 msgstr "Documenso will delete <0>all of your documents</0>, along with all of your completed documents, signatures, and all other resources belonging to your Account."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Document"
 msgstr "Document"
@@ -2421,8 +2656,7 @@ msgstr "Document created using a <0>direct link</0>"
 msgid "Document Creation"
 msgstr "Document Creation"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 #: packages/lib/utils/document-audit-logs.ts
@@ -2458,15 +2692,13 @@ msgstr "Document external ID updated"
 msgid "Document found in your account"
 msgstr "Document found in your account"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/components/general/document/document-history-sheet.tsx
 msgid "Document history"
 msgstr "Document history"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document ID"
 msgstr "Document ID"
 
@@ -2491,7 +2723,6 @@ msgid "Document metrics"
 msgstr "Document metrics"
 
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "Document moved"
 msgstr "Document moved"
 
@@ -2515,7 +2746,8 @@ msgstr "Document pending"
 msgid "Document pending email"
 msgstr "Document pending email"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Document preferences updated"
 msgstr "Document preferences updated"
 
@@ -2554,13 +2786,11 @@ msgstr "Document signing auth updated"
 msgid "Document signing process will be cancelled"
 msgstr "Document signing process will be cancelled"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document status"
 msgstr "Document status"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document title"
 msgstr "Document title"
 
@@ -2598,16 +2828,13 @@ msgid "Document will be permanently deleted"
 msgstr "Document will be permanently deleted"
 
 #: apps/remix/app/routes/_profile+/p.$url.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
 #: apps/remix/app/components/general/user-profile-timur.tsx
-#: apps/remix/app/components/general/generic-error-layout.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -2615,8 +2842,7 @@ msgstr "Document will be permanently deleted"
 msgid "Documents"
 msgstr "Documents"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Documents created from template"
 msgstr "Documents created from template"
 
@@ -2624,6 +2850,10 @@ msgstr "Documents created from template"
 msgid "Documents Received"
 msgstr "Documents Received"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
+msgid "Documents that require your attention will appear here"
+msgstr "Documents that require your attention will appear here"
+
 #: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
 msgid "Documents Viewed"
 msgstr "Documents Viewed"
@@ -2633,7 +2863,8 @@ msgstr "Documents Viewed"
 msgid "Don't have an account? <0>Sign up</0>"
 msgstr "Don't have an account? <0>Sign up</0>"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/share-document-download-button.tsx
@@ -2706,7 +2937,7 @@ msgstr "Dropdown"
 msgid "Dropdown options"
 msgstr "Dropdown options"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Due to an unpaid invoice, your team has been restricted. Please settle the payment to restore full access to your team."
 msgstr "Due to an unpaid invoice, your team has been restricted. Please settle the payment to restore full access to your team."
 
@@ -2725,7 +2956,6 @@ msgid "Duplicate on all pages"
 msgstr "Duplicate on all pages"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
@@ -2736,13 +2966,11 @@ msgstr "Duplicate on all pages"
 msgid "Edit"
 msgstr "Edit"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Edit Template"
 msgstr "Edit Template"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Edit webhook"
 msgstr "Edit webhook"
 
@@ -2757,6 +2985,7 @@ msgstr "Electronic Signature Disclosure"
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/tables/admin-document-recipient-item-table.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-email-field.tsx
@@ -2767,6 +2996,7 @@ msgstr "Electronic Signature Disclosure"
 #: apps/remix/app/components/forms/forgot-password.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
@@ -2788,7 +3018,7 @@ msgstr "Email"
 
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/send-confirmation-email.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Email address"
 msgstr "Email address"
 
@@ -2832,15 +3062,27 @@ msgstr "Email verification has been removed"
 msgid "Email verification has been resent"
 msgstr "Email verification has been resent"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Embedding, 5 members included and more"
+msgstr "Embedding, 5 members included and more"
+
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "Empty field"
 msgstr "Empty field"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Enable"
+msgstr "Enable"
+
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "Enable 2FA"
 msgstr "Enable 2FA"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Enable access"
+msgstr "Enable access"
+
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 msgid "Enable account"
 msgstr "Enable account"
@@ -2854,9 +3096,17 @@ msgstr "Enable Account"
 msgid "Enable Authenticator App"
 msgstr "Enable Authenticator App"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
-msgid "Enable custom branding for all documents in this team."
-msgstr "Enable custom branding for all documents in this team."
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable Custom Branding"
+msgstr "Enable Custom Branding"
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable custom branding for all documents in this organisation"
+msgstr "Enable custom branding for all documents in this organisation"
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable custom branding for all documents in this team"
+msgstr "Enable custom branding for all documents in this team"
 
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: packages/lib/constants/template.ts
@@ -2871,8 +3121,6 @@ msgstr "Enable signing order"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Enabled"
@@ -2886,11 +3134,15 @@ msgstr "Enabling the account results in the user being able to use the account a
 msgid "Enclosed Document"
 msgstr "Enclosed Document"
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "Ends On"
-msgstr "Ends On"
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Enter claim name"
+msgstr "Enter claim name"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Enter your 2FA code"
+msgstr "Enter your 2FA code"
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Enter your brand details"
 msgstr "Enter your brand details"
 
@@ -2906,15 +3158,24 @@ msgstr "Enter your email address to receive the completed document."
 msgid "Enter your name"
 msgstr "Enter your name"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Enter your password"
+msgstr "Enter your password"
+
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 msgid "Enter your text here"
 msgstr "Enter your text here"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Enterprise"
+msgstr "Enterprise"
+
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
 #: apps/remix/app/components/general/verify-email-banner.tsx
 #: apps/remix/app/components/general/template/template-edit-form.tsx
@@ -2949,15 +3210,14 @@ msgstr "Enter your text here"
 #: apps/remix/app/components/general/document/document-edit-form.tsx
 #: apps/remix/app/components/general/document/document-edit-form.tsx
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/template-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx
@@ -2970,7 +3230,7 @@ msgstr "Error"
 msgid "Error uploading file"
 msgstr "Error uploading file"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Everyone can access and view the document"
 msgstr "Everyone can access and view the document"
 
@@ -2991,7 +3251,7 @@ msgid "Expired"
 msgstr "Expired"
 
 #. placeholder {0}: i18n.date(token.expires, DateTime.DATETIME_FULL)
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Expires on {0}"
 msgstr "Expires on {0}"
 
@@ -3005,6 +3265,18 @@ msgstr "External ID"
 msgid "Failed to create folder"
 msgstr "Failed to create folder"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Failed to create subscription claim."
+msgstr "Failed to create subscription claim."
+
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Failed to delete subscription claim."
+msgstr "Failed to delete subscription claim."
+
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
+msgid "Failed to load document"
+msgstr "Failed to load document"
+
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
 msgid "Failed to reseal document"
 msgstr "Failed to reseal document"
@@ -3021,12 +3293,15 @@ msgstr "Failed to update document"
 msgid "Failed to update recipient"
 msgstr "Failed to update recipient"
 
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Failed to update subscription claim."
+msgstr "Failed to update subscription claim."
+
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 msgid "Failed to update template"
 msgstr "Failed to update template"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Failed to update webhook"
 msgstr "Failed to update webhook"
 
@@ -3034,6 +3309,12 @@ msgstr "Failed to update webhook"
 msgid "Failed: {failedCount}"
 msgstr "Failed: {failedCount}"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Feature Flags"
+msgstr "Feature Flags"
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 msgid "Field character limit"
 msgstr "Field character limit"
@@ -3091,6 +3372,10 @@ msgstr "File cannot be larger than {APP_DOCUMENT_UPLOAD_SIZE_LIMIT}MB"
 msgid "File size exceeds the limit of {APP_DOCUMENT_UPLOAD_SIZE_LIMIT} MB"
 msgstr "File size exceeds the limit of {APP_DOCUMENT_UPLOAD_SIZE_LIMIT} MB"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Fill in the details to create a new subscription claim."
+msgstr "Fill in the details to create a new subscription claim."
+
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
 msgid "Folder"
@@ -3127,6 +3412,10 @@ msgstr "For any questions regarding this disclosure, electronic signatures, or a
 msgid "For each recipient, provide their email (required) and name (optional) in separate columns. Download the template CSV below for the correct format."
 msgstr "For each recipient, provide their email (required) and name (optional) in separate columns. Download the template CSV below for the correct format."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "For example, if the claim has a new flag \"FLAG_1\" set to true, then this organisation will get that flag added."
+msgstr "For example, if the claim has a new flag \"FLAG_1\" set to true, then this organisation will get that flag added."
+
 #: packages/lib/server-only/auth/send-forgot-password.ts
 msgid "Forgot Password?"
 msgstr "Forgot Password?"
@@ -3137,6 +3426,10 @@ msgstr "Forgot Password?"
 msgid "Forgot your password?"
 msgstr "Forgot your password?"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Free"
+msgstr "Free"
+
 #: packages/ui/primitives/document-flow/types.ts
 msgid "Free Signature"
 msgstr "Free Signature"
@@ -3148,9 +3441,12 @@ msgstr "Free Signature"
 #: apps/remix/app/components/forms/profile.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Full Name"
 msgstr "Full Name"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/template/template-edit-form.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
@@ -3168,8 +3464,16 @@ msgstr "Generate Links"
 msgid "Global recipient action authentication"
 msgstr "Global recipient action authentication"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Go back"
+msgstr "Go back"
+
 #: apps/remix/app/routes/_recipient+/_layout.tsx
 #: apps/remix/app/routes/_profile+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
 #: packages/ui/primitives/document-flow/document-flow-root.tsx
 msgid "Go Back"
@@ -3187,6 +3491,10 @@ msgstr "Go back home"
 msgid "Go Back Home"
 msgstr "Go Back Home"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid "Go home"
+msgstr "Go home"
+
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "Go to document"
 msgstr "Go to document"
@@ -3195,6 +3503,10 @@ msgstr "Go to document"
 msgid "Go to owner"
 msgstr "Go to owner"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Go to team"
+msgstr "Go to team"
+
 #: apps/remix/app/routes/_profile+/p.$url.tsx
 msgid "Go to your <0>public profile settings</0> to add documents."
 msgstr "Go to your <0>public profile settings</0> to add documents."
@@ -3203,6 +3515,34 @@ msgstr "Go to your <0>public profile settings</0> to add documents."
 msgid "Green"
 msgstr "Green"
 
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Group"
+msgstr "Group"
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Group has been created."
+msgstr "Group has been created."
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Group has been updated successfully"
+msgstr "Group has been updated successfully"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Group Name"
+msgstr "Group Name"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
+#: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Groups"
+msgstr "Groups"
+
 #: apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
 msgid "has invited you to approve this document"
 msgstr "has invited you to approve this document"
@@ -3232,6 +3572,10 @@ msgstr "Having an assistant as the last signer means they will be unable to take
 msgid "Help complete the document for other signers."
 msgstr "Help complete the document for other signers."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "Here you can edit your organisation details."
+msgstr "Here you can edit your organisation details."
+
 #: apps/remix/app/routes/_authenticated+/settings+/profile.tsx
 msgid "Here you can edit your personal details."
 msgstr "Here you can edit your personal details."
@@ -3240,14 +3584,23 @@ msgstr "Here you can edit your personal details."
 msgid "Here you can manage your password and security settings."
 msgstr "Here you can manage your password and security settings."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Here you can set preferences and defaults for branding."
 msgstr "Here you can set preferences and defaults for branding."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Here you can set preferences and defaults for your organisation. Teams will inherit these settings by default."
+msgstr "Here you can set preferences and defaults for your organisation. Teams will inherit these settings by default."
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Here you can set preferences and defaults for your team."
 msgstr "Here you can set preferences and defaults for your team."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Here you can set your general preferences"
+msgstr "Here you can set your general preferences"
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "Here's how it works:"
 msgstr "Here's how it works:"
@@ -3264,7 +3617,7 @@ msgstr "Hi {userName},"
 msgid "Hi, {userName} <0>({userEmail})</0>"
 msgstr "Hi, {userName} <0>({userEmail})</0>"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "Hide"
@@ -3274,6 +3627,10 @@ msgstr "Hide"
 msgid "Hide additional information"
 msgstr "Hide additional information"
 
+#: apps/remix/app/components/general/generic-error-layout.tsx
+msgid "Home"
+msgstr "Home"
+
 #: packages/lib/constants/recipient-roles.ts
 msgid "I am a signer of this document"
 msgstr "I am a signer of this document"
@@ -3303,9 +3660,13 @@ msgstr "I am the owner of this document"
 msgid "I'm sure! Delete it"
 msgstr "I'm sure! Delete it"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "If they accept this request, the team will be transferred to their account."
-msgstr "If they accept this request, the team will be transferred to their account."
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "ID"
+msgstr "ID"
+
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "ID copied to clipboard"
+msgstr "ID copied to clipboard"
 
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "If you do not want to use the authenticator prompted, you can close it, which will then display the next available authenticator."
@@ -3319,6 +3680,8 @@ msgstr "If you don't find the confirmation link in your inbox, you can request a
 msgid "If your authenticator app does not support QR codes, you can use the following code instead:"
 msgstr "If your authenticator app does not support QR codes, you can use the following code instead:"
 
+#: apps/remix/app/components/general/app-nav-mobile.tsx
+#: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 msgid "Inbox"
 msgstr "Inbox"
@@ -3327,7 +3690,7 @@ msgstr "Inbox"
 msgid "Inbox documents"
 msgstr "Inbox documents"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Include the Signing Certificate in the Document"
 msgstr "Include the Signing Certificate in the Document"
 
@@ -3336,11 +3699,27 @@ msgstr "Include the Signing Certificate in the Document"
 msgid "Information"
 msgstr "Information"
 
-#: packages/ui/components/recipient/recipient-action-auth-select.tsx
 #: packages/ui/components/recipient/recipient-action-auth-select.tsx
 msgid "Inherit authentication method"
 msgstr "Inherit authentication method"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Inherit from organisation"
+msgstr "Inherit from organisation"
+
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "Inherit organisation members"
+msgstr "Inherit organisation members"
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Inherited subscription claim"
+msgstr "Inherited subscription claim"
+
 #: apps/remix/app/components/general/document-signing/document-signing-initials-field.tsx
 #: packages/ui/primitives/document-flow/types.ts
 msgid "Initials"
@@ -3367,8 +3746,8 @@ msgstr "Invalid email"
 msgid "Invalid link"
 msgstr "Invalid link"
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Invalid token"
 msgstr "Invalid token"
 
@@ -3376,43 +3755,52 @@ msgstr "Invalid token"
 msgid "Invalid token provided. Please try again."
 msgstr "Invalid token provided. Please try again."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Invitation accepted"
+msgstr "Invitation accepted"
+
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "Invitation accepted!"
 msgstr "Invitation accepted!"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "Invitation declined"
 msgstr "Invitation declined"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invitation has been deleted"
 msgstr "Invitation has been deleted"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invitation has been resent"
 msgstr "Invitation has been resent"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite"
 msgstr "Invite"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite member"
 msgstr "Invite member"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite Members"
 msgstr "Invite Members"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "Invite team members"
-msgstr "Invite team members"
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Invite organisation members"
+msgstr "Invite organisation members"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Invite team members to collaborate"
+msgstr "Invite team members to collaborate"
+
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invited At"
 msgstr "Invited At"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
 msgid "Invoice"
 msgstr "Invoice"
 
@@ -3430,6 +3818,10 @@ msgstr "It is crucial to keep your contact information, especially your email ad
 msgid "It looks like {0} hasn't added any documents to their profile yet."
 msgstr "It looks like {0} hasn't added any documents to their profile yet."
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "It looks like we ran into an issue!"
+msgstr "It looks like we ran into an issue!"
+
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
 msgid "It seems that the provided token has expired. We've just sent you another token, please check your email and try again."
 msgstr "It seems that the provided token has expired. We've just sent you another token, please check your email and try again."
@@ -3446,9 +3838,14 @@ msgstr "It's currently not your turn to sign. Please check back soon as this doc
 msgid "It's currently not your turn to sign. You will receive an email with instructions once it's your turn to sign the document."
 msgstr "It's currently not your turn to sign. You will receive an email with instructions once it's your turn to sign the document."
 
-#: packages/email/templates/team-invite.tsx
-msgid "Join {teamName} on Documenso"
-msgstr "Join {teamName} on Documenso"
+#: packages/email/templates/organisation-invite.tsx
+msgid "Join {organisationName} on Documenso"
+msgstr "Join {organisationName} on Documenso"
+
+#. placeholder {0}: DateTime.fromJSDate(team.createdAt).toRelative({ style: 'short' })
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Joined {0}"
+msgstr "Joined {0}"
 
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
@@ -3458,6 +3855,7 @@ msgstr "Join {teamName} on Documenso"
 msgid "Label"
 msgstr "Label"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
@@ -3482,8 +3880,7 @@ msgstr "Last 7 days"
 msgid "Last modified"
 msgstr "Last modified"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Last updated"
 msgstr "Last updated"
 
@@ -3503,14 +3900,20 @@ msgstr "Last used"
 msgid "Leaderboard"
 msgstr "Leaderboard"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
 msgid "Leave"
 msgstr "Leave"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "Leave team"
-msgstr "Leave team"
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Leave blank to inherit from the organisation."
+msgstr "Leave blank to inherit from the organisation."
+
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "Leave organisation"
+msgstr "Leave organisation"
 
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Legality of Electronic Signatures"
@@ -3524,12 +3927,11 @@ msgstr "Light Mode"
 msgid "Like to have your own public profile with agreements?"
 msgstr "Like to have your own public profile with agreements?"
 
-#: packages/email/templates/team-transfer-request.tsx
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Link expires in 1 hour."
 msgstr "Link expires in 1 hour."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Link template"
 msgstr "Link template"
 
@@ -3539,7 +3941,6 @@ msgstr "Links Generated"
 
 #. placeholder {0}: webhook.eventTriggers .map((trigger) => toFriendlyWebhookEventName(trigger)) .join(', ')
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "Listening to {0}"
 msgstr "Listening to {0}"
 
@@ -3548,6 +3949,7 @@ msgid "Load older activity"
 msgstr "Load older activity"
 
 #: apps/remix/app/components/general/skeletons/document-edit-skeleton.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: packages/ui/primitives/pdf-viewer.tsx
 msgid "Loading document..."
 msgstr "Loading document..."
@@ -3557,11 +3959,6 @@ msgstr "Loading document..."
 msgid "Loading Document..."
 msgstr "Loading Document..."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Loading teams..."
-msgstr "Loading teams..."
-
 #: apps/remix/app/components/general/document/document-page-view-recent-activity.tsx
 msgid "Loading..."
 msgstr "Loading..."
@@ -3572,7 +3969,9 @@ msgstr "Loading..."
 msgid "Login"
 msgstr "Login"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Manage"
 msgstr "Manage"
 
@@ -3581,16 +3980,19 @@ msgstr "Manage"
 msgid "Manage {0}'s profile"
 msgstr "Manage {0}'s profile"
 
-#: apps/remix/app/routes/_authenticated+/settings+/teams.tsx
-msgid "Manage all teams you are currently associated with."
-msgstr "Manage all teams you are currently associated with."
+#: apps/remix/app/routes/_authenticated+/settings+/organisations.tsx
+msgid "Manage all organisations you are currently associated with."
+msgstr "Manage all organisations you are currently associated with."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Manage all subscription claims"
+msgstr "Manage all subscription claims"
+
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Manage and view template"
 msgstr "Manage and view template"
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
 msgid "Manage billing"
 msgstr "Manage billing"
 
@@ -3606,42 +4008,69 @@ msgstr "Manage Direct Link"
 msgid "Manage documents"
 msgstr "Manage documents"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage organisation"
+msgstr "Manage organisation"
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Manage organisations"
+msgstr "Manage organisations"
+
 #: apps/remix/app/routes/_authenticated+/settings+/security._index.tsx
 msgid "Manage passkeys"
 msgstr "Manage passkeys"
 
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Manage permissions and access controls"
+msgstr "Manage permissions and access controls"
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 msgid "Manage subscription"
 msgstr "Manage subscription"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-msgid "Manage Subscription"
-msgstr "Manage Subscription"
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage the {0} organisation"
+msgstr "Manage the {0} organisation"
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "Manage subscriptions"
-msgstr "Manage subscriptions"
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage the {0} organisation subscription"
+msgstr "Manage the {0} organisation subscription"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Manage team subscription."
-msgstr "Manage team subscription."
-
-#: apps/remix/app/components/general/menu-switcher.tsx
-msgid "Manage teams"
-msgstr "Manage teams"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups._index.tsx
+msgid "Manage the custom groups of members for your organisation."
+msgstr "Manage the custom groups of members for your organisation."
 
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "Manage the direct link signing for this template"
 msgstr "Manage the direct link signing for this template"
 
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
+msgid "Manage the groups assigned to this team."
+msgstr "Manage the groups assigned to this team."
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+msgid "Manage the members of your team."
+msgstr "Manage the members of your team."
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 msgid "Manage the members or invite new members."
 msgstr "Manage the members or invite new members."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+msgid "Manage the teams in this organisation."
+msgstr "Manage the teams in this organisation."
+
 #: apps/remix/app/routes/_authenticated+/admin+/users._index.tsx
 msgid "Manage users"
 msgstr "Manage users"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Manage your organisation group settings."
+msgstr "Manage your organisation group settings."
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.passkeys.tsx
 msgid "Manage your passkeys."
 msgstr "Manage your passkeys."
@@ -3650,7 +4079,8 @@ msgstr "Manage your passkeys."
 msgid "Manage your site settings here"
 msgstr "Manage your site settings here"
 
-#: packages/lib/constants/teams.ts
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Manager"
 msgstr "Manager"
 
@@ -3679,18 +4109,33 @@ msgstr "Max"
 msgid "Maximum file size: 4MB. Maximum 100 rows per upload. Blank values will use template defaults."
 msgstr "Maximum file size: 4MB. Maximum 100 rows per upload. Blank values will use template defaults."
 
-#: packages/lib/constants/teams.ts
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Member"
 msgstr "Member"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Member Count"
+msgstr "Member Count"
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
 msgid "Member Since"
 msgstr "Member Since"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
 msgid "Members"
 msgstr "Members"
 
@@ -3709,8 +4154,12 @@ msgstr "Min"
 msgid "Modify recipients"
 msgstr "Modify recipients"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Modify the details of the subscription claim."
+msgstr "Modify the details of the subscription claim."
+
 #: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Monthly"
 msgstr "Monthly"
 
@@ -3723,9 +4172,7 @@ msgid "Monthly Active Users: Users that had at least one of their documents comp
 msgstr "Monthly Active Users: Users that had at least one of their documents completed"
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "Move"
 msgstr "Move"
 
@@ -3737,36 +4184,18 @@ msgstr "Move \"{templateTitle}\" to a folder"
 msgid "Move Document to Folder"
 msgstr "Move Document to Folder"
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Move Document to Team"
-msgstr "Move Document to Team"
-
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 msgid "Move Template to Folder"
 msgstr "Move Template to Folder"
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Move Template to Team"
-msgstr "Move Template to Team"
-
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 msgid "Move to Folder"
 msgstr "Move to Folder"
 
-#: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
-#: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
-msgid "Move to Team"
-msgstr "Move to Team"
-
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Moving..."
-msgstr "Moving..."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "My templates"
-msgstr "My templates"
+#: packages/ui/components/document/document-global-auth-access-select.tsx
+msgid "Multiple access methods can be selected."
+msgstr "Multiple access methods can be selected."
 
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table.tsx
@@ -3774,9 +4203,11 @@ msgstr "My templates"
 #: apps/remix/app/components/tables/admin-leaderboard-table.tsx
 #: apps/remix/app/components/tables/admin-document-recipient-item-table.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-name-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
@@ -3794,6 +4225,10 @@ msgstr "My templates"
 msgid "Name"
 msgstr "Name"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Name is required"
+msgstr "Name is required"
+
 #: apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
 msgid "Need to sign documents?"
 msgstr "Need to sign documents?"
@@ -3822,18 +4257,16 @@ msgstr "Never expire"
 msgid "New Password"
 msgstr "New Password"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "New team owner"
-msgstr "New team owner"
-
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
 msgid "New Template"
 msgstr "New Template"
 
-#: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: packages/ui/primitives/signature-pad/signature-pad-dialog.tsx
 msgid "Next"
 msgstr "Next"
@@ -3842,6 +4275,11 @@ msgstr "Next"
 msgid "Next field"
 msgstr "Next field"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "No"
+msgstr "No"
+
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "No active drafts"
 msgstr "No active drafts"
@@ -3851,9 +4289,9 @@ msgstr "No active drafts"
 msgid "No further action is required from you at this time."
 msgstr "No further action is required from you at this time."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "No payment required"
-msgstr "No payment required"
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "No organisations found"
+msgstr "No organisations found"
 
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
 msgid "No public profile templates found"
@@ -3885,8 +4323,6 @@ msgid "No recipients with this role"
 msgstr "No recipients with this role"
 
 #: packages/ui/components/document/document-global-auth-action-select.tsx
-#: packages/ui/components/document/document-global-auth-action-select.tsx
-#: packages/ui/components/document/document-global-auth-access-select.tsx
 #: packages/ui/components/document/document-global-auth-access-select.tsx
 msgid "No restrictions"
 msgstr "No restrictions"
@@ -3903,6 +4339,18 @@ msgstr "No results found."
 msgid "No signature field found"
 msgstr "No signature field found"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "No Stripe customer attached"
+msgstr "No Stripe customer attached"
+
+#: apps/remix/app/components/tables/team-groups-table.tsx
+msgid "No team groups found"
+msgstr "No team groups found"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "No teams yet"
+msgstr "No teams yet"
+
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "No valid direct templates found"
 msgstr "No valid direct templates found"
@@ -3921,6 +4369,7 @@ msgstr "No value found."
 msgid "No worries, it happens! Enter your email and we'll email you a special link to reset your password."
 msgstr "No worries, it happens! Enter your email and we'll email you a special link to reset your password."
 
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/lib/constants/document.ts
 msgid "None"
@@ -3946,6 +4395,16 @@ msgstr "Number"
 msgid "Number format"
 msgstr "Number format"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Number of members allowed. 0 = Unlimited"
+msgstr "Number of members allowed. 0 = Unlimited"
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Number of teams allowed. 0 = Unlimited"
+msgstr "Number of teams allowed. 0 = Unlimited"
+
 #. placeholder {0}: document.team?.name
 #: apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
 msgid "on behalf of \"{0}\" has invited you to approve this document"
@@ -3970,17 +4429,15 @@ msgstr "on behalf of \"{0}\" has invited you to view this document"
 msgid "On this page, you can create a new webhook."
 msgstr "On this page, you can create a new webhook."
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "On this page, you can create and manage API tokens. See our <0>Documentation</0> for more information."
 msgstr "On this page, you can create and manage API tokens. See our <0>Documentation</0> for more information."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "On this page, you can create new Webhooks and manage the existing ones."
 msgstr "On this page, you can create new Webhooks and manage the existing ones."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "On this page, you can edit the webhook and its settings."
 msgstr "On this page, you can edit the webhook and its settings."
 
@@ -4000,18 +4457,18 @@ msgstr "Once you have scanned the QR code or entered the code manually, enter th
 msgid "Once your template is set up, share the link anywhere you want. The person who opens the link will be able to enter their information in the direct link recipient field and complete any other fields assigned to them."
 msgstr "Once your template is set up, share the link anywhere you want. The person who opens the link will be able to enter their information in the direct link recipient field and complete any other fields assigned to them."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "One of the documents in the current bundle has a signing role that is not compatible with the current signing experience."
+msgstr "One of the documents in the current bundle has a signing role that is not compatible with the current signing experience."
+
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Only admins can access and view the document"
 msgstr "Only admins can access and view the document"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Only managers and above can access and view the document"
 msgstr "Only managers and above can access and view the document"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Only subscribers can have a username shorter than 6 characters"
-msgstr "Only subscribers can have a username shorter than 6 characters"
-
 #: apps/remix/app/routes/_profile+/_layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
@@ -4031,15 +4488,131 @@ msgstr "Or"
 msgid "Or continue with"
 msgstr "Or continue with"
 
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "Organisation"
+msgstr "Organisation"
+
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Admin"
+msgstr "Organisation Admin"
+
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Organisation created"
+msgstr "Organisation created"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Organisation group not found"
+msgstr "Organisation group not found"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Organisation Group Settings"
+msgstr "Organisation Group Settings"
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation has been updated successfully"
+msgstr "Organisation has been updated successfully"
+
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "Organisation invitation"
+msgstr "Organisation invitation"
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Organisation invitations have been sent."
+msgstr "Organisation invitations have been sent."
+
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Manager"
+msgstr "Organisation Manager"
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Member"
+msgstr "Organisation Member"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation Members"
+msgstr "Organisation Members"
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Organisation Name"
+msgstr "Organisation Name"
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation not found"
+msgstr "Organisation not found"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Organisation Preferences"
+msgstr "Organisation Preferences"
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Organisation role"
+msgstr "Organisation role"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Organisation Role"
+msgstr "Organisation Role"
+
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Organisation settings"
+msgstr "Organisation settings"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+msgid "Organisation Settings"
+msgstr "Organisation Settings"
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation Teams"
+msgstr "Organisation Teams"
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Organisation URL"
+msgstr "Organisation URL"
+
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/routes/_authenticated+/settings+/organisations.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+#: apps/remix/app/components/general/settings-nav-mobile.tsx
+#: apps/remix/app/components/general/settings-nav-desktop.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Organisations"
+msgstr "Organisations"
+
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "Organisations that the user is a member of."
+msgstr "Organisations that the user is a member of."
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Organise your members into groups which can be assigned to teams"
+msgstr "Organise your members into groups which can be assigned to teams"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Organize your documents and templates"
+msgstr "Organize your documents and templates"
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Otherwise, the document will be created as a draft."
 msgstr "Otherwise, the document will be created as a draft."
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Owner"
 msgstr "Owner"
 
@@ -4054,10 +4627,7 @@ msgstr "Page {0} of {1}"
 msgid "Page {0} of {numPages}"
 msgstr "Page {0} of {numPages}"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "Paid"
-msgstr "Paid"
-
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/forms/signin.tsx
 msgid "Passkey"
 msgstr "Passkey"
@@ -4100,12 +4670,18 @@ msgid "Passkeys are not supported on this browser"
 msgstr "Passkeys are not supported on this browser"
 
 #: apps/remix/app/components/general/app-command-menu.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/forms/signin.tsx
 #: apps/remix/app/components/forms/reset-password.tsx
 msgid "Password"
 msgstr "Password"
 
+#: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
+msgid "Password Re-Authentication"
+msgstr "Password Re-Authentication"
+
 #: packages/email/templates/forgot-password.tsx
 msgid "Password Reset Requested"
 msgstr "Password Reset Requested"
@@ -4128,21 +4704,12 @@ msgstr "Password updated"
 msgid "Password updated!"
 msgstr "Password updated!"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "Pay"
-msgstr "Pay"
-
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Payment is required to finalise the creation of your team."
-msgstr "Payment is required to finalise the creation of your team."
-
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Payment overdue"
 msgstr "Payment overdue"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
@@ -4163,22 +4730,36 @@ msgstr "Pending documents"
 msgid "Pending Documents"
 msgstr "Pending Documents"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "Pending invitations"
 msgstr "Pending invitations"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "Pending team deleted."
-msgstr "Pending team deleted."
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "per month"
+msgstr "per month"
 
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "per year"
+msgstr "per year"
+
+#: apps/remix/app/components/tables/user-organisations-table.tsx
 msgid "Personal"
 msgstr "Personal"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 msgid "Personal Account"
 msgstr "Personal Account"
 
+#: apps/remix/app/routes/_authenticated+/inbox.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/menu-switcher.tsx
+msgid "Personal Inbox"
+msgstr "Personal Inbox"
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
 msgid "Pick a number"
 msgstr "Pick a number"
@@ -4218,7 +4799,7 @@ msgstr "Please {recipientActionVerb} this document created by your direct templa
 msgid "Please {recipientActionVerb} your document"
 msgstr "Please {recipientActionVerb} your document"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Please check the CSV file and make sure it is according to our format"
 msgstr "Please check the CSV file and make sure it is according to our format"
 
@@ -4251,6 +4832,10 @@ msgstr "Please confirm your email address"
 msgid "Please contact support if you would like to revert this action."
 msgstr "Please contact support if you would like to revert this action."
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Please contact the site owner for further assistance."
+msgstr "Please contact the site owner for further assistance."
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "Please enter a meaningful name for your token. This will help you identify it later."
 msgstr "Please enter a meaningful name for your token. This will help you identify it later."
@@ -4336,17 +4921,25 @@ msgstr "Please type {0} to confirm"
 msgid "Please type <0>{0}</0> to confirm."
 msgstr "Please type <0>{0}</0> to confirm."
 
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Please upload a logo"
+msgstr "Please upload a logo"
+
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
 msgid "Pre-formatted CSV template with example data."
 msgstr "Pre-formatted CSV template with example data."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/components/general/settings-nav-mobile.tsx
+#: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
 msgid "Preferences"
 msgstr "Preferences"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Preview"
 msgstr "Preview"
 
@@ -4374,11 +4967,11 @@ msgstr "Proceed"
 msgid "Profile"
 msgstr "Profile"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Profile is currently <0>hidden</0>."
 msgstr "Profile is currently <0>hidden</0>."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Profile is currently <0>visible</0>."
 msgstr "Profile is currently <0>visible</0>."
 
@@ -4387,12 +4980,16 @@ msgstr "Profile is currently <0>visible</0>."
 msgid "Profile updated"
 msgstr "Profile updated"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Progress"
+msgstr "Progress"
+
 #: apps/remix/app/components/tables/templates-table.tsx
 #: apps/remix/app/components/general/template/template-type.tsx
 msgid "Public"
 msgstr "Public"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -4404,10 +5001,6 @@ msgstr "Public Profile"
 msgid "Public profile URL"
 msgstr "Public profile URL"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Public profile username"
-msgstr "Public profile username"
-
 #: apps/remix/app/components/tables/templates-table.tsx
 msgid "Public templates are connected to your public profile. Any modifications to public templates will also appear in your public profile."
 msgstr "Public templates are connected to your public profile. Any modifications to public templates will also appear in your public profile."
@@ -4477,6 +5070,7 @@ msgstr "Recent activity"
 msgid "Recent documents"
 msgstr "Recent documents"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
@@ -4557,6 +5151,7 @@ msgstr "Reject Document"
 #: apps/remix/app/components/general/stack-avatars-with-tooltip.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/document.ts
 msgid "Rejected"
 msgstr "Rejected"
@@ -4591,43 +5186,47 @@ msgstr "Reminder: Please {recipientActionVerb} this document"
 msgid "Reminder: Please {recipientActionVerb} your document"
 msgstr "Reminder: Please {recipientActionVerb} your document"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-field-container.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: packages/ui/primitives/document-flow/field-item.tsx
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "Remove"
 msgstr "Remove"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+msgid "Remove organisation group"
+msgstr "Remove organisation group"
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+msgid "Remove organisation member"
+msgstr "Remove organisation member"
+
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 msgid "Remove team email"
 msgstr "Remove team email"
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "Remove team member"
 msgstr "Remove team member"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Renews: {formattedDate}"
-msgstr "Renews: {formattedDate}"
-
 #: apps/remix/app/components/forms/reset-password.tsx
 #: apps/remix/app/components/forms/password.tsx
 msgid "Repeat Password"
 msgstr "Repeat Password"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Request transfer"
-msgstr "Request transfer"
-
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx
@@ -4640,7 +5239,7 @@ msgstr "Required field"
 msgid "Reseal document"
 msgstr "Reseal document"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Resend"
@@ -4656,6 +5255,7 @@ msgstr "Resend verification"
 
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 msgid "Reset"
 msgstr "Reset"
 
@@ -4674,11 +5274,11 @@ msgstr "Reset Password"
 msgid "Resetting Password..."
 msgstr "Resetting Password..."
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Resolve"
 msgstr "Resolve"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Resolve payment"
 msgstr "Resolve payment"
 
@@ -4686,6 +5286,10 @@ msgstr "Resolve payment"
 msgid "Rest assured, your document is strictly confidential and will never be shared. Only your signing experience will be highlighted. Share your personalized signing card to showcase your signature!"
 msgstr "Rest assured, your document is strictly confidential and will never be shared. Only your signing experience will be highlighted. Share your personalized signing card to showcase your signature!"
 
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
+msgid "Restricted Access"
+msgstr "Restricted Access"
+
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Retention of Documents"
 msgstr "Retention of Documents"
@@ -4696,16 +5300,12 @@ msgstr "Retry"
 
 #: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Return"
 msgstr "Return"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "Return to Dashboard"
-msgstr "Return to Dashboard"
-
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Return to Home"
 msgstr "Return to Home"
 
@@ -4722,13 +5322,17 @@ msgstr "Revoke"
 msgid "Revoke access"
 msgstr "Revoke access"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
 msgid "Role"
 msgstr "Role"
 
@@ -4759,13 +5363,23 @@ msgstr "Save"
 msgid "Save Template"
 msgstr "Save Template"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
 #: apps/remix/app/components/tables/documents-table-sender-filter.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 msgid "Search"
 msgstr "Search"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Search and manage all organisations"
+msgstr "Search and manage all organisations"
+
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Search by claim ID or name"
+msgstr "Search by claim ID or name"
+
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 msgid "Search by document title"
 msgstr "Search by document title"
@@ -4775,6 +5389,10 @@ msgstr "Search by document title"
 msgid "Search by name or email"
 msgstr "Search by name or email"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Search by organisation ID, name, customer ID or owner email"
+msgstr "Search by organisation ID, name, customer ID or owner email"
+
 #: apps/remix/app/components/general/document/document-search.tsx
 msgid "Search documents..."
 msgstr "Search documents..."
@@ -4783,7 +5401,6 @@ msgstr "Search documents..."
 msgid "Search languages..."
 msgstr "Search languages..."
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Secret"
 msgstr "Secret"
@@ -4808,18 +5425,17 @@ msgstr "Select"
 msgid "Select a folder to move this document to."
 msgstr "Select a folder to move this document to."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Select a team"
-msgstr "Select a team"
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Select a plan"
+msgstr "Select a plan"
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Select a team to move this document to. This action cannot be undone."
-msgstr "Select a team to move this document to. This action cannot be undone."
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Select a plan to continue"
+msgstr "Select a plan to continue"
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Select a team to move this template to. This action cannot be undone."
-msgstr "Select a team to move this template to. This action cannot be undone."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Select a team to view its dashboard"
+msgstr "Select a team to view its dashboard"
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Select a template you'd like to display on your public profile"
@@ -4829,22 +5445,70 @@ msgstr "Select a template you'd like to display on your public profile"
 msgid "Select a template you'd like to display on your team's public profile"
 msgstr "Select a template you'd like to display on your team's public profile"
 
+#: packages/ui/components/document/document-global-auth-access-select.tsx
+msgid "Select access methods"
+msgstr "Select access methods"
+
 #: packages/ui/primitives/combobox.tsx
 msgid "Select an option"
 msgstr "Select an option"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Select an organisation to view teams"
+msgstr "Select an organisation to view teams"
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
 msgid "Select at least"
 msgstr "Select at least"
 
+#: packages/ui/components/recipient/recipient-action-auth-select.tsx
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "Select authentication methods"
+msgstr "Select authentication methods"
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/dropdown-field.tsx
 msgid "Select default option"
 msgstr "Select default option"
 
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select groups"
+msgstr "Select groups"
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select groups to add to this team"
+msgstr "Select groups to add to this team"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Select members"
+msgstr "Select members"
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select members or groups of members to add to the team."
+msgstr "Select members or groups of members to add to the team."
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Select members to add to this team"
+msgstr "Select members to add to this team"
+
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 msgid "Select passkey"
 msgstr "Select passkey"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Select signature types"
+msgstr "Select signature types"
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Select the members to add to this group"
+msgstr "Select the members to add to this group"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Select the members to include in this group"
+msgstr "Select the members to include in this group"
+
 #: apps/remix/app/components/general/webhook-multiselect-combobox.tsx
 #: apps/remix/app/components/general/webhook-multiselect-combobox.tsx
 msgid "Select triggers"
@@ -4893,7 +5557,7 @@ msgstr "Send documents on behalf of the team using the email address"
 msgid "Send documents to recipients immediately"
 msgstr "Send documents to recipients immediately"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Send on Behalf of Team"
 msgstr "Send on Behalf of Team"
 
@@ -4913,6 +5577,7 @@ msgstr "Send recipient signing request email"
 msgid "Send reminder"
 msgstr "Send reminder"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 msgid "Sender"
 msgstr "Sender"
@@ -4942,7 +5607,10 @@ msgstr "Set up your document properties and recipient information"
 msgid "Set up your template properties and recipient information"
 msgstr "Set up your template properties and recipient information"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/routes/_authenticated+/settings+/_layout.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -4975,7 +5643,7 @@ msgstr "Share the Link"
 msgid "Share your signing experience!"
 msgstr "Share your signing experience!"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Show"
 msgstr "Show"
 
@@ -4988,15 +5656,12 @@ msgstr "Show additional information"
 msgid "Show advanced settings"
 msgstr "Show advanced settings"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Show templates in your public profile for your audience to sign and get started quickly"
 msgstr "Show templates in your public profile for your audience to sign and get started quickly"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Show templates in your team public profile for your audience to sign and get started quickly"
-msgstr "Show templates in your team public profile for your audience to sign and get started quickly"
-
 #: apps/remix/app/routes/_profile+/p.$url.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/user-profile-timur.tsx
@@ -5005,6 +5670,7 @@ msgstr "Show templates in your team public profile for your audience to sign and
 #: apps/remix/app/components/general/document-signing/document-signing-name-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 #: apps/remix/app/components/general/document/document-page-view-button.tsx
 #: packages/lib/constants/recipient-roles.ts
@@ -5025,6 +5691,7 @@ msgstr "Sign as<0>{0} <1>({1})</1></0>"
 
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Sign document"
 msgstr "Sign document"
 
@@ -5033,6 +5700,11 @@ msgstr "Sign document"
 msgid "Sign Document"
 msgstr "Sign Document"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Sign Documents"
+msgstr "Sign Documents"
+
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 msgid "Sign field"
 msgstr "Sign field"
@@ -5048,9 +5720,11 @@ msgid "Sign In"
 msgstr "Sign In"
 
 #: apps/remix/app/routes/_unauthenticated+/signin.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 msgid "Sign in to your account"
 msgstr "Sign in to your account"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 msgid "Sign Out"
@@ -5058,6 +5732,7 @@ msgstr "Sign Out"
 
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Sign the document to complete the process."
 msgstr "Sign the document to complete the process."
 
@@ -5081,6 +5756,7 @@ msgstr "Sign Up with OIDC"
 #: apps/remix/app/components/forms/profile.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
 #: packages/ui/primitives/document-flow/types.ts
 #: packages/ui/primitives/document-flow/add-fields.tsx
@@ -5203,24 +5879,25 @@ msgstr "Some signers have not been assigned a signature field. Please assign at
 
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/share-document-download-button.tsx
-#: apps/remix/app/components/general/billing-portal-button.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-page.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-account.tsx
 #: apps/remix/app/components/general/document/document-page-view-dropdown.tsx
@@ -5230,7 +5907,6 @@ msgstr "Some signers have not been assigned a signature field. Please assign at
 #: apps/remix/app/components/general/document/document-audit-log-download-button.tsx
 #: apps/remix/app/components/general/direct-template/direct-template-signing-auth-page.tsx
 #: apps/remix/app/components/general/direct-template/direct-template-page.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
@@ -5238,11 +5914,11 @@ msgstr "Some signers have not been assigned a signature field. Please assign at
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
@@ -5250,11 +5926,6 @@ msgstr "Some signers have not been assigned a signature field. Please assign at
 msgid "Something went wrong"
 msgstr "Something went wrong"
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Something went wrong while attempting to transfer the ownership of team <0>{0}</0> to your. Please try again later or contact support."
-msgstr "Something went wrong while attempting to transfer the ownership of team <0>{0}</0> to your. Please try again later or contact support."
-
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "Something went wrong while attempting to verify your email address for <0>{0}</0>. Please try again later."
@@ -5277,7 +5948,8 @@ msgstr "Something went wrong while sending the confirmation email."
 msgid "Something went wrong while updating the team billing subscription, please contact support."
 msgstr "Something went wrong while updating the team billing subscription, please contact support."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Something went wrong!"
 msgstr "Something went wrong!"
 
@@ -5302,6 +5974,7 @@ msgstr "Sorry, we were unable to download the audit logs. Please try again later
 msgid "Sorry, we were unable to download the certificate. Please try again later."
 msgstr "Sorry, we were unable to download the certificate. Please try again later."
 
+#: apps/remix/app/components/tables/team-members-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Source"
 msgstr "Source"
@@ -5311,10 +5984,11 @@ msgid "Stats"
 msgstr "Stats"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Status"
 msgstr "Status"
@@ -5323,48 +5997,78 @@ msgstr "Status"
 msgid "Step <0>{step} of {maxStep}</0>"
 msgstr "Step <0>{step} of {maxStep}</0>"
 
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "Stripe"
+msgstr "Stripe"
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Stripe customer created successfully"
+msgstr "Stripe customer created successfully"
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Stripe Customer ID"
+msgstr "Stripe Customer ID"
+
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Subject <0>(Optional)</0>"
 msgstr "Subject <0>(Optional)</0>"
 
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Subscription"
 msgstr "Subscription"
 
-#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
-msgid "Subscriptions"
-msgstr "Subscriptions"
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Subscription claim created successfully."
+msgstr "Subscription claim created successfully."
+
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Subscription claim deleted successfully."
+msgstr "Subscription claim deleted successfully."
+
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Subscription claim updated successfully."
+msgstr "Subscription claim updated successfully."
+
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Subscription Claims"
+msgstr "Subscription Claims"
 
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/general/verify-email-banner.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
@@ -5373,6 +6077,15 @@ msgstr "Subscriptions"
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 msgid "Success"
 msgstr "Success"
 
@@ -5396,8 +6109,9 @@ msgstr "System Requirements"
 msgid "System Theme"
 msgstr "System Theme"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table.tsx
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
 msgid "Team"
 msgstr "Team"
 
@@ -5406,9 +6120,18 @@ msgstr "Team"
 msgid "Team \"{0}\" has been deleted on Documenso"
 msgstr "Team \"{0}\" has been deleted on Documenso"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Team checkout"
-msgstr "Team checkout"
+#: packages/lib/constants/teams-translations.ts
+msgid "Team Admin"
+msgstr "Team Admin"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Team Assignments"
+msgstr "Team Assignments"
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Team Count"
+msgstr "Team Count"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
@@ -5452,25 +6175,34 @@ msgstr "Team email verified!"
 msgid "Team email was updated."
 msgstr "Team email was updated."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "Team invitation"
-msgstr "Team invitation"
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
+msgid "Team Groups"
+msgstr "Team Groups"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "Team invitations have been sent."
-msgstr "Team invitations have been sent."
+#: packages/lib/constants/teams-translations.ts
+msgid "Team Manager"
+msgstr "Team Manager"
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: packages/lib/constants/teams-translations.ts
 msgid "Team Member"
 msgstr "Team Member"
 
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+msgid "Team Members"
+msgstr "Team Members"
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Team members have been added."
+msgstr "Team members have been added."
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Team Name"
 msgstr "Team Name"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "Team not found"
 msgstr "Team not found"
@@ -5483,27 +6215,17 @@ msgstr "Team Only"
 msgid "Team only templates are not linked anywhere and are visible only to your team."
 msgstr "Team only templates are not linked anywhere and are visible only to your team."
 
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transfer"
-msgstr "Team ownership transfer"
-
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transfer already completed!"
-msgstr "Team ownership transfer already completed!"
-
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transferred!"
-msgstr "Team ownership transferred!"
-
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Team Preferences"
 msgstr "Team Preferences"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Team Public Profile"
-msgstr "Team Public Profile"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Team Role"
+msgstr "Team Role"
 
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 msgid "Team settings"
 msgstr "Team settings"
 
@@ -5511,44 +6233,37 @@ msgstr "Team settings"
 msgid "Team Settings"
 msgstr "Team Settings"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Team templates"
-msgstr "Team templates"
-
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "Team transfer in progress"
-msgstr "Team transfer in progress"
-
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "Team transfer request expired"
-msgstr "Team transfer request expired"
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Team url"
+msgstr "Team url"
 
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Team URL"
 msgstr "Team URL"
 
-#: apps/remix/app/routes/_authenticated+/settings+/teams.tsx
-#: apps/remix/app/components/general/settings-nav-mobile.tsx
-#: apps/remix/app/components/general/settings-nav-desktop.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
-#: apps/remix/app/components/general/app-nav-mobile.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 msgid "Teams"
 msgstr "Teams"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-msgid "Teams restricted"
-msgstr "Teams restricted"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Teams help you organise your work and collaborate with others. Create your first team to get started."
+msgstr "Teams help you organise your work and collaborate with others. Create your first team to get started."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Teams that this organisation group is currently assigned to"
+msgstr "Teams that this organisation group is currently assigned to"
+
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Template"
 msgstr "Template"
 
@@ -5581,14 +6296,9 @@ msgid "Template is using legacy field insertion"
 msgstr "Template is using legacy field insertion"
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 msgid "Template moved"
 msgstr "Template moved"
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Template not found or already associated with a team."
-msgstr "Template not found or already associated with a team."
-
 #: apps/remix/app/components/general/template/template-edit-form.tsx
 msgid "Template saved"
 msgstr "Template saved"
@@ -5601,10 +6311,10 @@ msgstr "Template title"
 msgid "Template updated successfully"
 msgstr "Template updated successfully"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -5636,6 +6346,10 @@ msgstr "Text Align"
 msgid "Text Color"
 msgstr "Text Color"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Thank you for completing the signing process."
+msgstr "Thank you for completing the signing process."
+
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Thank you for using Documenso to perform your electronic document signing. The purpose of this disclosure is to inform you about the process, legality, and your rights regarding the use of electronic signatures on our platform. By opting to use an electronic signature, you are agreeing to the terms and conditions outlined below."
 msgstr "Thank you for using Documenso to perform your electronic document signing. The purpose of this disclosure is to inform you about the process, legality, and your rights regarding the use of electronic signatures on our platform. By opting to use an electronic signature, you are agreeing to the terms and conditions outlined below."
@@ -5657,16 +6371,16 @@ msgid "The account has been enabled successfully."
 msgstr "The account has been enabled successfully."
 
 #: packages/ui/components/recipient/recipient-action-auth-select.tsx
-msgid "The authentication required for recipients to sign fields"
-msgstr "The authentication required for recipients to sign fields"
+msgid "The authentication methods required for recipients to sign fields"
+msgstr "The authentication methods required for recipients to sign fields"
 
 #: packages/ui/components/document/document-global-auth-action-select.tsx
-msgid "The authentication required for recipients to sign the signature field."
-msgstr "The authentication required for recipients to sign the signature field."
+msgid "The authentication methods required for recipients to sign the signature field."
+msgstr "The authentication methods required for recipients to sign the signature field."
 
 #: packages/ui/components/document/document-global-auth-access-select.tsx
-msgid "The authentication required for recipients to view the document."
-msgstr "The authentication required for recipients to view the document."
+msgid "The authentication methods required for recipients to view the document."
+msgstr "The authentication methods required for recipients to view the document."
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "The content to show in the banner, HTML is allowed"
@@ -5682,10 +6396,6 @@ msgstr "The direct link has been copied to your clipboard"
 msgid "The document has been moved successfully."
 msgstr "The document has been moved successfully."
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "The document has been successfully moved to the selected team."
-msgstr "The document has been successfully moved to the selected team."
-
 #: apps/remix/app/components/embed/authoring/configure-document-upload.tsx
 msgid "The document is already saved and cannot be changed."
 msgstr "The document is already saved and cannot be changed."
@@ -5755,17 +6465,36 @@ msgid "The following errors occurred:"
 msgstr "The following errors occurred:"
 
 #: packages/email/templates/team-delete.tsx
-msgid "The following team has been deleted by its owner. You will no longer be able to access this team and its documents"
-msgstr "The following team has been deleted by its owner. You will no longer be able to access this team and its documents"
+msgid "The following team has been deleted. You will no longer be able to access this team and its documents"
+msgstr "The following team has been deleted. You will no longer be able to access this team and its documents"
 
-#: packages/email/templates/team-delete.tsx
-msgid "The following team has been deleted by you"
-msgstr "The following team has been deleted by you"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid ""
+"The organisation group you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
+"The organisation group you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "The ownership of team <0>{0}</0> has been successfully transferred to you."
-msgstr "The ownership of team <0>{0}</0> has been successfully transferred to you."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "The organisation role that will be applied to all members in this group."
+msgstr "The organisation role that will be applied to all members in this group."
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid ""
+"The organisation you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
+"The organisation you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid ""
+"The organisation you are looking for may have been removed, renamed or may have never\n"
+"                  existed."
+msgstr ""
+"The organisation you are looking for may have been removed, renamed or may have never\n"
+"                  existed."
 
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "The page you are looking for was moved, removed, renamed or might never have existed."
@@ -5815,10 +6544,6 @@ msgstr "The recipient is required to sign the document for it to be completed."
 msgid "The recipient is required to view the document for it to be completed."
 msgstr "The recipient is required to view the document for it to be completed."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "The selected team member will receive an email which they must accept before the team is transferred"
-msgstr "The selected team member will receive an email which they must accept before the team is transferred"
-
 #: packages/ui/components/document/document-share-button.tsx
 msgid "The sharing link could not be created at this time. Please try again."
 msgstr "The sharing link could not be created at this time. Please try again."
@@ -5850,14 +6575,13 @@ msgstr "The site banner is a message that is shown at the top of the site. It ca
 msgid "The team email <0>{teamEmail}</0> has been removed from the following team"
 msgstr "The team email <0>{teamEmail}</0> has been removed from the following team"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "The team transfer invitation has been successfully deleted."
-msgstr "The team transfer invitation has been successfully deleted."
-
-#. placeholder {0}: transferVerification.name
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "The team transfer request to <0>{0}</0> has expired."
-msgstr "The team transfer request to <0>{0}</0> has expired."
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid ""
+"The team you are looking for may have been removed, renamed or may have never\n"
+"                  existed."
+msgstr ""
+"The team you are looking for may have been removed, renamed or may have never\n"
+"                  existed."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid ""
@@ -5871,10 +6595,6 @@ msgstr ""
 msgid "The template has been moved successfully."
 msgstr "The template has been moved successfully."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "The template has been successfully moved to the selected team."
-msgstr "The template has been successfully moved to the selected team."
-
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "The template will be removed from your profile"
 msgstr "The template will be removed from your profile"
@@ -5900,17 +6620,23 @@ msgid "The types of signatures that recipients are allowed to use when signing t
 msgstr "The types of signatures that recipients are allowed to use when signing the document."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "The URL for Documenso to send webhook events to."
 msgstr "The URL for Documenso to send webhook events to."
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid ""
+"The user you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
+"The user you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 msgid "The webhook has been successfully deleted."
 msgstr "The webhook has been successfully deleted."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "The webhook has been updated successfully."
 msgstr "The webhook has been updated successfully."
 
@@ -5930,6 +6656,14 @@ msgstr "There are no completed documents yet. Documents that you have created or
 msgid "There was an error uploading your file. Please try again."
 msgstr "There was an error uploading your file. Please try again."
 
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "These can be overriden by setting the authentication requirements directly on each recipient in the next step. Multiple methods can be selected."
+msgstr "These can be overriden by setting the authentication requirements directly on each recipient in the next step. Multiple methods can be selected."
+
+#: packages/ui/components/recipient/recipient-action-auth-select.tsx
+msgid "These will override any global settings. Multiple methods can be selected."
+msgstr "These will override any global settings. Multiple methods can be selected."
+
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 msgid "They have permission on your behalf to:"
 msgstr "They have permission on your behalf to:"
@@ -5952,9 +6686,9 @@ msgstr "This action is not reversible. Please be certain."
 msgid "This action is reversible, but please be careful as the account may be affected permanently (e.g. their settings and contents not being restored properly)."
 msgstr "This action is reversible, but please be careful as the account may be affected permanently (e.g. their settings and contents not being restored properly)."
 
-#: packages/ui/components/document/document-global-auth-action-select.tsx
-msgid "This can be overriden by setting the authentication requirements directly on each recipient in the next step."
-msgstr "This can be overriden by setting the authentication requirements directly on each recipient in the next step."
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "This claim is locked and cannot be deleted."
+msgstr "This claim is locked and cannot be deleted."
 
 #: packages/email/template-components/template-document-super-delete.tsx
 msgid "This document can not be recovered, if you would like to dispute the reason for future documents please contact support."
@@ -5988,13 +6722,11 @@ msgstr "This document has been cancelled by the owner and is no longer available
 msgid "This document has been cancelled by the owner."
 msgstr "This document has been cancelled by the owner."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document has been rejected by a recipient"
 msgstr "This document has been rejected by a recipient"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document has been signed by all recipients"
 msgstr "This document has been signed by all recipients"
 
@@ -6002,8 +6734,7 @@ msgstr "This document has been signed by all recipients"
 msgid "This document is available in your Documenso account. You can view more details, recipients, and audit logs there."
 msgstr "This document is available in your Documenso account. You can view more details, recipients, and audit logs there."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document is currently a draft and has not been sent"
 msgstr "This document is currently a draft and has not been sent"
 
@@ -6060,14 +6791,22 @@ msgstr "This folder name is already taken."
 msgid "This is how the document will reach the recipients once the document is ready for signing."
 msgstr "This is how the document will reach the recipients once the document is ready for signing."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "This is the claim that this organisation was initially created with. Any feature flag changes to this claim will be backported into this organisation."
+msgstr "This is the claim that this organisation was initially created with. Any feature flag changes to this claim will be backported into this organisation."
+
 #: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "This link is invalid or has expired. Please contact your team to resend a transfer request."
-msgstr "This link is invalid or has expired. Please contact your team to resend a transfer request."
+msgid "This link is invalid or has expired."
+msgstr "This link is invalid or has expired."
 
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "This link is invalid or has expired. Please contact your team to resend a verification."
 msgstr "This link is invalid or has expired. Please contact your team to resend a verification."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "This organisation, and any associated data will be permanently deleted."
+msgstr "This organisation, and any associated data will be permanently deleted."
+
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "This passkey has already been registered."
 msgstr "This passkey has already been registered."
@@ -6076,10 +6815,6 @@ msgstr "This passkey has already been registered."
 msgid "This passkey is not configured for this application. Please login and add one in the user settings."
 msgstr "This passkey is not configured for this application. Please login and add one in the user settings."
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "This price includes minimum 5 seats."
-msgstr "This price includes minimum 5 seats."
-
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "This recipient can no longer be modified as they have signed a field, or completed the document."
 msgstr "This recipient can no longer be modified as they have signed a field, or completed the document."
@@ -6104,23 +6839,20 @@ msgstr "This template could not be deleted at this time. Please try again."
 msgid "This template is using legacy field insertion, we recommend using the new field insertion method for more accurate results."
 msgstr "This template is using legacy field insertion, we recommend using the new field insertion method for more accurate results."
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "This token is invalid or has expired. No action is needed."
 msgstr "This token is invalid or has expired. No action is needed."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "This token is invalid or has expired. Please contact your team for a new invitation."
 msgstr "This token is invalid or has expired. Please contact your team for a new invitation."
 
 #: apps/remix/app/components/forms/team-update-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "This URL is already in use."
 msgstr "This URL is already in use."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "This username has already been taken"
-msgstr "This username has already been taken"
-
 #: packages/ui/components/document/document-email-checkboxes.tsx
 msgid "This will be sent to all recipients if a pending document has been deleted."
 msgstr "This will be sent to all recipients if a pending document has been deleted."
@@ -6133,17 +6865,16 @@ msgstr "This will be sent to all recipients once the document has been fully com
 msgid "This will be sent to the document owner once the document has been fully completed."
 msgstr "This will be sent to the document owner once the document has been fully completed."
 
-#: packages/ui/components/recipient/recipient-action-auth-select.tsx
-msgid "This will override any global settings."
-msgstr "This will override any global settings."
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "This will ONLY backport feature flags which are set to true, anything disabled in the initial claim will not be backported"
+msgstr "This will ONLY backport feature flags which are set to true, anything disabled in the initial claim will not be backported"
 
 #: apps/remix/app/components/tables/internal-audit-log-table.tsx
 #: apps/remix/app/components/tables/document-logs-table.tsx
 msgid "Time"
 msgstr "Time"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Time zone"
 msgstr "Time zone"
 
@@ -6156,6 +6887,7 @@ msgstr "Time Zone"
 
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 #: apps/remix/app/components/tables/templates-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-view.tsx
@@ -6167,7 +6899,7 @@ msgstr "Title"
 msgid "Title cannot be empty"
 msgstr "Title cannot be empty"
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "To accept this invitation you must create an account."
 msgstr "To accept this invitation you must create an account."
 
@@ -6188,10 +6920,6 @@ msgstr "To confirm, please enter the accounts email address <0/>({0})."
 msgid "To confirm, please enter the reason"
 msgstr "To confirm, please enter the reason"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "To decline this invitation you must create an account."
-msgstr "To decline this invitation you must create an account."
-
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "To enable two-factor authentication, scan the following QR code using your authenticator app."
 msgstr "To enable two-factor authentication, scan the following QR code using your authenticator app."
@@ -6220,11 +6948,11 @@ msgstr "To use our electronic signature service, you must have access to:"
 msgid "To view this document you need to be signed into your account, please sign in to continue."
 msgstr "To view this document you need to be signed into your account, please sign in to continue."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Toggle the switch to hide your profile from the public."
 msgstr "Toggle the switch to hide your profile from the public."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Toggle the switch to show your profile to the public."
 msgstr "Toggle the switch to show your profile to the public."
 
@@ -6244,7 +6972,7 @@ msgstr "Token created"
 msgid "Token deleted"
 msgstr "Token deleted"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Token doesn't have an expiration date"
 msgstr "Token doesn't have an expiration date"
 
@@ -6280,26 +7008,7 @@ msgstr "Total Signers that Signed Up"
 msgid "Total Users"
 msgstr "Total Users"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "transfer {teamName}"
-msgstr "transfer {teamName}"
-
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Transfer ownership of this team to a selected team member."
-msgstr "Transfer ownership of this team to a selected team member."
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Transfer team"
-msgstr "Transfer team"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-msgid "Transfer the ownership of the team to another team member."
-msgstr "Transfer the ownership of the team to another team member."
-
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Triggers"
 msgstr "Triggers"
@@ -6366,11 +7075,11 @@ msgstr "Unable to copy token"
 msgid "Unable to create direct template access. Please try again later."
 msgstr "Unable to create direct template access. Please try again later."
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Unable to decline this team invitation at this time."
-msgstr "Unable to decline this team invitation at this time."
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Unable to decline this invitation at this time."
+msgstr "Unable to decline this invitation at this time."
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Unable to delete invitation. Please try again."
 msgstr "Unable to delete invitation. Please try again."
 
@@ -6382,9 +7091,9 @@ msgstr "Unable to delete team"
 msgid "Unable to disable two-factor authentication"
 msgstr "Unable to disable two-factor authentication"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Unable to join this team at this time."
-msgstr "Unable to join this team at this time."
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Unable to join this organisation at this time."
+msgstr "Unable to join this organisation at this time."
 
 #: apps/remix/app/components/general/document/document-page-view-recent-activity.tsx
 #: apps/remix/app/components/general/document/document-history-sheet.tsx
@@ -6407,7 +7116,7 @@ msgstr "Unable to remove email verification at this time. Please try again."
 msgid "Unable to remove team email at this time. Please try again."
 msgstr "Unable to remove team email at this time. Please try again."
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Unable to resend invitation. Please try again."
 msgstr "Unable to resend invitation. Please try again."
 
@@ -6429,7 +7138,10 @@ msgstr "Unable to setup two-factor authentication"
 msgid "Unable to sign in"
 msgstr "Unable to sign in"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 msgid "Unauthorized"
 msgstr "Unauthorized"
@@ -6443,22 +7155,35 @@ msgstr "Uncompleted"
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
 msgid "Unknown"
 msgstr "Unknown"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "Unpaid"
-msgstr "Unpaid"
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "Unlimited"
+msgstr "Unlimited"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Unlimited documents, API and more"
+msgstr "Unlimited documents, API and more"
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Untitled Group"
+msgstr "Untitled Group"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Update"
@@ -6468,10 +7193,31 @@ msgstr "Update"
 msgid "Update Banner"
 msgstr "Update Banner"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Update Billing"
+msgstr "Update Billing"
+
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Update Claim"
+msgstr "Update Claim"
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Update current organisation"
+msgstr "Update current organisation"
+
 #: apps/remix/app/components/general/legacy-field-warning-popover.tsx
 msgid "Update Fields"
 msgstr "Update Fields"
 
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Update organisation"
+msgstr "Update organisation"
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "Update organisation member"
+msgstr "Update organisation member"
+
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "Update passkey"
 msgstr "Update passkey"
@@ -6490,10 +7236,16 @@ msgstr "Update profile"
 msgid "Update Recipient"
 msgstr "Update Recipient"
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
 msgid "Update role"
 msgstr "Update role"
 
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Update Subscription Claim"
+msgstr "Update Subscription Claim"
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 msgid "Update team"
 msgstr "Update team"
@@ -6503,6 +7255,11 @@ msgstr "Update team"
 msgid "Update team email"
 msgstr "Update team email"
 
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "Update team group"
+msgstr "Update team group"
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 msgid "Update team member"
@@ -6517,7 +7274,6 @@ msgid "Update user"
 msgstr "Update user"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Update webhook"
 msgstr "Update webhook"
 
@@ -6534,6 +7290,11 @@ msgstr "Updating Your Information"
 msgid "Upgrade"
 msgstr "Upgrade"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Upgrade <0>{0}</0> to {planName}"
+msgstr "Upgrade <0>{0}</0> to {planName}"
+
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
 msgid "Upgrade your plan to upload more documents"
 msgstr "Upgrade your plan to upload more documents"
@@ -6581,7 +7342,7 @@ msgstr "Upload Signature"
 msgid "Upload Template Document"
 msgstr "Upload Template Document"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Upload your brand logo (max 5MB, JPG, PNG, or WebP)"
 msgstr "Upload your brand logo (max 5MB, JPG, PNG, or WebP)"
 
@@ -6606,8 +7367,7 @@ msgstr "Uploaded file not an allowed file type"
 msgid "Uploading document..."
 msgstr "Uploading document..."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Use"
 msgstr "Use"
 
@@ -6625,6 +7385,10 @@ msgstr "Use Backup Code"
 msgid "Use Template"
 msgstr "Use Template"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Use your passkey for authentication"
+msgstr "Use your passkey for authentication"
+
 #: apps/remix/app/components/tables/internal-audit-log-table.tsx
 #: apps/remix/app/components/tables/document-logs-table.tsx
 msgid "User"
@@ -6634,9 +7398,9 @@ msgstr "User"
 msgid "User has no password."
 msgstr "User has no password."
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "User ID"
-msgstr "User ID"
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "User not found"
+msgstr "User not found"
 
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
@@ -6644,6 +7408,10 @@ msgstr "User ID"
 msgid "User not found."
 msgstr "User not found."
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "User Organisations"
+msgstr "User Organisations"
+
 #: apps/remix/app/components/forms/signup.tsx
 msgid "User profiles are here!"
 msgstr "User profiles are here!"
@@ -6656,10 +7424,6 @@ msgstr "User settings"
 msgid "User with this email already exists. Please use a different email address."
 msgstr "User with this email already exists. Please use a different email address."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Username can only container alphanumeric characters and dashes."
-msgstr "Username can only container alphanumeric characters and dashes."
-
 #: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
 msgid "Users"
 msgstr "Users"
@@ -6707,12 +7471,15 @@ msgstr "Verify your team email address"
 msgid "Version History"
 msgstr "Version History"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/document/document-page-view-button.tsx
 #: apps/remix/app/components/forms/2fa/view-recovery-codes-dialog.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "View"
 msgstr "View"
@@ -6762,7 +7529,7 @@ msgstr "View Document"
 msgid "View documents associated with this email"
 msgstr "View documents associated with this email"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "View invites"
 msgstr "View invites"
 
@@ -6770,10 +7537,18 @@ msgstr "View invites"
 msgid "View more"
 msgstr "View more"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "View next document"
+msgstr "View next document"
+
 #: apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
 msgid "View Original Document"
 msgstr "View Original Document"
 
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "View owner"
+msgstr "View owner"
+
 #: packages/email/template-components/template-document-self-signed.tsx
 msgid "View plans"
 msgstr "View plans"
@@ -6789,6 +7564,7 @@ msgstr "View teams"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "Viewed"
 msgstr "Viewed"
@@ -6843,9 +7619,8 @@ msgstr "Want your own public profile?"
 msgid "Warning: Assistant as last signer"
 msgstr "Warning: Assistant as last signer"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "We are unable to proceed to the billing portal at this time. Please try again, or contact support."
 msgstr "We are unable to proceed to the billing portal at this time. Please try again, or contact support."
 
@@ -6857,19 +7632,45 @@ msgstr "We are unable to remove this passkey at the moment. Please try again lat
 msgid "We are unable to update this passkey at the moment. Please try again later."
 msgstr "We are unable to update this passkey at the moment. Please try again later."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "We couldn't create a Stripe customer. Please try again."
+msgstr "We couldn't create a Stripe customer. Please try again."
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "We couldn't update the group. Please try again."
+msgstr "We couldn't update the group. Please try again."
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "We couldn't update the organisation. Please try again."
+msgstr "We couldn't update the organisation. Please try again."
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "We encountered an error while removing the direct template link. Please try again later."
 msgstr "We encountered an error while removing the direct template link. Please try again later."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "We encountered an error while updating the webhook. Please try again later."
 msgstr "We encountered an error while updating the webhook. Please try again later."
 
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to add team members. Please try again later."
+msgstr "We encountered an unknown error while attempting to add team members. Please try again later."
+
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 msgid "We encountered an unknown error while attempting to add this email. Please try again later."
 msgstr "We encountered an unknown error while attempting to add this email. Please try again later."
 
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to create a group. Please try again later."
+msgstr "We encountered an unknown error while attempting to create a group. Please try again later."
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to create a organisation. Please try again later."
+msgstr "We encountered an unknown error while attempting to create a organisation. Please try again later."
+
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "We encountered an unknown error while attempting to create a team. Please try again later."
 msgstr "We encountered an unknown error while attempting to create a team. Please try again later."
@@ -6878,9 +7679,9 @@ msgstr "We encountered an unknown error while attempting to create a team. Pleas
 msgid "We encountered an unknown error while attempting to delete it. Please try again later."
 msgstr "We encountered an unknown error while attempting to delete it. Please try again later."
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "We encountered an unknown error while attempting to delete the pending team. Please try again later."
-msgstr "We encountered an unknown error while attempting to delete the pending team. Please try again later."
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "We encountered an unknown error while attempting to delete this organisation. Please try again later."
+msgstr "We encountered an unknown error while attempting to delete this organisation. Please try again later."
 
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "We encountered an unknown error while attempting to delete this team. Please try again later."
@@ -6894,30 +7695,36 @@ msgstr "We encountered an unknown error while attempting to delete this token. P
 msgid "We encountered an unknown error while attempting to delete your account. Please try again later."
 msgstr "We encountered an unknown error while attempting to delete your account. Please try again later."
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "We encountered an unknown error while attempting to invite team members. Please try again later."
-msgstr "We encountered an unknown error while attempting to invite team members. Please try again later."
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "We encountered an unknown error while attempting to disable access."
+msgstr "We encountered an unknown error while attempting to disable access."
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "We encountered an unknown error while attempting to leave this team. Please try again later."
-msgstr "We encountered an unknown error while attempting to leave this team. Please try again later."
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "We encountered an unknown error while attempting to enable access."
+msgstr "We encountered an unknown error while attempting to enable access."
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "We encountered an unknown error while attempting to invite organisation members. Please try again later."
+msgstr "We encountered an unknown error while attempting to invite organisation members. Please try again later."
+
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "We encountered an unknown error while attempting to leave this organisation. Please try again later."
+msgstr "We encountered an unknown error while attempting to leave this organisation. Please try again later."
+
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "We encountered an unknown error while attempting to remove this group. Please try again later."
+msgstr "We encountered an unknown error while attempting to remove this group. Please try again later."
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "We encountered an unknown error while attempting to remove this template from your profile. Please try again later."
 msgstr "We encountered an unknown error while attempting to remove this template from your profile. Please try again later."
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "We encountered an unknown error while attempting to remove this transfer. Please try again or contact support."
-msgstr "We encountered an unknown error while attempting to remove this transfer. Please try again or contact support."
-
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
 msgid "We encountered an unknown error while attempting to remove this user. Please try again later."
 msgstr "We encountered an unknown error while attempting to remove this user. Please try again later."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "We encountered an unknown error while attempting to request a transfer of this team. Please try again later."
-msgstr "We encountered an unknown error while attempting to request a transfer of this team. Please try again later."
-
 #: apps/remix/app/components/forms/reset-password.tsx
 msgid "We encountered an unknown error while attempting to reset your password. Please try again later."
 msgstr "We encountered an unknown error while attempting to reset your password. Please try again later."
@@ -6944,10 +7751,19 @@ msgstr "We encountered an unknown error while attempting to update the banner. P
 msgid "We encountered an unknown error while attempting to update the template. Please try again later."
 msgstr "We encountered an unknown error while attempting to update the template. Please try again later."
 
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "We encountered an unknown error while attempting to update this organisation member. Please try again later."
+msgstr "We encountered an unknown error while attempting to update this organisation member. Please try again later."
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
 msgid "We encountered an unknown error while attempting to update this team member. Please try again later."
 msgstr "We encountered an unknown error while attempting to update this team member. Please try again later."
 
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "We encountered an unknown error while attempting to update your organisation. Please try again later."
+msgstr "We encountered an unknown error while attempting to update your organisation. Please try again later."
+
 #: apps/remix/app/components/forms/password.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 msgid "We encountered an unknown error while attempting to update your password. Please try again later."
@@ -6973,10 +7789,6 @@ msgstr "We encountered an unknown error while attempting update your profile. Pl
 msgid "We have sent a confirmation email for verification."
 msgstr "We have sent a confirmation email for verification."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "We need a username to create your profile"
-msgstr "We need a username to create your profile"
-
 #: apps/remix/app/components/forms/signup.tsx
 msgid "We need your signature to sign documents"
 msgstr "We need your signature to sign documents"
@@ -6989,10 +7801,6 @@ msgstr "We were unable to copy the token to your clipboard. Please try again."
 msgid "We were unable to copy your recovery code to your clipboard. Please try again."
 msgstr "We were unable to copy your recovery code to your clipboard. Please try again."
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "We were unable to create a checkout session. Please try again, or contact support"
-msgstr "We were unable to create a checkout session. Please try again, or contact support"
-
 #: apps/remix/app/components/forms/signup.tsx
 msgid "We were unable to create your account. Please review the information you provided and try again."
 msgstr "We were unable to create your account. Please review the information you provided and try again."
@@ -7007,7 +7815,7 @@ msgstr "We were unable to disable two-factor authentication for your account. Pl
 msgid "We were unable to log you out at this time."
 msgstr "We were unable to log you out at this time."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "We were unable to set your public profile to public. Please try again."
 msgstr "We were unable to set your public profile to public. Please try again."
 
@@ -7022,14 +7830,17 @@ msgstr "We were unable to setup two-factor authentication for your account. Plea
 msgid "We were unable to submit this document at this time. Please try again later."
 msgstr "We were unable to submit this document at this time. Please try again later."
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "We were unable to update your branding preferences at this time, please try again later"
 msgstr "We were unable to update your branding preferences at this time, please try again later"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "We were unable to update your document preferences at this time, please try again later"
 msgstr "We were unable to update your document preferences at this time, please try again later"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 msgid "We were unable to verify your details. Please try again or contact support"
 msgstr "We were unable to verify your details. Please try again or contact support"
@@ -7055,8 +7866,8 @@ msgstr "We will generate signing links for you, which you can send to the recipi
 msgid "We won't send anything to notify recipients."
 msgstr "We won't send anything to notify recipients."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "We're all empty"
 msgstr "We're all empty"
@@ -7082,17 +7893,14 @@ msgid "Webhook deleted"
 msgstr "Webhook deleted"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Webhook updated"
 msgstr "Webhook updated"
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Webhook URL"
 msgstr "Webhook URL"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -7100,10 +7908,6 @@ msgstr "Webhook URL"
 msgid "Webhooks"
 msgstr "Webhooks"
 
-#: apps/remix/app/components/general/billing-plans.tsx
-msgid "Weekly"
-msgstr "Weekly"
-
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Welcome"
 msgstr "Welcome"
@@ -7112,6 +7916,10 @@ msgstr "Welcome"
 msgid "Welcome back, we are lucky to have you."
 msgstr "Welcome back, we are lucky to have you."
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Welcome back! Here's an overview of your account."
+msgstr "Welcome back! Here's an overview of your account."
+
 #: packages/email/template-components/template-confirmation-email.tsx
 msgid "Welcome to Documenso!"
 msgstr "Welcome to Documenso!"
@@ -7120,6 +7928,10 @@ msgstr "Welcome to Documenso!"
 msgid "Were you trying to edit this document instead?"
 msgstr "Were you trying to edit this document instead?"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "What you can do with teams:"
+msgstr "What you can do with teams:"
+
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
 #: packages/ui/primitives/document-flow/add-signers.tsx
@@ -7142,6 +7954,10 @@ msgstr "When you use our platform to affix your electronic signature to document
 msgid "While waiting for them to do so you can create your own Documenso account and get started with document signing right away."
 msgstr "While waiting for them to do so you can create your own Documenso account and get started with document signing right away."
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Whitelabeling, unlimited members and more"
+msgstr "Whitelabeling, unlimited members and more"
+
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 msgid "Who do you want to remind?"
 msgstr "Who do you want to remind?"
@@ -7151,18 +7967,19 @@ msgid "Withdrawing Consent"
 msgstr "Withdrawing Consent"
 
 #: apps/remix/app/components/forms/public-profile-form.tsx
-msgid "Write about the team"
-msgstr "Write about the team"
+msgid "Write a description to display on your public profile"
+msgstr "Write a description to display on your public profile"
 
-#: apps/remix/app/components/forms/public-profile-form.tsx
-msgid "Write about yourself"
-msgstr "Write about yourself"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Yearly"
 msgstr "Yearly"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Yes"
+msgstr "Yes"
+
 #: apps/remix/app/components/general/template/template-page-view-information.tsx
 #: apps/remix/app/components/general/document/document-page-view-information.tsx
 #: packages/lib/utils/document-audit-logs.ts
@@ -7173,17 +7990,42 @@ msgstr "You"
 msgid "You are about to delete <0>\"{documentTitle}\"</0>"
 msgstr "You are about to delete <0>\"{documentTitle}\"</0>"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "You are about to delete <0>{0}</0>. All data related to this organisation such as teams, documents, and all other resources will be deleted. This action is irreversible."
+msgstr "You are about to delete <0>{0}</0>. All data related to this organisation such as teams, documents, and all other resources will be deleted. This action is irreversible."
+
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 msgid "You are about to delete the following team email from <0>{teamName}</0>."
 msgstr "You are about to delete the following team email from <0>{teamName}</0>."
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "You are about to give all organisation members access to this team under their organisation role."
+msgstr "You are about to give all organisation members access to this team under their organisation role."
+
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "You are about to hide <0>\"{documentTitle}\"</0>"
 msgstr "You are about to hide <0>\"{documentTitle}\"</0>"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "You are about to leave the following team."
-msgstr "You are about to leave the following team."
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "You are about to leave the following organisation."
+msgstr "You are about to leave the following organisation."
+
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "You are about to remove default access to this team for all organisation members. Any members not explicitly added to this team will no longer have access."
+msgstr "You are about to remove default access to this team for all organisation members. Any members not explicitly added to this team will no longer have access."
+
+#. placeholder {0}: team.name
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "You are about to remove the following group from <0>{0}</0>."
+msgstr "You are about to remove the following group from <0>{0}</0>."
+
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "You are about to remove the following user from <0>{0}</0>."
+msgstr "You are about to remove the following user from <0>{0}</0>."
 
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "You are about to remove the following user from <0>{teamName}</0>."
@@ -7199,21 +8041,38 @@ msgstr "You are about to revoke access for team <0>{0}</0> ({1}) to use your ema
 msgid "You are about to send this document to the recipients. Are you sure you want to continue?"
 msgstr "You are about to send this document to the recipients. Are you sure you want to continue?"
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "You are about to subscribe to the {planName}"
+msgstr "You are about to subscribe to the {planName}"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
 msgid "You are currently on the <0>Free Plan</0>."
 msgstr "You are currently on the <0>Free Plan</0>."
 
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-msgid "You are currently updating <0>{teamMemberName}.</0>"
-msgstr "You are currently updating <0>{teamMemberName}.</0>"
+msgid "You are currently updating <0>{memberName}.</0>"
+msgstr "You are currently updating <0>{memberName}.</0>"
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You are currently updating <0>{organisationMemberName}.</0>"
+msgstr "You are currently updating <0>{organisationMemberName}.</0>"
 
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "You are currently updating the <0>{passkeyName}</0> passkey."
 msgstr "You are currently updating the <0>{passkeyName}</0> passkey."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "You are not a member of this team."
-msgstr "You are not a member of this team."
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You are currently updating the <0>{teamGroupName}</0> team group."
+msgstr "You are currently updating the <0>{teamGroupName}</0> team group."
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "You are currently updating your \"Personal\" organisation to a plan where you can add multiple members. These members may have access to the documents, templates and other data in this organisation, including documents sent to you."
+msgstr "You are currently updating your \"Personal\" organisation to a plan where you can add multiple members. These members may have access to the documents, templates and other data in this organisation, including documents sent to you."
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+msgid "You are not authorized to access this page."
+msgstr "You are not authorized to access this page."
 
 #: apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx
 msgid "You are not authorized to delete this user."
@@ -7231,18 +8090,18 @@ msgstr "You are not authorized to enable this user."
 msgid "You can also copy and paste this link into your browser: {confirmationLink} (link expires in 1 hour)"
 msgstr "You can also copy and paste this link into your browser: {confirmationLink} (link expires in 1 hour)"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You can choose to enable or disable your profile for public view."
-msgstr "You can choose to enable or disable your profile for public view."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You can choose to enable or disable your team profile for public view."
-msgstr "You can choose to enable or disable your team profile for public view."
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
+msgid "You can choose to enable or disable the profile for public view."
+msgstr "You can choose to enable or disable the profile for public view."
 
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 msgid "You can copy and share these links to recipients so they can action the document."
 msgstr "You can copy and share these links to recipients so they can action the document."
 
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "You can enable access to allow all organisation members to access this team by default."
+msgstr "You can enable access to allow all organisation members to access this team by default."
+
 #: packages/email/templates/confirm-team-email.tsx
 msgid "You can revoke access at any time in your team settings on Documenso <0>here.</0>"
 msgstr "You can revoke access at any time in your team settings on Documenso <0>here.</0>"
@@ -7272,14 +8131,30 @@ msgstr "You can view the document and its status by clicking the button below."
 msgid "You cannot add assistants when signing order is disabled."
 msgstr "You cannot add assistants when signing order is disabled."
 
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "You cannot delete a group which has a higher role than you."
+msgstr "You cannot delete a group which has a higher role than you."
+
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "You cannot have more than {MAXIMUM_PASSKEYS} passkeys."
 msgstr "You cannot have more than {MAXIMUM_PASSKEYS} passkeys."
 
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You cannot modify a group which has a higher role than you."
+msgstr "You cannot modify a group which has a higher role than you."
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You cannot modify a organisation member who has a higher role than you."
+msgstr "You cannot modify a organisation member who has a higher role than you."
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 msgid "You cannot modify a team member who has a higher role than you."
 msgstr "You cannot modify a team member who has a higher role than you."
 
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+msgid "You cannot remove members from this team if the inherit member feature is enabled."
+msgstr "You cannot remove members from this team if the inherit member feature is enabled."
+
 #: packages/ui/primitives/document-upload.tsx
 #: packages/ui/primitives/document-dropzone.tsx
 msgid "You cannot upload documents at this time."
@@ -7290,9 +8165,13 @@ msgstr "You cannot upload documents at this time."
 msgid "You cannot upload encrypted PDFs"
 msgstr "You cannot upload encrypted PDFs"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-msgid "You do not currently have a customer record, this should not happen. Please contact support for assistance."
-msgstr "You do not currently have a customer record, this should not happen. Please contact support for assistance."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "You currently have an inactive <0>{currentProductName}</0> subscription"
+msgstr "You currently have an inactive <0>{currentProductName}</0> subscription"
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "You currently have no access to any teams within this organisation. Please contact your organisation to request access."
+msgstr "You currently have no access to any teams within this organisation. Please contact your organisation to request access."
 
 #: apps/remix/app/components/forms/token.tsx
 msgid "You do not have permission to create a token for this team"
@@ -7302,50 +8181,43 @@ msgstr "You do not have permission to create a token for this team"
 msgid "You don't need to sign it anymore."
 msgstr "You don't need to sign it anymore."
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-msgid "You have accepted an invitation from <0>{0}</0> to join their team."
-msgstr "You have accepted an invitation from <0>{0}</0> to join their team."
-
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "You have already completed the ownership transfer for <0>{0}</0>."
-msgstr "You have already completed the ownership transfer for <0>{0}</0>."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "You have accepted an invitation from <0>{0}</0> to join their organisation."
+msgstr "You have accepted an invitation from <0>{0}</0> to join their organisation."
 
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "You have already verified your email address for <0>{0}</0>."
 msgstr "You have already verified your email address for <0>{0}</0>."
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "You have been invited by <0>{0}</0> to join their team."
-msgstr "You have been invited by <0>{0}</0> to join their team."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "You have been invited by <0>{0}</0> to join their organisation."
+msgstr "You have been invited by <0>{0}</0> to join their organisation."
 
-#. placeholder {0}: team.name
-#: packages/lib/server-only/team/create-team-member-invites.ts
+#. placeholder {0}: organisation.name
+#: packages/lib/server-only/organisation/create-organisation-member-invites.ts
 msgid "You have been invited to join {0} on Documenso"
 msgstr "You have been invited to join {0} on Documenso"
 
-#: packages/email/templates/team-invite.tsx
-msgid "You have been invited to join the following team"
-msgstr "You have been invited to join the following team"
+#: packages/email/templates/organisation-invite.tsx
+msgid "You have been invited to join the following organisation"
+msgstr "You have been invited to join the following organisation"
 
 #: packages/lib/server-only/recipient/set-document-recipients.ts
 #: packages/lib/server-only/recipient/delete-document-recipient.ts
 msgid "You have been removed from a document"
 msgstr "You have been removed from a document"
 
-#. placeholder {0}: team.name
-#: packages/lib/server-only/team/request-team-ownership-transfer.ts
-msgid "You have been requested to take ownership of team {0} on Documenso"
-msgstr "You have been requested to take ownership of team {0} on Documenso"
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "You have been requested to sign the following documents. Review each document carefully and complete the signing process."
+msgstr "You have been requested to sign the following documents. Review each document carefully and complete the signing process."
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "You have declined the invitation from <0>{0}</0> to join their team."
-msgstr "You have declined the invitation from <0>{0}</0> to join their team."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
+msgid "You have declined the invitation from <0>{0}</0> to join their organisation."
+msgstr "You have declined the invitation from <0>{0}</0> to join their organisation."
 
 #. placeholder {0}: `"${document.title}"`
 #: packages/lib/server-only/document/resend-document.tsx
@@ -7354,12 +8226,11 @@ msgid "You have initiated the document {0} that requires you to {recipientAction
 msgstr "You have initiated the document {0} that requires you to {recipientActionVerb} it."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "You have no webhooks yet. Your webhooks will be shown here once you create them."
 msgstr "You have no webhooks yet. Your webhooks will be shown here once you create them."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
 msgid "You have not yet created any templates. To create a template please upload one."
 msgstr "You have not yet created any templates. To create a template please upload one."
 
@@ -7372,6 +8243,10 @@ msgstr "You have not yet created or received any documents. To create a document
 msgid "You have reached the maximum limit of {0} direct templates. <0>Upgrade your account to continue!</0>"
 msgstr "You have reached the maximum limit of {0} direct templates. <0>Upgrade your account to continue!</0>"
 
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
+msgid "You have reached the maximum number of teams for your plan. Please contact sales at <0>support@documenso.com</0> if you would like to adjust your plan."
+msgstr "You have reached the maximum number of teams for your plan. Please contact sales at <0>support@documenso.com</0> if you would like to adjust your plan."
+
 #: apps/remix/app/components/general/document/document-upload.tsx
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
 msgid "You have reached your document limit for this month. Please upgrade your plan."
@@ -7399,15 +8274,27 @@ msgstr "You have rejected this document"
 msgid "You have signed “{documentName}”"
 msgstr "You have signed “{documentName}”"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "You have successfully left this team."
-msgstr "You have successfully left this team."
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "You have successfully left this organisation."
+msgstr "You have successfully left this organisation."
 
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/signup.tsx
 msgid "You have successfully registered. Please verify your account by clicking on the link you received in the email."
 msgstr "You have successfully registered. Please verify your account by clicking on the link you received in the email."
 
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "You have successfully removed this group from the organisation."
+msgstr "You have successfully removed this group from the organisation."
+
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "You have successfully removed this group from the team."
+msgstr "You have successfully removed this group from the team."
+
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "You have successfully removed this user from the organisation."
+msgstr "You have successfully removed this user from the organisation."
+
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "You have successfully removed this user from the team."
 msgstr "You have successfully removed this user from the team."
@@ -7421,38 +8308,35 @@ msgid "You have the right to withdraw your consent to use electronic signatures
 msgstr "You have the right to withdraw your consent to use electronic signatures at any time before completing the signing process. To withdraw your consent, please contact the sender of the document. In failing to contact the sender you may reach out to <0>{SUPPORT_EMAIL}</0> for assistance. Be aware that withdrawing consent may delay or halt the completion of the related transaction or service."
 
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-msgid "You have updated {teamMemberName}."
-msgstr "You have updated {teamMemberName}."
+msgid "You have updated {memberName}."
+msgstr "You have updated {memberName}."
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You have updated {organisationMemberName}."
+msgstr "You have updated {organisationMemberName}."
+
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You have updated the team group."
+msgstr "You have updated the team group."
 
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "You have verified your email address for <0>{0}</0>."
 msgstr "You have verified your email address for <0>{0}</0>."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "You must be an admin of this team to manage billing."
-msgstr "You must be an admin of this team to manage billing."
-
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 msgid "You must enter '{deleteMessage}' to proceed"
 msgstr "You must enter '{deleteMessage}' to proceed"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "You must have at least one other team member to transfer ownership."
-msgstr "You must have at least one other team member to transfer ownership."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You must set a profile URL before enabling your public profile."
-msgstr "You must set a profile URL before enabling your public profile."
-
 #: apps/remix/app/components/dialogs/template-folder-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/folder-delete-dialog.tsx
 msgid "You must type '{deleteMessage}' to confirm"
 msgstr "You must type '{deleteMessage}' to confirm"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "You need to be an admin to manage API tokens."
 msgstr "You need to be an admin to manage API tokens."
 
@@ -7468,9 +8352,9 @@ msgstr "You need to be logged in to view this page."
 msgid "You need to setup 2FA to mark this document as viewed."
 msgstr "You need to setup 2FA to mark this document as viewed."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "You will get notified & be able to set up your documenso public profile when we launch the feature."
-msgstr "You will get notified & be able to set up your documenso public profile when we launch the feature."
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "You will need to configure any claims or subscription after creating this organisation"
+msgstr "You will need to configure any claims or subscription after creating this organisation"
 
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "You will now be required to enter a code from your authenticator app when signing in."
@@ -7492,11 +8376,12 @@ msgstr "Your avatar has been updated successfully."
 msgid "Your banner has been updated successfully."
 msgstr "Your banner has been updated successfully."
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Your brand website URL"
 msgstr "Your brand website URL"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Your branding preferences have been updated"
 msgstr "Your branding preferences have been updated"
 
@@ -7508,9 +8393,17 @@ msgstr "Your bulk send has been initiated. You will receive an email notificatio
 msgid "Your bulk send operation for template \"{templateName}\" has completed."
 msgstr "Your bulk send operation for template \"{templateName}\" has completed."
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
-msgid "Your current plan is past due. Please update your payment information."
-msgstr "Your current plan is past due. Please update your payment information."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current {currentProductName} plan is past due. Please update your payment information."
+msgstr "Your current {currentProductName} plan is past due. Please update your payment information."
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current plan is inactive."
+msgstr "Your current plan is inactive."
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current plan is past due."
+msgstr "Your current plan is past due."
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Your direct signing templates"
@@ -7555,7 +8448,8 @@ msgstr "Your document has been uploaded successfully."
 msgid "Your document has been uploaded successfully. You will be redirected to the template page."
 msgstr "Your document has been uploaded successfully. You will be redirected to the template page."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Your document preferences have been updated"
 msgstr "Your document preferences have been updated"
 
@@ -7577,7 +8471,7 @@ msgstr "Your email has been successfully confirmed! You can now use all features
 msgid "Your email is currently being used by team <0>{0}</0> ({1})."
 msgstr "Your email is currently being used by team <0>{0}</0> ({1})."
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Your existing tokens"
 msgstr "Your existing tokens"
 
@@ -7586,6 +8480,18 @@ msgstr "Your existing tokens"
 msgid "Your new password cannot be the same as your old password."
 msgstr "Your new password cannot be the same as your old password."
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Your organisation has been created."
+msgstr "Your organisation has been created."
+
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "Your organisation has been successfully deleted."
+msgstr "Your organisation has been successfully deleted."
+
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Your organisation has been successfully updated."
+msgstr "Your organisation has been successfully updated."
+
 #: apps/remix/app/components/forms/reset-password.tsx
 #: apps/remix/app/components/forms/password.tsx
 msgid "Your password has been updated successfully."
@@ -7595,10 +8501,18 @@ msgstr "Your password has been updated successfully."
 msgid "Your password has been updated."
 msgstr "Your password has been updated."
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Your payment for teams is overdue. Please settle the payment to avoid any service disruptions."
 msgstr "Your payment for teams is overdue. Please settle the payment to avoid any service disruptions."
 
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+msgid "Your personal organisation"
+msgstr "Your personal organisation"
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Your plan does not support inviting members. Please upgrade or your plan or contact sales at <0>support@documenso.com</0> if you would like to discuss your options."
+msgstr "Your plan does not support inviting members. Please upgrade or your plan or contact sales at <0>support@documenso.com</0> if you would like to discuss your options."
+
 #: apps/remix/app/components/forms/profile.tsx
 msgid "Your profile has been updated successfully."
 msgstr "Your profile has been updated successfully."
@@ -7620,19 +8534,10 @@ msgstr "Your recovery code has been copied to your clipboard."
 msgid "Your recovery codes are listed below. Please store them in a safe place."
 msgstr "Your recovery codes are listed below. Please store them in a safe place."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Your subscription is currently active."
-msgstr "Your subscription is currently active."
-
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Your team has been created."
 msgstr "Your team has been created."
 
-#: packages/email/templates/team-delete.tsx
-#: packages/email/templates/team-delete.tsx
-msgid "Your team has been deleted"
-msgstr "Your team has been deleted"
-
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Your team has been successfully deleted."
 msgstr "Your team has been successfully deleted."
@@ -7669,6 +8574,6 @@ msgstr "Your token has expired!"
 msgid "Your token was created successfully! Make sure to copy it because you won't be able to see it again!"
 msgstr "Your token was created successfully! Make sure to copy it because you won't be able to see it again!"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Your tokens will be shown here once you create them."
 msgstr "Your tokens will be shown here once you create them."
diff --git a/packages/lib/translations/es/web.po b/packages/lib/translations/es/web.po
index 63930ddc8..0a1597e8c 100644
--- a/packages/lib/translations/es/web.po
+++ b/packages/lib/translations/es/web.po
@@ -22,19 +22,10 @@ msgstr ""
 msgid " Enable direct link signing"
 msgstr " Habilitar la firma mediante enlace directo"
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
-msgid " The events that will trigger a webhook to be sent to your URL."
-msgstr " Los eventos que activarán un webhook para ser enviado a tu URL."
-
 #: apps/remix/app/components/embed/authoring/configure-document-upload.tsx
 msgid ".PDF documents accepted (max {APP_DOCUMENT_UPLOAD_SIZE_LIMIT}MB)"
 msgstr ".Documentos PDF aceptados (máx {APP_DOCUMENT_UPLOAD_SIZE_LIMIT}MB)"
 
-#. placeholder {0}: team.name
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-msgid "\"{0}\" has invited you to sign \"example document\"."
-msgstr "\"{0}\" te ha invitado a firmar \"ejemplo de documento\"."
-
 #. placeholder {0}: field.customText
 #. placeholder {1}: timezone || ''
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
@@ -57,10 +48,13 @@ msgstr "\"{documentName}\" fue firmado por todos los firmantes"
 msgid "\"{documentTitle}\" has been successfully deleted"
 msgstr "\"{documentTitle}\" ha sido eliminado con éxito"
 
-#. placeholder {0}: team.name
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-msgid "\"{placeholderEmail}\" on behalf of \"{0}\" has invited you to sign \"example document\"."
-msgstr "\"{placeholderEmail}\" en nombre de \"{0}\" te ha invitado a firmar \"documento de ejemplo\"."
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "\"{placeholderEmail}\" on behalf of \"Team Name\" has invited you to sign \"example document\"."
+msgstr ""
+
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "\"Team Name\" has invited you to sign \"example document\"."
+msgstr ""
 
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
@@ -83,16 +77,16 @@ msgstr "{0, plural, one {# carácter sobre el límite} other {# caracteres sobre
 msgid "{0, plural, one {# recipient} other {# recipients}}"
 msgstr "{0, plural, one {# destinatario} other {# destinatarios}}"
 
-#. placeholder {0}: row.original.quantity
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "{0, plural, one {# Seat} other {# Seats}}"
-msgstr "{0, plural, one {# Asiento} other {# Asientos}}"
+#. placeholder {0}: org.teams.length
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "{0, plural, one {# team} other {# teams}}"
+msgstr ""
 
 #. placeholder {0}: data.length
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "{0, plural, one {<0>You have <1>1</1> pending team invitation</0>} other {<2>You have <3>#</3> pending team invitations</2>}}"
-msgstr "{0, plural, one {<0>Tienes <1>1</1> invitación de equipo pendiente</0>} other {<2>Tienes <3>#</3> invitaciones de equipo pendientes</2>}}"
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "{0, plural, one {<0>You have <1>1</1> pending invitation</0>} other {<2>You have <3>#</3> pending invitations</2>}}"
+msgstr ""
 
 #. placeholder {0}: autoSignableFields.filter((f) => f.type === fieldType).length
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
@@ -100,18 +94,18 @@ msgid "{0, plural, one {1 matching field} other {# matching fields}}"
 msgstr "{0, plural, one {1 campo que coincide} other {# campos que coinciden}}"
 
 #. placeholder {0}: recipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
 msgid "{0, plural, one {1 Recipient} other {# Recipients}}"
 msgstr "{0, plural, one {1 Destinatario} other {# Destinatarios}}"
 
 #. placeholder {0}: pendingRecipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "{0, plural, one {Waiting on 1 recipient} other {Waiting on # recipients}}"
 msgstr "{0, plural, one {Esperando 1 destinatario} other {Esperando # destinatarios}}"
 
+#. placeholder {0}: route.label
 #. placeholder {0}: _(FRIENDLY_FIELD_TYPE[fieldType as FieldType])
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
 msgid "{0}"
 msgstr "{0}"
@@ -132,16 +126,6 @@ msgstr "{0} te ha invitado a {recipientActionVerb} el documento \"{1}\"."
 msgid "{0} invited you to {recipientActionVerb} a document"
 msgstr "{0} te invitó a {recipientActionVerb} un documento"
 
-#. placeholder {0}: memberName || memberEmail
-#: packages/email/templates/team-join.tsx
-msgid "{0} joined the team {teamName} on Documenso"
-msgstr "{0} se unió al equipo {teamName} en Documenso"
-
-#. placeholder {0}: memberName || memberEmail
-#: packages/email/templates/team-leave.tsx
-msgid "{0} left the team {teamName} on Documenso"
-msgstr "{0} dejó el equipo {teamName} en Documenso"
-
 #. placeholder {0}: remaining.documents
 #. placeholder {1}: quota.documents
 #: apps/remix/app/components/general/document/document-upload.tsx
@@ -163,11 +147,15 @@ msgid "{0} on behalf of \"{1}\" has invited you to {recipientActionVerb} the doc
 msgstr "{0} en nombre de \"{1}\" te ha invitado a {recipientActionVerb} el documento \"{2}\"."
 
 #. placeholder {0}: recipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "{0} Recipient(s)"
 msgstr "{0} Destinatario(s)"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "{0} Teams"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 msgid "{charactersRemaining, plural, one {1 character remaining} other {{charactersRemaining} characters remaining}}"
 msgstr "{charactersRemaining, plural, one {1 carácter restante} other {{charactersRemaining} caracteres restantes}}"
@@ -220,18 +208,6 @@ msgstr "{inviterName} en nombre de \"{teamName}\" te ha invitado a {0}<0/>\"{doc
 msgid "{inviterName} on behalf of \"{teamName}\" has invited you to {action} {documentName}"
 msgstr "{inviterName} en nombre de \"{teamName}\" te ha invitado a {action} {documentName}"
 
-#: packages/email/templates/team-join.tsx
-msgid "{memberEmail} joined the following team"
-msgstr "{memberEmail} se unió al siguiente equipo"
-
-#: packages/email/templates/team-leave.tsx
-msgid "{memberEmail} left the following team"
-msgstr "{memberEmail} dejó el siguiente equipo"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "{numberOfSeats, plural, one {# member} other {# members}}"
-msgstr "{numberOfSeats, plural, one {# miembro} other {# miembros}}"
-
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} added a field"
 msgstr "{prefix} agregó un campo"
@@ -377,10 +353,6 @@ msgstr "{teamName} te ha invitado a {0}<0/>\"{documentName}\""
 msgid "{teamName} has invited you to {action} {documentName}"
 msgstr "{teamName} te ha invitado a {action} {documentName}"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "{teamName} ownership transfer request"
-msgstr "solicitud de transferencia de propiedad de {teamName}"
-
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{userName} approved the document"
 msgstr "{userName} aprobó el documento"
@@ -414,10 +386,6 @@ msgstr "{visibleRows, plural, one {Mostrando # resultado.} other {Mostrando # re
 msgid "<0>\"{0}\"</0>is no longer available to sign"
 msgstr "<0>\"{0}\"</0> ya no está disponible para firmar"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "<0>{senderName}</0> has requested that you take ownership of the following team"
-msgstr "<0>{senderName}</0> ha solicitado que asumas la propiedad del siguiente equipo"
-
 #: packages/email/templates/confirm-team-email.tsx
 msgid "<0>{teamName}</0> has requested to use your email address for their team on Documenso."
 msgstr "<0>{teamName}</0> ha solicitado usar tu dirección de correo electrónico para su equipo en Documenso."
@@ -472,6 +440,10 @@ msgstr "<0>Requerir cuenta</0> - El destinatario debe haber iniciado sesión par
 msgid "<0>Require passkey</0> - The recipient must have an account and passkey configured via their settings"
 msgstr "<0>Requerir clave de acceso</0> - El destinatario debe tener una cuenta y clave de acceso configurada a través de sus configuraciones"
 
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "<0>Require password</0> - The recipient must have an account and password configured via their settings, the password will be verified during signing"
+msgstr ""
+
 #: apps/remix/app/components/tables/documents-table-sender-filter.tsx
 msgid "<0>Sender:</0> All"
 msgstr "<0>Remitente:</0> Todos"
@@ -497,6 +469,14 @@ msgstr "<0>Está a punto de completar la firma de \"<1>{documentTitle}</1>\".</0
 msgid "<0>You are about to complete viewing \"<1>{documentTitle}</1>\".</0><2/> Are you sure?"
 msgstr "<0>Está a punto de completar la visualización de \"<1>{documentTitle}</1>\".</0><2/> ¿Está seguro?"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "0 Free organisations left"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "1 Free organisations left"
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "1 month"
 msgstr "1 mes"
@@ -505,22 +485,53 @@ msgstr "1 mes"
 msgid "12 months"
 msgstr "12 meses"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "2FA"
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "3 months"
 msgstr "3 meses"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+msgid "401 Unauthorized"
+msgstr ""
+
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "404 not found"
 msgstr "404 no encontrado"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "404 Organisation group not found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "404 Organisation not found"
+msgstr ""
+
 #: apps/remix/app/routes/_profile+/_layout.tsx
 msgid "404 Profile not found"
 msgstr "404 Perfil no encontrado"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "404 Team not found"
 msgstr "404 Equipo no encontrado"
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "404 User not found"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "5 documents a month"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "5 Documents a month"
+msgstr ""
+
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "500 Internal Server Error"
 msgstr "500 Error Interno del Servidor"
@@ -565,9 +576,29 @@ msgstr "Se actualizó un campo"
 msgid "A means to print or download documents for your records"
 msgstr "Un medio para imprimir o descargar documentos para sus registros"
 
-#: packages/lib/jobs/definitions/emails/send-team-member-joined-email.handler.ts
-msgid "A new member has joined your team"
-msgstr "Un nuevo miembro se ha unido a tu equipo"
+#: packages/email/templates/organisation-join.tsx
+msgid "A member has joined your organisation on Documenso"
+msgstr ""
+
+#: packages/lib/jobs/definitions/emails/send-organisation-member-left-email.handler.ts
+msgid "A member has left your organisation"
+msgstr ""
+
+#: packages/email/templates/organisation-leave.tsx
+msgid "A member has left your organisation {organisationName}"
+msgstr ""
+
+#: packages/email/templates/organisation-leave.tsx
+msgid "A member has left your organisation on Documenso"
+msgstr ""
+
+#: packages/lib/jobs/definitions/emails/send-organisation-member-joined-email.handler.ts
+msgid "A new member has joined your organisation"
+msgstr ""
+
+#: packages/email/templates/organisation-join.tsx
+msgid "A new member has joined your organisation {organisationName}"
+msgstr ""
 
 #: apps/remix/app/components/forms/token.tsx
 msgid "A new token was created successfully."
@@ -590,12 +621,6 @@ msgstr "Se eliminó un destinatario"
 msgid "A recipient was updated"
 msgstr "Se actualizó un destinatario"
 
-#. placeholder {0}: transferVerification.name
-#. placeholder {1}: transferVerification.email
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "A request to transfer the ownership of this team has been sent to <0>{0} ({1})</0>"
-msgstr "Se ha enviado una solicitud para transferir la propiedad de este equipo a <0>{0} ({1})</0>"
-
 #. placeholder {0}: team.name
 #: packages/lib/server-only/team/create-team-email-verification.ts
 msgid "A request to use your email has been initiated by {0} on Documenso"
@@ -606,7 +631,6 @@ msgid "A secret that will be sent to your URL so you can verify that the request
 msgstr "Un secreto que se enviará a tu URL para que puedas verificar que la solicitud ha sido enviada por Documenso"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "A secret that will be sent to your URL so you can verify that the request has been sent by Documenso."
 msgstr "Un secreto que se enviará a tu URL para que puedas verificar que la solicitud ha sido enviada por Documenso."
 
@@ -614,19 +638,6 @@ msgstr "Un secreto que se enviará a tu URL para que puedas verificar que la sol
 msgid "A stable internet connection"
 msgstr "Una conexión a Internet estable"
 
-#: packages/email/templates/team-join.tsx
-msgid "A team member has joined a team on Documenso"
-msgstr "Un miembro del equipo se ha unido a un equipo en Documenso"
-
-#. placeholder {0}: team.name
-#: packages/lib/jobs/definitions/emails/send-team-member-left-email.handler.ts
-msgid "A team member has left {0}"
-msgstr "Un miembro del equipo ha dejado {0}"
-
-#: packages/email/templates/team-leave.tsx
-msgid "A team member has left a team on Documenso"
-msgstr "Un miembro del equipo ha dejado un equipo en Documenso"
-
 #: packages/email/templates/team-delete.tsx
 #: packages/email/templates/team-delete.tsx
 msgid "A team you were a part of has been deleted"
@@ -636,6 +647,14 @@ msgstr "Un equipo del que formabas parte ha sido eliminado"
 msgid "A unique URL to access your profile"
 msgstr "Una URL única para acceder a tu perfil"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "A unique URL to identify the organisation"
+msgstr ""
+
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "A unique URL to identify your organisation"
+msgstr ""
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "A unique URL to identify your team"
@@ -645,32 +664,36 @@ msgstr "Una URL única para identificar tu equipo"
 msgid "A verification email will be sent to the provided email."
 msgstr "Se enviará un correo electrónico de verificación a la dirección proporcionada."
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: packages/email/templates/team-transfer-request.tsx
-#: packages/email/templates/team-invite.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: packages/email/templates/organisation-invite.tsx
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Accept"
 msgstr "Aceptar"
 
-#: packages/email/templates/team-invite.tsx
-msgid "Accept invitation to join a team on Documenso"
-msgstr "Aceptar invitación para unirse a un equipo en Documenso"
+#: packages/email/templates/organisation-invite.tsx
+msgid "Accept invitation to join an organisation on Documenso"
+msgstr ""
 
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Accept team email request for {teamName} on Documenso"
 msgstr "Aceptar la solicitud de correo electrónico del equipo para {teamName} en Documenso"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "Accept team transfer request on Documenso"
-msgstr "Aceptar solicitud de transferencia de equipo en Documenso"
-
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Acceptance and Consent"
 msgstr "Aceptación y Consentimiento"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Accepted team invitation"
-msgstr "Invitación de equipo aceptada"
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "Access disabled"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Access enabled"
+msgstr ""
+
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Account"
+msgstr ""
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 msgid "Account Authentication"
@@ -707,18 +730,25 @@ msgid "Action"
 msgstr "Acción"
 
 #: apps/remix/app/components/tables/templates-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Actions"
 msgstr "Acciones"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
 msgid "Active"
 msgstr "Activo"
 
@@ -783,7 +813,29 @@ msgstr "Agregar correo electrónico"
 msgid "Add Fields"
 msgstr "Agregar Campos"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add group roles"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add groups"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Add Members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Add members roles"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Add more"
 msgstr "Agregar más"
 
@@ -841,15 +893,12 @@ msgstr "Agrega a las personas que firmarán el documento."
 msgid "Add the recipients to create the document with"
 msgstr "Agrega los destinatarios con los que crear el documento"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Adding and removing seats will adjust your invoice accordingly."
-msgstr "Agregar y eliminar asientos ajustará tu factura en consecuencia."
-
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Additional brand information to display at the bottom of emails"
 msgstr "Información adicional de la marca para mostrar al final de los correos electrónicos"
 
-#: packages/lib/constants/teams.ts
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Admin"
 msgstr "Administrador"
 
@@ -857,10 +906,15 @@ msgstr "Administrador"
 msgid "Admin Actions"
 msgstr "Acciones Administrativas"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 msgid "Admin panel"
 msgstr "Panel administrativo"
 
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+msgid "Admin Panel"
+msgstr ""
+
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
 #: packages/ui/primitives/document-flow/add-settings.tsx
 msgid "Advanced Options"
@@ -893,6 +947,10 @@ msgstr "Todos"
 msgid "All documents"
 msgstr "Todos los documentos"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "All documents have been completed!"
+msgstr ""
+
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "All documents have been processed. Any new documents that are sent or received will show here."
 msgstr "Todos los documentos han sido procesados. Cualquier nuevo documento que se envíe o reciba aparecerá aquí."
@@ -901,8 +959,8 @@ msgstr "Todos los documentos han sido procesados. Cualquier nuevo documento que
 msgid "All documents related to the electronic signing process will be provided to you electronically through our platform or via email. It is your responsibility to ensure that your email address is current and that you can receive and open our emails."
 msgstr "Todos los documentos relacionados con el proceso de firma electrónica se le proporcionarán electrónicamente a través de nuestra plataforma o por correo electrónico. Es su responsabilidad asegurarse de que su dirección de correo electrónico esté actualizada y que pueda recibir y abrir nuestros correos electrónicos."
 
-#: apps/remix/app/routes/_authenticated+/templates.folders._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.folders._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.folders._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.folders._index.tsx
 msgid "All Folders"
 msgstr "Todas las carpetas"
 
@@ -930,6 +988,10 @@ msgstr "Todas las plantillas"
 msgid "All Time"
 msgstr "Todo el Tiempo"
 
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
+msgid "Allow all organisation members to access this team"
+msgstr ""
+
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Allow document recipients to reply directly to this email address"
 msgstr "Permitir que los destinatarios del documento respondan directamente a esta dirección de correo electrónico"
@@ -946,6 +1008,10 @@ msgstr "Permitir a los firmantes dictar al siguiente firmante"
 msgid "Allowed Signature Types"
 msgstr "Tipos de Firmas Permitidas"
 
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "Allowed teams"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security._index.tsx
 msgid "Allows authenticating using biometrics, password managers, hardware keys, etc."
 msgstr "Permite autenticarse usando biometría, administradores de contraseñas, claves de hardware, etc."
@@ -954,7 +1020,7 @@ msgstr "Permite autenticarse usando biometría, administradores de contraseñas,
 msgid "Already have an account? <0>Sign in instead</0>"
 msgstr "¿Ya tienes una cuenta? <0>Iniciar sesión en su lugar</0>"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
 msgid "Amount"
 msgstr "Cantidad"
 
@@ -970,14 +1036,13 @@ msgstr "Una firma electrónica proporcionada por usted en nuestra plataforma, lo
 msgid "An email account"
 msgstr "Una cuenta de correo electrónico"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "An email containing an invitation will be sent to each member."
 msgstr "Un correo electrónico que contiene una invitación se enviará a cada miembro."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "An email requesting the transfer of this team has been sent."
-msgstr "Se ha enviado un correo electrónico solicitando la transferencia de este equipo."
-
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/token.tsx
 #: apps/remix/app/components/forms/signup.tsx
@@ -1024,6 +1089,7 @@ msgstr "Ocurrió un error al desactivar la firma de enlace directo."
 msgid "An error occurred while disabling the user."
 msgstr "Se produjo un error al deshabilitar al usuario."
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
@@ -1046,21 +1112,15 @@ msgstr "Ocurrió un error al habilitar la firma de enlace directo."
 msgid "An error occurred while enabling the user."
 msgstr "Se produjo un error al habilitar al usuario."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "An error occurred while loading team members. Please try again later."
-msgstr "Ocurrió un error al cargar los miembros del equipo. Por favor intenta de nuevo más tarde."
-
 #: packages/ui/primitives/pdf-viewer.tsx
 msgid "An error occurred while loading the document."
 msgstr "Se produjo un error al cargar el documento."
 
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "An error occurred while moving the document."
 msgstr "Ocurrió un error al mover el documento."
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 msgid "An error occurred while moving the template."
 msgstr "Ocurrió un error al mover la plantilla."
 
@@ -1113,6 +1173,7 @@ msgstr "Ocurrió un error al firmar como asistente."
 #: apps/remix/app/components/general/document-signing/document-signing-dropdown-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-checkbox-field.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "An error occurred while signing the document."
 msgstr "Ocurrió un error al firmar el documento."
 
@@ -1144,7 +1205,6 @@ msgstr "Ocurrió un error inesperado."
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/forms/signup.tsx
@@ -1153,20 +1213,31 @@ msgstr "Ocurrió un error inesperado."
 #: apps/remix/app/components/forms/signin.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
 #: apps/remix/app/components/forms/profile.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/account-delete-dialog.tsx
 msgid "An unknown error occurred"
@@ -1187,9 +1258,9 @@ msgstr "Se produjo un error desconocido al eliminar la carpeta."
 msgid "An unknown error occurred while moving the folder."
 msgstr "Se produjo un error desconocido al mover la carpeta."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Any payment methods attached to this team will remain attached to this team. Please contact us if you need to update this information."
-msgstr "Cualquier método de pago adjunto a este equipo permanecerá adjunto a este equipo. Por favor, contáctanos si necesitas actualizar esta información."
+#: apps/remix/app/routes/_authenticated+/inbox.tsx
+msgid "Any documents that you have been invited to will appear here"
+msgstr ""
 
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Any Source"
@@ -1199,7 +1270,7 @@ msgstr "Cualquier fuente"
 msgid "Any Status"
 msgstr "Cualquier estado"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -1211,6 +1282,7 @@ msgstr "Tokens de API"
 msgid "App Version"
 msgstr "Versión de la Aplicación"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
@@ -1246,6 +1318,10 @@ msgstr "Aprobando"
 msgid "Are you sure you want to complete the document? This action cannot be undone. Please ensure that you have completed prefilling all relevant fields before proceeding."
 msgstr "¿Estás seguro de que quieres completar el documento? Esta acción no se puede deshacer. Por favor, asegúrate de haber completado todos los campos relevantes antes de continuar."
 
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Are you sure you want to delete the following claim?"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 msgid "Are you sure you want to delete this token?"
 msgstr "¿Estás seguro de que deseas eliminar este token?"
@@ -1258,6 +1334,10 @@ msgstr "Are you sure you want to reject this document? This action cannot be und
 msgid "Are you sure you want to remove the <0>{passkeyName}</0> passkey."
 msgstr "¿Está seguro de que desea eliminar la clave de acceso <0>{passkeyName}</0>?"
 
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "Are you sure you wish to delete this organisation?"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Are you sure you wish to delete this team?"
 msgstr "¿Estás seguro de que deseas eliminar este equipo?"
@@ -1265,13 +1345,22 @@ msgstr "¿Estás seguro de que deseas eliminar este equipo?"
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "Are you sure?"
 msgstr "¿Estás seguro?"
 
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+msgid "Assigned Teams"
+msgstr ""
+
 #: packages/lib/constants/recipient-roles.ts
 msgid "Assist"
 msgstr "Asistir"
@@ -1297,6 +1386,10 @@ msgstr "El rol de asistente solo está disponible cuando el documento está en m
 msgid "Assistants"
 msgstr "Asistentes"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Assistants and Copy roles are currently not compatible with the multi-sign experience."
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "Assisted"
@@ -1306,7 +1399,7 @@ msgstr "Asistido"
 msgid "Assisting"
 msgstr "Asistiendo"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.types.tsx
 #: packages/ui/primitives/document-flow/add-settings.types.ts
 #: packages/lib/types/document-meta.ts
@@ -1343,15 +1436,17 @@ msgid "Awaiting email confirmation"
 msgstr "Esperando confirmación de correo electrónico"
 
 #: apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx
-#: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/authoring/configure-fields-view.tsx
 #: apps/remix/app/components/embed/authoring/configure-fields-view.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Back"
 msgstr "Atrás"
 
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
-msgid "Back to Documents"
-msgstr "Volver a Documentos"
+msgid "Back home"
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "Background Color"
@@ -1370,20 +1465,14 @@ msgstr "Códigos de respaldo"
 msgid "Banner Updated"
 msgstr "Banner actualizado"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Basic details"
-msgstr "Detalles básicos"
-
 #: packages/email/template-components/template-confirmation-email.tsx
 msgid "Before you get started, please confirm your email address by clicking the button below:"
 msgstr "Antes de comenzar, por favor confirma tu dirección de correo electrónico haciendo clic en el botón de abajo:"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
-#: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
-#: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
 msgid "Billing"
 msgstr "Facturación"
 
@@ -1395,11 +1484,26 @@ msgstr "Negro"
 msgid "Blue"
 msgstr "Azul"
 
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Brand Details"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Brand Website"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Branding Logo"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Branding Preferences"
 msgstr "Preferencias de marca"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Branding preferences updated"
 msgstr "Preferencias de marca actualizadas"
 
@@ -1412,7 +1516,7 @@ msgstr "Navegador"
 msgid "Bulk Copy"
 msgstr "Copia masiva"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Bulk Import"
 msgstr "Importación masiva"
 
@@ -1434,7 +1538,7 @@ msgstr "Enviar plantilla masiva a través de CSV"
 msgid "Bulk Send via CSV"
 msgstr "Envío Masivo vía CSV"
 
-#: packages/email/templates/team-invite.tsx
+#: packages/email/templates/organisation-invite.tsx
 msgid "by <0>{senderName}</0>"
 msgstr "por <0>{senderName}</0>"
 
@@ -1442,10 +1546,6 @@ msgstr "por <0>{senderName}</0>"
 msgid "By accepting this request, you will be granting <0>{teamName}</0> access to:"
 msgstr "Al aceptar esta solicitud, estarás concediendo a <0>{teamName}</0> acceso a:"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "By accepting this request, you will take responsibility for any billing items associated with this team."
-msgstr "Al aceptar esta solicitud, asumirás la responsabilidad de cualquier ítem de facturación asociado con este equipo."
-
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "By deleting this document, the following will occur:"
 msgstr "Al eliminar este documento, ocurrirá lo siguiente:"
@@ -1476,7 +1576,6 @@ msgstr "Puede preparar"
 
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-signature-field.tsx
@@ -1487,6 +1586,7 @@ msgstr "Puede preparar"
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-account.tsx
@@ -1497,30 +1597,44 @@ msgstr "Puede preparar"
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/template-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 #: apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
 #: apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 #: packages/ui/primitives/signature-pad/signature-pad-dialog.tsx
 #: packages/ui/primitives/document-flow/send-document-action-dialog.tsx
 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx
@@ -1572,7 +1686,8 @@ msgstr "Casilla de verificación"
 msgid "Checkbox values"
 msgstr "Valores de Checkbox"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Checkout"
 msgstr "Checkout"
 
@@ -1592,6 +1707,10 @@ msgstr "Elige cómo el documento llegará a los destinatarios"
 msgid "Choose how to distribute your document to recipients. Email will send notifications, None will generate signing links for manual distribution."
 msgstr "Elija cómo distribuir su documento a los destinatarios. El correo electrónico enviará notificaciones, Ninguno generará enlaces de firma para la distribución manual."
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Choose your preferred authentication method:"
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "Choose..."
 msgstr "Elija..."
@@ -1600,13 +1719,9 @@ msgstr "Elija..."
 msgid "Claim account"
 msgstr "Reclamar cuenta"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Claim username"
-msgstr "Reclamar nombre de usuario"
-
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Claim your username now"
-msgstr "Reclame su nombre de usuario ahora"
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+msgid "Claims"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Clear file"
@@ -1631,7 +1746,7 @@ msgstr "Haga clic aquí para comenzar"
 msgid "Click here to retry"
 msgstr "Haga clic aquí para reintentar"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Click here to upload"
 msgstr "Haga clic aquí para subir"
 
@@ -1644,10 +1759,11 @@ msgstr "Haga clic para copiar el enlace de firma para enviar al destinatario"
 #: apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Click to insert field"
 msgstr "Haga clic para insertar campo"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
@@ -1655,6 +1771,9 @@ msgstr "Haga clic para insertar campo"
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: packages/ui/primitives/document-flow/missing-signature-field-dialog.tsx
@@ -1665,11 +1784,16 @@ msgstr "Cerrar"
 msgid "Communication"
 msgstr "Comunicación"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Compare all plans and features in detail"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Complete"
 msgstr "Completo"
 
@@ -1701,6 +1825,7 @@ msgstr "Completar Visualización"
 #: apps/remix/app/components/general/stack-avatars-with-tooltip.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/document.ts
 #: packages/email/template-components/template-document-self-signed.tsx
 #: packages/email/template-components/template-document-recipient-signed.tsx
@@ -1776,16 +1901,21 @@ msgstr "Configurar el campo {0}"
 msgid "Configure the fields you want to place on the document."
 msgstr "Configure los campos que desea colocar en el documento."
 
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Configure the team roles for each group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Configure the team roles for each member"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Confirm by typing <0>{confirmTransferMessage}</0>"
-msgstr "Confirme escribiendo <0>{confirmTransferMessage}</0>"
-
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 msgid "Confirm by typing <0>{deleteMessage}</0>"
 msgstr "Confirme escribiendo <0>{deleteMessage}</0>"
 
@@ -1817,20 +1947,24 @@ msgstr "Consentimiento para Transacciones Electrónicas"
 msgid "Contact Information"
 msgstr "Información de Contacto"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Contact sales here"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "Content"
 msgstr "Contenido"
 
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-view.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx
 #: packages/ui/primitives/document-flow/document-flow-root.tsx
 msgid "Continue"
@@ -1856,19 +1990,19 @@ msgstr "Continúa firmando el documento."
 msgid "Continue by viewing the document."
 msgstr "Continúa viendo el documento."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "Continue to login"
 msgstr "Continuar con el inicio de sesión"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the default language of an uploaded document. This will be used as the language in email communications with the recipients."
 msgstr "Controla el idioma predeterminado de un documento cargado. Este se utilizará como el idioma en las comunicaciones por correo electrónico con los destinatarios."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the default visibility of an uploaded document."
 msgstr "Controla la visibilidad predeterminada de un documento cargado."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the formatting of the message that will be sent when inviting a recipient to sign a document. If a custom message has been provided while configuring the document, it will be used instead."
 msgstr "Controla el formato del mensaje que se enviará al invitar a un destinatario a firmar un documento. Si se ha proporcionado un mensaje personalizado al configurar el documento, se usará en su lugar."
 
@@ -1876,11 +2010,11 @@ msgstr "Controla el formato del mensaje que se enviará al invitar a un destinat
 msgid "Controls the language for the document, including the language to be used for email notifications, and the final certificate that is generated and attached to the document."
 msgstr "Controla el idioma para el documento, incluyendo el idioma a utilizar para las notificaciones de correo electrónico y el certificado final que se genera y adjunta al documento."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls whether the signing certificate will be included in the document when it is downloaded. The signing certificate can still be downloaded from the logs page separately."
 msgstr "Controla si el certificado de firma se incluirá en el documento cuando se descargue. El certificado de firma aún puede descargarse por separado desde la página de registros."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls which signatures are allowed to be used when signing a document."
 msgstr "Controla qué firmas están permitidas al firmar un documento."
 
@@ -1929,6 +2063,9 @@ msgstr "Copiar token"
 
 #: apps/remix/app/routes/_profile+/_layout.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 msgid "Create"
 msgstr "Crear"
 
@@ -1940,16 +2077,31 @@ msgstr "Crea una <0>cuenta gratuita</0> para acceder a tus documentos firmados e
 msgid "Create a new account"
 msgstr "Crear una nueva cuenta"
 
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Create a new organisation with {planName} plan. Keep your current organisation on it's current plan"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create a team to collaborate with your team members."
 msgstr "Crea un equipo para colaborar con los miembros de tu equipo."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 #: packages/email/template-components/template-document-self-signed.tsx
 msgid "Create account"
 msgstr "Crear cuenta"
 
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Create an organisation for this user"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Create an organisation to collaborate with teams"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Create an organisation to get started."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Create and send"
 msgstr "Crear y enviar"
@@ -1962,6 +2114,14 @@ msgstr "Crear como borrador"
 msgid "Create as pending"
 msgstr "Crear como pendiente"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create claim"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create Claim"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog-wrapper.tsx
 msgid "Create Direct Link"
 msgstr "Crear enlace directo"
@@ -1974,6 +2134,15 @@ msgstr "Crear enlace de firma directo"
 msgid "Create document from template"
 msgstr "Crear documento a partir de la plantilla"
 
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Create group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Create Groups"
+msgstr ""
+
 #: apps/remix/app/routes/_profile+/_layout.tsx
 msgid "Create now"
 msgstr "Crear ahora"
@@ -1982,17 +2151,47 @@ msgstr "Crear ahora"
 msgid "Create one automatically"
 msgstr "Crear uno automáticamente"
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Create organisation"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/menu-switcher.tsx
+msgid "Create Organisation"
+msgstr ""
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Create separate organisation"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Create signing links"
 msgstr "Crear enlaces de firma"
 
-#: apps/remix/app/components/general/menu-switcher.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Create Stripe customer"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Create subscription"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create Subscription Claim"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create team"
 msgstr "Crear equipo"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create Team"
 msgstr "Crear Equipo"
@@ -2025,6 +2224,8 @@ msgstr "Crea tu cuenta y comienza a utilizar la firma de documentos de última g
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 #: apps/remix/app/components/tables/templates-table.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/tables/admin-leaderboard-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-information.tsx
@@ -2035,25 +2236,23 @@ msgid "Created"
 msgstr "Creado"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Created At"
 msgstr "Creado En"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Created by"
 msgstr "Creado por"
 
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table.tsx
 msgid "Created on"
 msgstr "Creado el"
 
 #. placeholder {0}: i18n.date(webhook.createdAt, DateTime.DATETIME_FULL)
 #. placeholder {0}: i18n.date(token.createdAt, DateTime.DATETIME_FULL)
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Created on {0}"
 msgstr "Creado el {0}"
 
@@ -2073,14 +2272,26 @@ msgstr "La contraseña actual es incorrecta."
 msgid "Current recipients:"
 msgstr "Destinatarios actuales:"
 
-#: apps/remix/app/components/general/billing-plans.tsx
-msgid "Daily"
-msgstr "Diario"
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "Currently all organisation members can access this team"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Currently branding can only be configured for Teams and above plans."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups._index.tsx
+msgid "Custom Organisation Groups"
+msgstr ""
 
 #: apps/remix/app/components/general/app-command-menu.tsx
 msgid "Dark Mode"
 msgstr "Modo Oscuro"
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Dashboard"
+msgstr ""
+
 #: apps/remix/app/components/tables/settings-security-activity-table.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
@@ -2089,8 +2300,7 @@ msgstr "Modo Oscuro"
 msgid "Date"
 msgstr "Fecha"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Date created"
 msgstr "Fecha de creación"
 
@@ -2100,24 +2310,20 @@ msgstr "Fecha de creación"
 msgid "Date Format"
 msgstr "Formato de fecha"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: packages/email/templates/team-invite.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: packages/email/templates/organisation-invite.tsx
 msgid "Decline"
 msgstr "Rechazar"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Declined team invitation"
-msgstr "Invitación de equipo rechazada"
-
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Document Language"
 msgstr "Idioma predeterminado del documento"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Document Visibility"
 msgstr "Visibilidad predeterminada del documento"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Signature Settings"
 msgstr "Configuraciones de Firma por Defecto"
 
@@ -2125,20 +2331,30 @@ msgstr "Configuraciones de Firma por Defecto"
 msgid "delete"
 msgstr "eliminar"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/document/document-page-view-dropdown.tsx
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -2148,6 +2364,7 @@ msgstr "Eliminar"
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-folder-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/folder-delete-dialog.tsx
 msgid "delete {0}"
 msgstr "eliminar {0}"
@@ -2178,18 +2395,33 @@ msgstr "Eliminar documento"
 msgid "Delete Document"
 msgstr "Eliminar Documento"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "Delete organisation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "Delete organisation group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "Delete organisation member"
+msgstr ""
+
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "Delete passkey"
 msgstr "Eliminar clave de paso"
 
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Delete Subscription Claim"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Delete team"
 msgstr "Eliminar equipo"
 
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-msgid "Delete team member"
-msgstr "Eliminar miembro del equipo"
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "Delete team group"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 msgid "Delete the document. This action is irreversible so proceed with caution."
@@ -2278,6 +2510,7 @@ msgstr "Enlace de plantilla directo eliminado"
 msgid "Direct template link usage exceeded ({0}/{1})"
 msgstr "El uso de enlace de plantilla directo excedió ({0}/{1})"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Disable"
 msgstr "Deshabilitar"
@@ -2288,6 +2521,10 @@ msgstr "Deshabilitar"
 msgid "Disable 2FA"
 msgstr "Deshabilitar 2FA"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "Disable access"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
 msgid "Disable account"
 msgstr "Deshabilitar cuenta"
@@ -2302,7 +2539,6 @@ msgid "Disable Two Factor Authentication before deleting your account."
 msgstr "Deshabilite la Autenticación de Dos Factores antes de eliminar su cuenta."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "Disabled"
 msgstr "Deshabilitado"
 
@@ -2338,8 +2574,7 @@ msgstr "¿Desea duplicar esta plantilla?"
 msgid "Documenso will delete <0>all of your documents</0>, along with all of your completed documents, signatures, and all other resources belonging to your Account."
 msgstr "Documenso eliminará <0>todos sus documentos</0>, junto con todos sus documentos completados, firmas y todos los demás recursos de su cuenta."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Document"
 msgstr "Documento"
@@ -2426,8 +2661,7 @@ msgstr "Documento creado usando un <0>enlace directo</0>"
 msgid "Document Creation"
 msgstr "Creación de documento"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 #: packages/lib/utils/document-audit-logs.ts
@@ -2463,15 +2697,13 @@ msgstr "ID externo del documento actualizado"
 msgid "Document found in your account"
 msgstr "Documento encontrado en tu cuenta"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/components/general/document/document-history-sheet.tsx
 msgid "Document history"
 msgstr "Historial de documentos"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document ID"
 msgstr "ID del documento"
 
@@ -2496,7 +2728,6 @@ msgid "Document metrics"
 msgstr "Métricas de documento"
 
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "Document moved"
 msgstr "Documento movido"
 
@@ -2520,7 +2751,8 @@ msgstr "Documento pendiente"
 msgid "Document pending email"
 msgstr "Correo electrónico de documento pendiente"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Document preferences updated"
 msgstr "Preferencias del documento actualizadas"
 
@@ -2559,13 +2791,11 @@ msgstr "Se actualizó la autenticación de firma del documento"
 msgid "Document signing process will be cancelled"
 msgstr "El proceso de firma del documento será cancelado"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document status"
 msgstr "Estado del documento"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document title"
 msgstr "Título del documento"
 
@@ -2603,16 +2833,13 @@ msgid "Document will be permanently deleted"
 msgstr "El documento será eliminado permanentemente"
 
 #: apps/remix/app/routes/_profile+/p.$url.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
 #: apps/remix/app/components/general/user-profile-timur.tsx
-#: apps/remix/app/components/general/generic-error-layout.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -2620,8 +2847,7 @@ msgstr "El documento será eliminado permanentemente"
 msgid "Documents"
 msgstr "Documentos"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Documents created from template"
 msgstr "Documentos creados a partir de la plantilla"
 
@@ -2629,6 +2855,10 @@ msgstr "Documentos creados a partir de la plantilla"
 msgid "Documents Received"
 msgstr "Documentos recibidos"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
+msgid "Documents that require your attention will appear here"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
 msgid "Documents Viewed"
 msgstr "Documentos vistos"
@@ -2638,7 +2868,8 @@ msgstr "Documentos vistos"
 msgid "Don't have an account? <0>Sign up</0>"
 msgstr "¿No tienes una cuenta? <0>Regístrate</0>"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/share-document-download-button.tsx
@@ -2711,7 +2942,7 @@ msgstr "Menú desplegable"
 msgid "Dropdown options"
 msgstr "Opciones de menú desplegable"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Due to an unpaid invoice, your team has been restricted. Please settle the payment to restore full access to your team."
 msgstr "Debido a una factura impaga, tu equipo ha sido restringido. Realiza el pago para restaurar el acceso completo a tu equipo."
 
@@ -2730,7 +2961,6 @@ msgid "Duplicate on all pages"
 msgstr "Duplicar en todas las páginas"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
@@ -2741,13 +2971,11 @@ msgstr "Duplicar en todas las páginas"
 msgid "Edit"
 msgstr "Editar"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Edit Template"
 msgstr "Editar plantilla"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Edit webhook"
 msgstr "Editar webhook"
 
@@ -2762,6 +2990,7 @@ msgstr "Divulgación de Firma Electrónica"
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/tables/admin-document-recipient-item-table.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-email-field.tsx
@@ -2772,6 +3001,7 @@ msgstr "Divulgación de Firma Electrónica"
 #: apps/remix/app/components/forms/forgot-password.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
@@ -2793,7 +3023,7 @@ msgstr "Correo electrónico"
 
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/send-confirmation-email.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Email address"
 msgstr "Dirección de correo electrónico"
 
@@ -2837,15 +3067,27 @@ msgstr "La verificación de correo electrónico ha sido eliminada"
 msgid "Email verification has been resent"
 msgstr "La verificación de correo electrónico ha sido reenviada"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Embedding, 5 members included and more"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "Empty field"
 msgstr "Campo vacío"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Enable"
+msgstr ""
+
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "Enable 2FA"
 msgstr "Habilitar 2FA"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Enable access"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 msgid "Enable account"
 msgstr "Habilitar cuenta"
@@ -2859,9 +3101,17 @@ msgstr "Habilitar Cuenta"
 msgid "Enable Authenticator App"
 msgstr "Habilitar aplicación autenticadora"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
-msgid "Enable custom branding for all documents in this team."
-msgstr "Habilitar branding personalizado para todos los documentos en este equipo."
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable Custom Branding"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable custom branding for all documents in this organisation"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable custom branding for all documents in this team"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: packages/lib/constants/template.ts
@@ -2876,8 +3126,6 @@ msgstr "Habilitar orden de firma"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Enabled"
@@ -2891,11 +3139,15 @@ msgstr "Habilitar la cuenta permite al usuario usar la cuenta de nuevo, junto co
 msgid "Enclosed Document"
 msgstr "Documento Adjunto"
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "Ends On"
-msgstr "Termina en"
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Enter claim name"
+msgstr ""
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Enter your 2FA code"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Enter your brand details"
 msgstr "Ingresa los detalles de tu marca"
 
@@ -2911,15 +3163,24 @@ msgstr "Ingresa tu dirección de correo electrónico para recibir el documento c
 msgid "Enter your name"
 msgstr "Ingresa tu nombre"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Enter your password"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 msgid "Enter your text here"
 msgstr "Ingresa tu texto aquí"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Enterprise"
+msgstr ""
+
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
 #: apps/remix/app/components/general/verify-email-banner.tsx
 #: apps/remix/app/components/general/template/template-edit-form.tsx
@@ -2954,15 +3215,14 @@ msgstr "Ingresa tu texto aquí"
 #: apps/remix/app/components/general/document/document-edit-form.tsx
 #: apps/remix/app/components/general/document/document-edit-form.tsx
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/template-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx
@@ -2975,7 +3235,7 @@ msgstr "Error"
 msgid "Error uploading file"
 msgstr "Error al cargar el archivo"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Everyone can access and view the document"
 msgstr "Todos pueden acceder y ver el documento"
 
@@ -2996,7 +3256,7 @@ msgid "Expired"
 msgstr "Expirado"
 
 #. placeholder {0}: i18n.date(token.expires, DateTime.DATETIME_FULL)
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Expires on {0}"
 msgstr "Expira el {0}"
 
@@ -3010,6 +3270,18 @@ msgstr "ID externo"
 msgid "Failed to create folder"
 msgstr "No se pudo crear la carpeta"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Failed to create subscription claim."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Failed to delete subscription claim."
+msgstr ""
+
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
+msgid "Failed to load document"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
 msgid "Failed to reseal document"
 msgstr "Falló al volver a sellar el documento"
@@ -3026,12 +3298,15 @@ msgstr "No se pudo actualizar el documento"
 msgid "Failed to update recipient"
 msgstr "Falló al actualizar el destinatario"
 
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Failed to update subscription claim."
+msgstr ""
+
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 msgid "Failed to update template"
 msgstr "No se pudo actualizar la plantilla"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Failed to update webhook"
 msgstr "Falló al actualizar el webhook"
 
@@ -3039,6 +3314,12 @@ msgstr "Falló al actualizar el webhook"
 msgid "Failed: {failedCount}"
 msgstr "Fallidos: {failedCount}"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Feature Flags"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 msgid "Field character limit"
 msgstr "Límite de caracteres del campo"
@@ -3096,6 +3377,10 @@ msgstr "El archivo no puede ser mayor a {APP_DOCUMENT_UPLOAD_SIZE_LIMIT}MB"
 msgid "File size exceeds the limit of {APP_DOCUMENT_UPLOAD_SIZE_LIMIT} MB"
 msgstr "El tamaño del archivo excede el límite de {APP_DOCUMENT_UPLOAD_SIZE_LIMIT} MB"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Fill in the details to create a new subscription claim."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
 msgid "Folder"
@@ -3132,6 +3417,10 @@ msgstr "Si tiene alguna pregunta sobre esta divulgación, firmas electrónicas o
 msgid "For each recipient, provide their email (required) and name (optional) in separate columns. Download the template CSV below for the correct format."
 msgstr "Para cada destinatario, proporciona su correo electrónico (obligatorio) y nombre (opcional) en columnas separadas. Descarga el modelo CSV a continuación para el formato correcto."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "For example, if the claim has a new flag \"FLAG_1\" set to true, then this organisation will get that flag added."
+msgstr ""
+
 #: packages/lib/server-only/auth/send-forgot-password.ts
 msgid "Forgot Password?"
 msgstr "¿Olvidaste tu contraseña?"
@@ -3142,6 +3431,10 @@ msgstr "¿Olvidaste tu contraseña?"
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Free"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/types.ts
 msgid "Free Signature"
 msgstr "Firma gratuita"
@@ -3153,9 +3446,12 @@ msgstr "Firma gratuita"
 #: apps/remix/app/components/forms/profile.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Full Name"
 msgstr "Nombre completo"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/template/template-edit-form.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
@@ -3173,8 +3469,16 @@ msgstr "Generar enlaces"
 msgid "Global recipient action authentication"
 msgstr "Autenticación de acción de destinatario global"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Go back"
+msgstr ""
+
 #: apps/remix/app/routes/_recipient+/_layout.tsx
 #: apps/remix/app/routes/_profile+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
 #: packages/ui/primitives/document-flow/document-flow-root.tsx
 msgid "Go Back"
@@ -3192,6 +3496,10 @@ msgstr "Regresar a casa"
 msgid "Go Back Home"
 msgstr "Regresar a casa"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid "Go home"
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "Go to document"
 msgstr "Ir al documento"
@@ -3200,6 +3508,10 @@ msgstr "Ir al documento"
 msgid "Go to owner"
 msgstr "Ir al propietario"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Go to team"
+msgstr ""
+
 #: apps/remix/app/routes/_profile+/p.$url.tsx
 msgid "Go to your <0>public profile settings</0> to add documents."
 msgstr "Ve a tu <0>configuración de perfil público</0> para agregar documentos."
@@ -3208,6 +3520,34 @@ msgstr "Ve a tu <0>configuración de perfil público</0> para agregar documentos
 msgid "Green"
 msgstr "Verde"
 
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Group has been created."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Group has been updated successfully"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Group Name"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
+#: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Groups"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
 msgid "has invited you to approve this document"
 msgstr "te ha invitado a aprobar este documento"
@@ -3237,6 +3577,10 @@ msgstr "Tener a un asistente como el último firmante significa que no podrá re
 msgid "Help complete the document for other signers."
 msgstr "Ayuda a completar el documento para otros firmantes."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "Here you can edit your organisation details."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/profile.tsx
 msgid "Here you can edit your personal details."
 msgstr "Aquí puedes editar tus datos personales."
@@ -3245,14 +3589,23 @@ msgstr "Aquí puedes editar tus datos personales."
 msgid "Here you can manage your password and security settings."
 msgstr "Aquí puedes gestionar tu contraseña y la configuración de seguridad."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Here you can set preferences and defaults for branding."
 msgstr "Aquí puedes establecer preferencias y valores predeterminados para la marca."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Here you can set preferences and defaults for your organisation. Teams will inherit these settings by default."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Here you can set preferences and defaults for your team."
 msgstr "Aquí puedes establecer preferencias y valores predeterminados para tu equipo."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Here you can set your general preferences"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "Here's how it works:"
 msgstr "Así es como funciona:"
@@ -3269,7 +3622,7 @@ msgstr "Hola, {userName},"
 msgid "Hi, {userName} <0>({userEmail})</0>"
 msgstr "Hola, {userName} <0>({userEmail})</0>"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "Hide"
@@ -3279,6 +3632,10 @@ msgstr "Ocultar"
 msgid "Hide additional information"
 msgstr "Ocultar información adicional"
 
+#: apps/remix/app/components/general/generic-error-layout.tsx
+msgid "Home"
+msgstr ""
+
 #: packages/lib/constants/recipient-roles.ts
 msgid "I am a signer of this document"
 msgstr "Soy un firmante de este documento"
@@ -3308,9 +3665,13 @@ msgstr "Soy el propietario de este documento"
 msgid "I'm sure! Delete it"
 msgstr "¡Estoy seguro! Elimínalo"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "If they accept this request, the team will be transferred to their account."
-msgstr "Si aceptan esta solicitud, el equipo será transferido a su cuenta."
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "ID"
+msgstr ""
+
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "ID copied to clipboard"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "If you do not want to use the authenticator prompted, you can close it, which will then display the next available authenticator."
@@ -3324,6 +3685,8 @@ msgstr "Si no encuentras el enlace de confirmación en tu bandeja de entrada, pu
 msgid "If your authenticator app does not support QR codes, you can use the following code instead:"
 msgstr "Si tu aplicación de autenticación no admite códigos QR, puedes usar el siguiente código en su lugar:"
 
+#: apps/remix/app/components/general/app-nav-mobile.tsx
+#: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 msgid "Inbox"
 msgstr "Bandeja de entrada"
@@ -3332,7 +3695,7 @@ msgstr "Bandeja de entrada"
 msgid "Inbox documents"
 msgstr "Documentos en bandeja de entrada"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Include the Signing Certificate in the Document"
 msgstr "Incluir el certificado de firma en el documento"
 
@@ -3341,11 +3704,27 @@ msgstr "Incluir el certificado de firma en el documento"
 msgid "Information"
 msgstr "Información"
 
-#: packages/ui/components/recipient/recipient-action-auth-select.tsx
 #: packages/ui/components/recipient/recipient-action-auth-select.tsx
 msgid "Inherit authentication method"
 msgstr "Heredar método de autenticación"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Inherit from organisation"
+msgstr ""
+
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "Inherit organisation members"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Inherited subscription claim"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-initials-field.tsx
 #: packages/ui/primitives/document-flow/types.ts
 msgid "Initials"
@@ -3372,8 +3751,8 @@ msgstr "Email inválido"
 msgid "Invalid link"
 msgstr "Enlace inválido"
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Invalid token"
 msgstr "Token inválido"
 
@@ -3381,43 +3760,52 @@ msgstr "Token inválido"
 msgid "Invalid token provided. Please try again."
 msgstr "Token inválido proporcionado. Por favor, inténtelo nuevamente."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Invitation accepted"
+msgstr ""
+
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "Invitation accepted!"
 msgstr "¡Invitación aceptada!"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "Invitation declined"
 msgstr "Invitación rechazada"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invitation has been deleted"
 msgstr "La invitación ha sido eliminada"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invitation has been resent"
 msgstr "La invitación ha sido reenviada"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite"
 msgstr "Invitar"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite member"
 msgstr "Invitar miembro"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite Members"
 msgstr "Invitar a miembros"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "Invite team members"
-msgstr "Invitar a miembros del equipo"
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Invite organisation members"
+msgstr ""
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Invite team members to collaborate"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invited At"
 msgstr "Invitado el"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
 msgid "Invoice"
 msgstr "Factura"
 
@@ -3435,6 +3823,10 @@ msgstr "Es crucial mantener su información de contacto, especialmente su direcc
 msgid "It looks like {0} hasn't added any documents to their profile yet."
 msgstr "Parece que {0} aún no ha agregado documentos a su perfil."
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "It looks like we ran into an issue!"
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
 msgid "It seems that the provided token has expired. We've just sent you another token, please check your email and try again."
 msgstr "Parece que el token proporcionado ha expirado. Te hemos enviado otro token, por favor revisa tu correo electrónico y vuelve a intentarlo."
@@ -3451,9 +3843,14 @@ msgstr "Actualmente no es tu turno para firmar. Por favor, vuelve pronto ya que
 msgid "It's currently not your turn to sign. You will receive an email with instructions once it's your turn to sign the document."
 msgstr "Actualmente no es tu turno para firmar. Recibirás un correo electrónico con instrucciones una vez sea tu turno para firmar el documento."
 
-#: packages/email/templates/team-invite.tsx
-msgid "Join {teamName} on Documenso"
-msgstr "Únete a {teamName} en Documenso"
+#: packages/email/templates/organisation-invite.tsx
+msgid "Join {organisationName} on Documenso"
+msgstr ""
+
+#. placeholder {0}: DateTime.fromJSDate(team.createdAt).toRelative({ style: 'short' })
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Joined {0}"
+msgstr ""
 
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
@@ -3463,6 +3860,7 @@ msgstr "Únete a {teamName} en Documenso"
 msgid "Label"
 msgstr "Etiqueta"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
@@ -3487,8 +3885,7 @@ msgstr "Últimos 7 días"
 msgid "Last modified"
 msgstr "Última modificación"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Last updated"
 msgstr "Última actualización"
 
@@ -3508,14 +3905,20 @@ msgstr "Último uso"
 msgid "Leaderboard"
 msgstr "Tabla de clasificación"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
 msgid "Leave"
 msgstr "Salir"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "Leave team"
-msgstr "Salir del equipo"
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Leave blank to inherit from the organisation."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "Leave organisation"
+msgstr ""
 
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Legality of Electronic Signatures"
@@ -3529,12 +3932,11 @@ msgstr "Modo claro"
 msgid "Like to have your own public profile with agreements?"
 msgstr "¿Te gustaría tener tu propio perfil público con acuerdos?"
 
-#: packages/email/templates/team-transfer-request.tsx
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Link expires in 1 hour."
 msgstr "El enlace expira en 1 hora."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Link template"
 msgstr "Enlace de plantilla"
 
@@ -3544,7 +3946,6 @@ msgstr "Enlaces generados"
 
 #. placeholder {0}: webhook.eventTriggers .map((trigger) => toFriendlyWebhookEventName(trigger)) .join(', ')
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "Listening to {0}"
 msgstr "Escuchando a {0}"
 
@@ -3553,6 +3954,7 @@ msgid "Load older activity"
 msgstr "Cargar actividad anterior"
 
 #: apps/remix/app/components/general/skeletons/document-edit-skeleton.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: packages/ui/primitives/pdf-viewer.tsx
 msgid "Loading document..."
 msgstr "Cargando documento..."
@@ -3562,11 +3964,6 @@ msgstr "Cargando documento..."
 msgid "Loading Document..."
 msgstr "Cargando Documento..."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Loading teams..."
-msgstr "Cargando equipos..."
-
 #: apps/remix/app/components/general/document/document-page-view-recent-activity.tsx
 msgid "Loading..."
 msgstr "Cargando..."
@@ -3577,7 +3974,9 @@ msgstr "Cargando..."
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Manage"
 msgstr "Gestionar"
 
@@ -3586,16 +3985,19 @@ msgstr "Gestionar"
 msgid "Manage {0}'s profile"
 msgstr "Gestionar el perfil de {0}"
 
-#: apps/remix/app/routes/_authenticated+/settings+/teams.tsx
-msgid "Manage all teams you are currently associated with."
-msgstr "Gestionar todos los equipos con los que estás asociado actualmente."
+#: apps/remix/app/routes/_authenticated+/settings+/organisations.tsx
+msgid "Manage all organisations you are currently associated with."
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Manage all subscription claims"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Manage and view template"
 msgstr "Gestionar y ver plantilla"
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
 msgid "Manage billing"
 msgstr "Gestionar la facturación"
 
@@ -3611,42 +4013,69 @@ msgstr "Gestionar enlace directo"
 msgid "Manage documents"
 msgstr "Gestionar documentos"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage organisation"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Manage organisations"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security._index.tsx
 msgid "Manage passkeys"
 msgstr "Gestionar claves de acceso"
 
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Manage permissions and access controls"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 msgid "Manage subscription"
 msgstr "Gestionar suscripción"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-msgid "Manage Subscription"
-msgstr "Gestionar Suscripción"
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage the {0} organisation"
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "Manage subscriptions"
-msgstr "Gestionar suscripciones"
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage the {0} organisation subscription"
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Manage team subscription."
-msgstr "Gestionar suscripción de equipo."
-
-#: apps/remix/app/components/general/menu-switcher.tsx
-msgid "Manage teams"
-msgstr "Gestionar equipos"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups._index.tsx
+msgid "Manage the custom groups of members for your organisation."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "Manage the direct link signing for this template"
 msgstr "Gestionar la firma de enlace directo para esta plantilla"
 
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
+msgid "Manage the groups assigned to this team."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+msgid "Manage the members of your team."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 msgid "Manage the members or invite new members."
 msgstr "Gestionar los miembros o invitar nuevos miembros."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+msgid "Manage the teams in this organisation."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/users._index.tsx
 msgid "Manage users"
 msgstr "Gestionar usuarios"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Manage your organisation group settings."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.passkeys.tsx
 msgid "Manage your passkeys."
 msgstr "Gestionar tus claves de acceso."
@@ -3655,7 +4084,8 @@ msgstr "Gestionar tus claves de acceso."
 msgid "Manage your site settings here"
 msgstr "Gestionar la configuración de tu sitio aquí"
 
-#: packages/lib/constants/teams.ts
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Manager"
 msgstr "Gerente"
 
@@ -3684,18 +4114,33 @@ msgstr "Máx"
 msgid "Maximum file size: 4MB. Maximum 100 rows per upload. Blank values will use template defaults."
 msgstr "Tamaño máximo de archivo: 4MB. Máximo 100 filas por carga. Los valores en blanco usarán los valores predeterminados de la plantilla."
 
-#: packages/lib/constants/teams.ts
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Member"
 msgstr "Miembro"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Member Count"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
 msgid "Member Since"
 msgstr "Miembro desde"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
 msgid "Members"
 msgstr "Miembros"
 
@@ -3714,8 +4159,12 @@ msgstr "Mín"
 msgid "Modify recipients"
 msgstr "Modificar destinatarios"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Modify the details of the subscription claim."
+msgstr ""
+
 #: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Monthly"
 msgstr "Mensual"
 
@@ -3728,9 +4177,7 @@ msgid "Monthly Active Users: Users that had at least one of their documents comp
 msgstr "Usuarios activos mensuales: Usuarios que completaron al menos uno de sus documentos"
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "Move"
 msgstr "Mover"
 
@@ -3742,36 +4189,18 @@ msgstr "Mover \"{templateTitle}\" a una carpeta"
 msgid "Move Document to Folder"
 msgstr "Mover Documento a Carpeta"
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Move Document to Team"
-msgstr "Mover documento al equipo"
-
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 msgid "Move Template to Folder"
 msgstr "Mover Plantilla a Carpeta"
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Move Template to Team"
-msgstr "Mover plantilla al equipo"
-
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 msgid "Move to Folder"
 msgstr "Mover a Carpeta"
 
-#: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
-#: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
-msgid "Move to Team"
-msgstr "Mover al equipo"
-
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Moving..."
-msgstr "Moviendo..."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "My templates"
-msgstr "Mis plantillas"
+#: packages/ui/components/document/document-global-auth-access-select.tsx
+msgid "Multiple access methods can be selected."
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table.tsx
@@ -3779,9 +4208,11 @@ msgstr "Mis plantillas"
 #: apps/remix/app/components/tables/admin-leaderboard-table.tsx
 #: apps/remix/app/components/tables/admin-document-recipient-item-table.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-name-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
@@ -3799,6 +4230,10 @@ msgstr "Mis plantillas"
 msgid "Name"
 msgstr "Nombre"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Name is required"
+msgstr ""
+
 #: apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
 msgid "Need to sign documents?"
 msgstr "¿Necesitas firmar documentos?"
@@ -3827,18 +4262,16 @@ msgstr "Nunca expira"
 msgid "New Password"
 msgstr "Nueva Contraseña"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "New team owner"
-msgstr "Nuevo propietario del equipo"
-
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
 msgid "New Template"
 msgstr "Nueva plantilla"
 
-#: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: packages/ui/primitives/signature-pad/signature-pad-dialog.tsx
 msgid "Next"
 msgstr "Siguiente"
@@ -3847,6 +4280,11 @@ msgstr "Siguiente"
 msgid "Next field"
 msgstr "Siguiente campo"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "No"
+msgstr ""
+
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "No active drafts"
 msgstr "No hay borradores activos"
@@ -3856,9 +4294,9 @@ msgstr "No hay borradores activos"
 msgid "No further action is required from you at this time."
 msgstr "No further action is required from you at this time."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "No payment required"
-msgstr "No se requiere pago"
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "No organisations found"
+msgstr ""
 
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
 msgid "No public profile templates found"
@@ -3890,8 +4328,6 @@ msgid "No recipients with this role"
 msgstr "No hay destinatarios con este rol"
 
 #: packages/ui/components/document/document-global-auth-action-select.tsx
-#: packages/ui/components/document/document-global-auth-action-select.tsx
-#: packages/ui/components/document/document-global-auth-access-select.tsx
 #: packages/ui/components/document/document-global-auth-access-select.tsx
 msgid "No restrictions"
 msgstr "Sin restricciones"
@@ -3908,6 +4344,18 @@ msgstr "No se encontraron resultados."
 msgid "No signature field found"
 msgstr "No se encontró campo de firma"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "No Stripe customer attached"
+msgstr ""
+
+#: apps/remix/app/components/tables/team-groups-table.tsx
+msgid "No team groups found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "No teams yet"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "No valid direct templates found"
 msgstr "No se encontraron plantillas directas válidas"
@@ -3926,6 +4374,7 @@ msgstr "No se encontró valor."
 msgid "No worries, it happens! Enter your email and we'll email you a special link to reset your password."
 msgstr "¡No te preocupes, sucede! Ingresa tu correo electrónico y te enviaremos un enlace especial para restablecer tu contraseña."
 
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/lib/constants/document.ts
 msgid "None"
@@ -3951,6 +4400,16 @@ msgstr "Número"
 msgid "Number format"
 msgstr "Formato de número"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Number of members allowed. 0 = Unlimited"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Number of teams allowed. 0 = Unlimited"
+msgstr ""
+
 #. placeholder {0}: document.team?.name
 #: apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
 msgid "on behalf of \"{0}\" has invited you to approve this document"
@@ -3975,17 +4434,15 @@ msgstr "en nombre de \"{0}\" te ha invitado a ver este documento"
 msgid "On this page, you can create a new webhook."
 msgstr "En esta página, puedes crear un nuevo webhook."
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "On this page, you can create and manage API tokens. See our <0>Documentation</0> for more information."
 msgstr "En esta página, puedes crear y gestionar tokens de API. Consulta nuestra <0>Documentación</0> para más información."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "On this page, you can create new Webhooks and manage the existing ones."
 msgstr "En esta página, puedes editar el webhook y sus configuraciones."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "On this page, you can edit the webhook and its settings."
 msgstr "En esta página, puedes editar el webhook y su configuración."
 
@@ -4005,18 +4462,18 @@ msgstr "Una vez que hayas escaneado el código QR o ingresado el código manualm
 msgid "Once your template is set up, share the link anywhere you want. The person who opens the link will be able to enter their information in the direct link recipient field and complete any other fields assigned to them."
 msgstr "Una vez que su plantilla esté configurada, comparta el enlace donde desee. La persona que abra el enlace podrá ingresar su información en el campo de destinatario de enlace directo y completar cualquier otro campo que se le haya asignado."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "One of the documents in the current bundle has a signing role that is not compatible with the current signing experience."
+msgstr ""
+
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Only admins can access and view the document"
 msgstr "Solo los administradores pueden acceder y ver el documento"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Only managers and above can access and view the document"
 msgstr "Solo los gerentes y superiores pueden acceder y ver el documento"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Only subscribers can have a username shorter than 6 characters"
-msgstr "Solo los suscriptores pueden tener un nombre de usuario de menos de 6 caracteres"
-
 #: apps/remix/app/routes/_profile+/_layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
@@ -4036,15 +4493,131 @@ msgstr "O"
 msgid "Or continue with"
 msgstr "O continúa con"
 
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "Organisation"
+msgstr ""
+
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Admin"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Organisation created"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Organisation group not found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Organisation Group Settings"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation has been updated successfully"
+msgstr ""
+
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "Organisation invitation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Organisation invitations have been sent."
+msgstr ""
+
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Manager"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Member"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation Members"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Organisation Name"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation not found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Organisation Preferences"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Organisation role"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Organisation Role"
+msgstr ""
+
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Organisation settings"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+msgid "Organisation Settings"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation Teams"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Organisation URL"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/routes/_authenticated+/settings+/organisations.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+#: apps/remix/app/components/general/settings-nav-mobile.tsx
+#: apps/remix/app/components/general/settings-nav-desktop.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Organisations"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "Organisations that the user is a member of."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Organise your members into groups which can be assigned to teams"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Organize your documents and templates"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Otherwise, the document will be created as a draft."
 msgstr "De lo contrario, el documento se creará como un borrador."
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Owner"
 msgstr "Propietario"
 
@@ -4059,10 +4632,7 @@ msgstr "Página {0} de {1}"
 msgid "Page {0} of {numPages}"
 msgstr "Página {0} de {numPages}"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "Paid"
-msgstr "Pagado"
-
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/forms/signin.tsx
 msgid "Passkey"
 msgstr "Clave de acceso"
@@ -4105,12 +4675,18 @@ msgid "Passkeys are not supported on this browser"
 msgstr "Las claves de acceso no están soportadas en este navegador"
 
 #: apps/remix/app/components/general/app-command-menu.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/forms/signin.tsx
 #: apps/remix/app/components/forms/reset-password.tsx
 msgid "Password"
 msgstr "Contraseña"
 
+#: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
+msgid "Password Re-Authentication"
+msgstr ""
+
 #: packages/email/templates/forgot-password.tsx
 msgid "Password Reset Requested"
 msgstr "Solicitud de restablecimiento de contraseña"
@@ -4133,21 +4709,12 @@ msgstr "Contraseña actualizada"
 msgid "Password updated!"
 msgstr "¡Contraseña actualizada!"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "Pay"
-msgstr "Pagar"
-
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Payment is required to finalise the creation of your team."
-msgstr "Se requiere pago para finalizar la creación de tu equipo."
-
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Payment overdue"
 msgstr "Pago atrasado"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
@@ -4168,22 +4735,36 @@ msgstr "Documentos pendientes"
 msgid "Pending Documents"
 msgstr "Documentos Pendientes"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "Pending invitations"
 msgstr "Invitaciones pendientes"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "Pending team deleted."
-msgstr "Equipo pendiente eliminado."
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "per month"
+msgstr ""
 
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "per year"
+msgstr ""
+
+#: apps/remix/app/components/tables/user-organisations-table.tsx
 msgid "Personal"
 msgstr "Personal"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 msgid "Personal Account"
 msgstr "Cuenta personal"
 
+#: apps/remix/app/routes/_authenticated+/inbox.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/menu-switcher.tsx
+msgid "Personal Inbox"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
 msgid "Pick a number"
 msgstr "Seleccione un número"
@@ -4223,7 +4804,7 @@ msgstr "Por favor {recipientActionVerb} este documento creado a partir de tu pla
 msgid "Please {recipientActionVerb} your document"
 msgstr "Por favor {recipientActionVerb} tu documento"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Please check the CSV file and make sure it is according to our format"
 msgstr "Por favor, revisa el archivo CSV y asegúrate de que esté de acuerdo con nuestro formato"
 
@@ -4256,6 +4837,10 @@ msgstr "Por favor confirma tu dirección de correo electrónico"
 msgid "Please contact support if you would like to revert this action."
 msgstr "Por favor, contacta al soporte si deseas revertir esta acción."
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Please contact the site owner for further assistance."
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "Please enter a meaningful name for your token. This will help you identify it later."
 msgstr "Por favor, ingresa un nombre significativo para tu token. Esto te ayudará a identificarlo más tarde."
@@ -4341,17 +4926,25 @@ msgstr "Por favor, escriba {0} para confirmar"
 msgid "Please type <0>{0}</0> to confirm."
 msgstr "Por favor, escribe <0>{0}</0> para confirmar."
 
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Please upload a logo"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
 msgid "Pre-formatted CSV template with example data."
 msgstr "Plantilla CSV preformateada con datos de ejemplo."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/components/general/settings-nav-mobile.tsx
+#: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Preview"
 msgstr "Vista previa"
 
@@ -4379,11 +4972,11 @@ msgstr "Proceder"
 msgid "Profile"
 msgstr "Perfil"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Profile is currently <0>hidden</0>."
 msgstr "El perfil está actualmente <0>oculto</0>."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Profile is currently <0>visible</0>."
 msgstr "El perfil está actualmente <0>visible</0>."
 
@@ -4392,12 +4985,16 @@ msgstr "El perfil está actualmente <0>visible</0>."
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Progress"
+msgstr ""
+
 #: apps/remix/app/components/tables/templates-table.tsx
 #: apps/remix/app/components/general/template/template-type.tsx
 msgid "Public"
 msgstr "Público"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -4409,10 +5006,6 @@ msgstr "Perfil Público"
 msgid "Public profile URL"
 msgstr "URL del perfil público"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Public profile username"
-msgstr "Nombre de usuario del perfil público"
-
 #: apps/remix/app/components/tables/templates-table.tsx
 msgid "Public templates are connected to your public profile. Any modifications to public templates will also appear in your public profile."
 msgstr "Las plantillas públicas están conectadas a tu perfil público. Cualquier modificación a las plantillas públicas también aparecerá en tu perfil público."
@@ -4482,6 +5075,7 @@ msgstr "Actividad reciente"
 msgid "Recent documents"
 msgstr "Documentos recientes"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
@@ -4562,6 +5156,7 @@ msgstr "Rechazar Documento"
 #: apps/remix/app/components/general/stack-avatars-with-tooltip.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/document.ts
 msgid "Rejected"
 msgstr "Rejected"
@@ -4596,43 +5191,47 @@ msgstr "Recordatorio: Por favor {recipientActionVerb} este documento"
 msgid "Reminder: Please {recipientActionVerb} your document"
 msgstr "Recordatorio: Por favor {recipientActionVerb} tu documento"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-field-container.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: packages/ui/primitives/document-flow/field-item.tsx
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "Remove"
 msgstr "Eliminar"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+msgid "Remove organisation group"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+msgid "Remove organisation member"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 msgid "Remove team email"
 msgstr "Eliminar correo electrónico del equipo"
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "Remove team member"
 msgstr "Eliminar miembro del equipo"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Renews: {formattedDate}"
-msgstr "Renueva: {formattedDate}"
-
 #: apps/remix/app/components/forms/reset-password.tsx
 #: apps/remix/app/components/forms/password.tsx
 msgid "Repeat Password"
 msgstr "Repetir contraseña"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Request transfer"
-msgstr "Solicitar transferencia"
-
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx
@@ -4645,7 +5244,7 @@ msgstr "Campo obligatorio"
 msgid "Reseal document"
 msgstr "Re-sellar documento"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Resend"
@@ -4661,6 +5260,7 @@ msgstr "Reenviar verificación"
 
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 msgid "Reset"
 msgstr "Restablecer"
 
@@ -4679,11 +5279,11 @@ msgstr "Restablecer contraseña"
 msgid "Resetting Password..."
 msgstr "Restableciendo contraseña..."
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Resolve"
 msgstr "Resolver"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Resolve payment"
 msgstr "Resolver pago"
 
@@ -4691,6 +5291,10 @@ msgstr "Resolver pago"
 msgid "Rest assured, your document is strictly confidential and will never be shared. Only your signing experience will be highlighted. Share your personalized signing card to showcase your signature!"
 msgstr "Ten la seguridad de que tu documento es estrictamente confidencial y nunca será compartido. Solo se destacará tu experiencia de firma. ¡Comparte tu tarjeta de firma personalizada para mostrar tu firma!"
 
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
+msgid "Restricted Access"
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Retention of Documents"
 msgstr "Retención de Documentos"
@@ -4701,16 +5305,12 @@ msgstr "Reintentar"
 
 #: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Return"
 msgstr "Regresar"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "Return to Dashboard"
-msgstr "Regresar al tablero"
-
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Return to Home"
 msgstr "Regresar a la página de inicio"
 
@@ -4727,13 +5327,17 @@ msgstr "Revocar"
 msgid "Revoke access"
 msgstr "Revocar acceso"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
 msgid "Role"
 msgstr "Rol"
 
@@ -4764,13 +5368,23 @@ msgstr "Guardar"
 msgid "Save Template"
 msgstr "Guardar plantilla"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
 #: apps/remix/app/components/tables/documents-table-sender-filter.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 msgid "Search"
 msgstr "Buscar"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Search and manage all organisations"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Search by claim ID or name"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 msgid "Search by document title"
 msgstr "Buscar por título del documento"
@@ -4780,6 +5394,10 @@ msgstr "Buscar por título del documento"
 msgid "Search by name or email"
 msgstr "Buscar por nombre o correo electrónico"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Search by organisation ID, name, customer ID or owner email"
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-search.tsx
 msgid "Search documents..."
 msgstr "Buscar documentos..."
@@ -4788,7 +5406,6 @@ msgstr "Buscar documentos..."
 msgid "Search languages..."
 msgstr "Buscar idiomas..."
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Secret"
 msgstr "Secreto"
@@ -4813,18 +5430,17 @@ msgstr "Seleccionar"
 msgid "Select a folder to move this document to."
 msgstr "Selecciona una carpeta para mover este documento."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Select a team"
-msgstr "Seleccionar un equipo"
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Select a plan"
+msgstr ""
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Select a team to move this document to. This action cannot be undone."
-msgstr "Seleccionar un equipo para mover este documento. Esta acción no se puede deshacer."
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Select a plan to continue"
+msgstr ""
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Select a team to move this template to. This action cannot be undone."
-msgstr "Seleccionar un equipo para mover esta plantilla. Esta acción no se puede deshacer."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Select a team to view its dashboard"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Select a template you'd like to display on your public profile"
@@ -4834,22 +5450,70 @@ msgstr "Seleccionar una plantilla que te gustaría mostrar en tu perfil público
 msgid "Select a template you'd like to display on your team's public profile"
 msgstr "Seleccionar una plantilla que te gustaría mostrar en el perfil público de tu equipo"
 
+#: packages/ui/components/document/document-global-auth-access-select.tsx
+msgid "Select access methods"
+msgstr ""
+
 #: packages/ui/primitives/combobox.tsx
 msgid "Select an option"
 msgstr "Seleccionar una opción"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Select an organisation to view teams"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
 msgid "Select at least"
 msgstr "Seleccionar al menos"
 
+#: packages/ui/components/recipient/recipient-action-auth-select.tsx
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "Select authentication methods"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/dropdown-field.tsx
 msgid "Select default option"
 msgstr "Seleccionar opción predeterminada"
 
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select groups"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select groups to add to this team"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Select members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select members or groups of members to add to the team."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Select members to add to this team"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 msgid "Select passkey"
 msgstr "Seleccionar clave de acceso"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Select signature types"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Select the members to add to this group"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Select the members to include in this group"
+msgstr ""
+
 #: apps/remix/app/components/general/webhook-multiselect-combobox.tsx
 #: apps/remix/app/components/general/webhook-multiselect-combobox.tsx
 msgid "Select triggers"
@@ -4898,7 +5562,7 @@ msgstr "Enviar documentos en nombre del equipo usando la dirección de correo el
 msgid "Send documents to recipients immediately"
 msgstr "Enviar documentos a los destinatarios inmediatamente"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Send on Behalf of Team"
 msgstr "Enviar en nombre del equipo"
 
@@ -4918,6 +5582,7 @@ msgstr "Enviar correo electrónico de solicitud de firma de destinatario"
 msgid "Send reminder"
 msgstr "Enviar recordatorio"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 msgid "Sender"
 msgstr "Remitente"
@@ -4947,7 +5612,10 @@ msgstr "Configura las propiedades de tu documento y la información del destinat
 msgid "Set up your template properties and recipient information"
 msgstr "Configura las propiedades de tu plantilla y la información del destinatario"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/routes/_authenticated+/settings+/_layout.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -4980,7 +5648,7 @@ msgstr "Compartir el enlace"
 msgid "Share your signing experience!"
 msgstr "¡Comparte tu experiencia de firma!"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Show"
 msgstr "Mostrar"
 
@@ -4993,15 +5661,12 @@ msgstr "Mostrar información adicional"
 msgid "Show advanced settings"
 msgstr "Mostrar configuraciones avanzadas"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Show templates in your public profile for your audience to sign and get started quickly"
 msgstr "Mostrar plantillas en tu perfil público para que tu audiencia firme y comience rápidamente"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Show templates in your team public profile for your audience to sign and get started quickly"
-msgstr "Mostrar plantillas en el perfil público de tu equipo para que tu audiencia firme y comience rápidamente"
-
 #: apps/remix/app/routes/_profile+/p.$url.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/user-profile-timur.tsx
@@ -5010,6 +5675,7 @@ msgstr "Mostrar plantillas en el perfil público de tu equipo para que tu audien
 #: apps/remix/app/components/general/document-signing/document-signing-name-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 #: apps/remix/app/components/general/document/document-page-view-button.tsx
 #: packages/lib/constants/recipient-roles.ts
@@ -5030,6 +5696,7 @@ msgstr "Firmar como<0>{0} <1>({1})</1></0>"
 
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Sign document"
 msgstr "Firmar documento"
 
@@ -5038,6 +5705,11 @@ msgstr "Firmar documento"
 msgid "Sign Document"
 msgstr "Firmar Documento"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Sign Documents"
+msgstr ""
+
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 msgid "Sign field"
 msgstr "Campo de firma"
@@ -5053,9 +5725,11 @@ msgid "Sign In"
 msgstr "Iniciar sesión"
 
 #: apps/remix/app/routes/_unauthenticated+/signin.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 msgid "Sign in to your account"
 msgstr "Inicia sesión en tu cuenta"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 msgid "Sign Out"
@@ -5063,6 +5737,7 @@ msgstr "Cerrar sesión"
 
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Sign the document to complete the process."
 msgstr "Firma el documento para completar el proceso."
 
@@ -5086,6 +5761,7 @@ msgstr "Regístrate con OIDC"
 #: apps/remix/app/components/forms/profile.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
 #: packages/ui/primitives/document-flow/types.ts
 #: packages/ui/primitives/document-flow/add-fields.tsx
@@ -5208,24 +5884,25 @@ msgstr "Algunos firmantes no han sido asignados a un campo de firma. Asigne al m
 
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/share-document-download-button.tsx
-#: apps/remix/app/components/general/billing-portal-button.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-page.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-account.tsx
 #: apps/remix/app/components/general/document/document-page-view-dropdown.tsx
@@ -5235,7 +5912,6 @@ msgstr "Algunos firmantes no han sido asignados a un campo de firma. Asigne al m
 #: apps/remix/app/components/general/document/document-audit-log-download-button.tsx
 #: apps/remix/app/components/general/direct-template/direct-template-signing-auth-page.tsx
 #: apps/remix/app/components/general/direct-template/direct-template-page.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
@@ -5243,11 +5919,11 @@ msgstr "Algunos firmantes no han sido asignados a un campo de firma. Asigne al m
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
@@ -5255,11 +5931,6 @@ msgstr "Algunos firmantes no han sido asignados a un campo de firma. Asigne al m
 msgid "Something went wrong"
 msgstr "Algo salió mal"
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Something went wrong while attempting to transfer the ownership of team <0>{0}</0> to your. Please try again later or contact support."
-msgstr "Algo salió mal al intentar transferir la propiedad del equipo <0>{0}</0> a tu equipo. Por favor, intenta de nuevo más tarde o contacta al soporte."
-
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "Something went wrong while attempting to verify your email address for <0>{0}</0>. Please try again later."
@@ -5282,7 +5953,8 @@ msgstr "Algo salió mal al enviar el correo de confirmación."
 msgid "Something went wrong while updating the team billing subscription, please contact support."
 msgstr "Algo salió mal al actualizar la suscripción de facturación del equipo, por favor contacta al soporte."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Something went wrong!"
 msgstr "¡Algo salió mal!"
 
@@ -5307,6 +5979,7 @@ msgstr "Lo sentimos, no pudimos descargar los registros de auditoría. Por favor
 msgid "Sorry, we were unable to download the certificate. Please try again later."
 msgstr "Lo sentimos, no pudimos descargar el certificado. Por favor, intenta de nuevo más tarde."
 
+#: apps/remix/app/components/tables/team-members-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Source"
 msgstr "Fuente"
@@ -5316,10 +5989,11 @@ msgid "Stats"
 msgstr "Estadísticas"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Status"
 msgstr "Estado"
@@ -5328,48 +6002,78 @@ msgstr "Estado"
 msgid "Step <0>{step} of {maxStep}</0>"
 msgstr "Paso <0>{step} de {maxStep}</0>"
 
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "Stripe"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Stripe customer created successfully"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Stripe Customer ID"
+msgstr ""
+
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Subject <0>(Optional)</0>"
 msgstr "Asunto <0>(Opcional)</0>"
 
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
 msgid "Subscribe"
 msgstr "Suscribirse"
 
-#: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Subscription"
 msgstr "Suscripción"
 
-#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
-msgid "Subscriptions"
-msgstr "Suscripciones"
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Subscription claim created successfully."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Subscription claim deleted successfully."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Subscription claim updated successfully."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Subscription Claims"
+msgstr ""
 
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/general/verify-email-banner.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
@@ -5378,6 +6082,15 @@ msgstr "Suscripciones"
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 msgid "Success"
 msgstr "Éxito"
 
@@ -5401,8 +6114,9 @@ msgstr "Requisitos del Sistema"
 msgid "System Theme"
 msgstr "Tema del sistema"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table.tsx
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
 msgid "Team"
 msgstr "Equipo"
 
@@ -5411,9 +6125,18 @@ msgstr "Equipo"
 msgid "Team \"{0}\" has been deleted on Documenso"
 msgstr "El equipo \"{0}\" ha sido eliminado en Documenso"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Team checkout"
-msgstr "Checkout del equipo"
+#: packages/lib/constants/teams-translations.ts
+msgid "Team Admin"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Team Assignments"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Team Count"
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
@@ -5457,25 +6180,34 @@ msgstr "¡Correo del equipo verificado!"
 msgid "Team email was updated."
 msgstr "El correo del equipo ha sido actualizado."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "Team invitation"
-msgstr "Invitación del equipo"
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
+msgid "Team Groups"
+msgstr ""
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "Team invitations have been sent."
-msgstr "Las invitaciones al equipo han sido enviadas."
+#: packages/lib/constants/teams-translations.ts
+msgid "Team Manager"
+msgstr ""
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: packages/lib/constants/teams-translations.ts
 msgid "Team Member"
 msgstr "Miembro del equipo"
 
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+msgid "Team Members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Team members have been added."
+msgstr ""
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Team Name"
 msgstr "Nombre del equipo"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "Team not found"
 msgstr "Equipo no encontrado"
@@ -5488,27 +6220,17 @@ msgstr "Solo equipo"
 msgid "Team only templates are not linked anywhere and are visible only to your team."
 msgstr "Las plantillas solo para el equipo no están vinculadas en ningún lado y son visibles solo para tu equipo."
 
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transfer"
-msgstr "Transferencia de propiedad del equipo"
-
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transfer already completed!"
-msgstr "¡La transferencia de propiedad del equipo ya se ha completado!"
-
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transferred!"
-msgstr "¡Propiedad del equipo transferida!"
-
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Team Preferences"
 msgstr "Preferencias del equipo"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Team Public Profile"
-msgstr "Perfil público del equipo"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Team Role"
+msgstr ""
 
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 msgid "Team settings"
 msgstr "Configuraciones del equipo"
 
@@ -5516,44 +6238,37 @@ msgstr "Configuraciones del equipo"
 msgid "Team Settings"
 msgstr "Configuraciones del equipo"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Team templates"
-msgstr "Plantillas del equipo"
-
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "Team transfer in progress"
-msgstr "Transferencia de equipo en progreso"
-
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "Team transfer request expired"
-msgstr "Solicitud de transferencia del equipo expirada"
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Team url"
+msgstr ""
 
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Team URL"
 msgstr "URL del equipo"
 
-#: apps/remix/app/routes/_authenticated+/settings+/teams.tsx
-#: apps/remix/app/components/general/settings-nav-mobile.tsx
-#: apps/remix/app/components/general/settings-nav-desktop.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
-#: apps/remix/app/components/general/app-nav-mobile.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 msgid "Teams"
 msgstr "Equipos"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-msgid "Teams restricted"
-msgstr "Equipos restringidos"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Teams help you organise your work and collaborate with others. Create your first team to get started."
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Teams that this organisation group is currently assigned to"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Template"
 msgstr "Plantilla"
 
@@ -5586,14 +6301,9 @@ msgid "Template is using legacy field insertion"
 msgstr "La plantilla utiliza inserción de campos heredada"
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 msgid "Template moved"
 msgstr "Plantilla movida"
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Template not found or already associated with a team."
-msgstr "Plantilla no encontrada o ya asociada con un equipo."
-
 #: apps/remix/app/components/general/template/template-edit-form.tsx
 msgid "Template saved"
 msgstr "Plantilla guardada"
@@ -5606,10 +6316,10 @@ msgstr "Título de plantilla"
 msgid "Template updated successfully"
 msgstr "Plantilla actualizada con éxito"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -5641,6 +6351,10 @@ msgstr "Alineación de texto"
 msgid "Text Color"
 msgstr "Color de texto"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Thank you for completing the signing process."
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Thank you for using Documenso to perform your electronic document signing. The purpose of this disclosure is to inform you about the process, legality, and your rights regarding the use of electronic signatures on our platform. By opting to use an electronic signature, you are agreeing to the terms and conditions outlined below."
 msgstr "Gracias por usar Documenso para realizar su firma electrónica de documentos. El propósito de esta divulgación es informarle sobre el proceso, la legalidad y sus derechos con respecto al uso de firmas electrónicas en nuestra plataforma. Al optar por usar una firma electrónica, usted está aceptando los términos y condiciones descritos a continuación."
@@ -5662,16 +6376,16 @@ msgid "The account has been enabled successfully."
 msgstr "La cuenta ha sido habilitada exitosamente."
 
 #: packages/ui/components/recipient/recipient-action-auth-select.tsx
-msgid "The authentication required for recipients to sign fields"
-msgstr "La autenticación requerida para que los destinatarios firmen campos"
+msgid "The authentication methods required for recipients to sign fields"
+msgstr ""
 
 #: packages/ui/components/document/document-global-auth-action-select.tsx
-msgid "The authentication required for recipients to sign the signature field."
-msgstr "La autenticación requerida para que los destinatarios firmen el campo de firma."
+msgid "The authentication methods required for recipients to sign the signature field."
+msgstr ""
 
 #: packages/ui/components/document/document-global-auth-access-select.tsx
-msgid "The authentication required for recipients to view the document."
-msgstr "La autenticación requerida para que los destinatarios vean el documento."
+msgid "The authentication methods required for recipients to view the document."
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "The content to show in the banner, HTML is allowed"
@@ -5687,10 +6401,6 @@ msgstr "El enlace directo ha sido copiado a tu portapapeles"
 msgid "The document has been moved successfully."
 msgstr "El documento se ha movido exitosamente."
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "The document has been successfully moved to the selected team."
-msgstr "El documento ha sido movido con éxito al equipo seleccionado."
-
 #: apps/remix/app/components/embed/authoring/configure-document-upload.tsx
 msgid "The document is already saved and cannot be changed."
 msgstr "El documento ya está guardado y no se puede cambiar."
@@ -5760,17 +6470,30 @@ msgid "The following errors occurred:"
 msgstr "Se produjeron los siguientes errores:"
 
 #: packages/email/templates/team-delete.tsx
-msgid "The following team has been deleted by its owner. You will no longer be able to access this team and its documents"
-msgstr "El siguiente equipo ha sido eliminado por su propietario. Ya no podrás acceder a este equipo y sus documentos"
+msgid "The following team has been deleted. You will no longer be able to access this team and its documents"
+msgstr ""
 
-#: packages/email/templates/team-delete.tsx
-msgid "The following team has been deleted by you"
-msgstr "El siguiente equipo ha sido eliminado por ti"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid ""
+"The organisation group you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "The ownership of team <0>{0}</0> has been successfully transferred to you."
-msgstr "La propiedad del equipo <0>{0}</0> ha sido transferida con éxito a ti."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "The organisation role that will be applied to all members in this group."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid ""
+"The organisation you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid ""
+"The organisation you are looking for may have been removed, renamed or may have never\n"
+"                  existed."
+msgstr ""
 
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "The page you are looking for was moved, removed, renamed or might never have existed."
@@ -5820,10 +6543,6 @@ msgstr "El destinatario debe firmar el documento para que se complete."
 msgid "The recipient is required to view the document for it to be completed."
 msgstr "El destinatario debe ver el documento para que se complete."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "The selected team member will receive an email which they must accept before the team is transferred"
-msgstr "El miembro del equipo seleccionado recibirá un correo electrónico que debe aceptar antes de que se transfiera el equipo"
-
 #: packages/ui/components/document/document-share-button.tsx
 msgid "The sharing link could not be created at this time. Please try again."
 msgstr "El enlace de compartición no se pudo crear en este momento. Por favor, inténtelo de nuevo."
@@ -5855,14 +6574,11 @@ msgstr "El banner del sitio es un mensaje que se muestra en la parte superior de
 msgid "The team email <0>{teamEmail}</0> has been removed from the following team"
 msgstr "El correo electrónico del equipo <0>{teamEmail}</0> ha sido eliminado del siguiente equipo"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "The team transfer invitation has been successfully deleted."
-msgstr "La invitación para la transferencia de equipo ha sido eliminada con éxito."
-
-#. placeholder {0}: transferVerification.name
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "The team transfer request to <0>{0}</0> has expired."
-msgstr "La solicitud de transferencia de equipo a <0>{0}</0> ha expirado."
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid ""
+"The team you are looking for may have been removed, renamed or may have never\n"
+"                  existed."
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "The team you are looking for may have been removed, renamed or may have never\n"
@@ -5874,10 +6590,6 @@ msgstr "El equipo que buscas puede haber sido eliminado, renombrado o quizás nu
 msgid "The template has been moved successfully."
 msgstr "La plantilla se ha movido exitosamente."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "The template has been successfully moved to the selected team."
-msgstr "La plantilla ha sido movida con éxito al equipo seleccionado."
-
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "The template will be removed from your profile"
 msgstr "La plantilla será eliminada de tu perfil"
@@ -5903,17 +6615,21 @@ msgid "The types of signatures that recipients are allowed to use when signing t
 msgstr "Los tipos de firmas que los destinatarios pueden usar al firmar el documento."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "The URL for Documenso to send webhook events to."
 msgstr "La URL para Documenso para enviar eventos de webhook."
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid ""
+"The user you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 msgid "The webhook has been successfully deleted."
 msgstr "El webhook ha sido eliminado con éxito."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "The webhook has been updated successfully."
 msgstr "El webhook ha sido actualizado con éxito."
 
@@ -5933,6 +6649,14 @@ msgstr "Aún no hay documentos completados. Los documentos que hayas creado o re
 msgid "There was an error uploading your file. Please try again."
 msgstr "Hubo un error al cargar tu archivo. Por favor, intenta de nuevo."
 
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "These can be overriden by setting the authentication requirements directly on each recipient in the next step. Multiple methods can be selected."
+msgstr ""
+
+#: packages/ui/components/recipient/recipient-action-auth-select.tsx
+msgid "These will override any global settings. Multiple methods can be selected."
+msgstr ""
+
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 msgid "They have permission on your behalf to:"
 msgstr "Tienen permiso en tu nombre para:"
@@ -5955,9 +6679,9 @@ msgstr "Esta acción no es reversible. Por favor, asegúrate."
 msgid "This action is reversible, but please be careful as the account may be affected permanently (e.g. their settings and contents not being restored properly)."
 msgstr "Esta acción es reversible, pero ten cuidado ya que la cuenta podría verse afectada permanentemente (por ejemplo, su configuración y contenidos podrían no restaurarse correctamente)."
 
-#: packages/ui/components/document/document-global-auth-action-select.tsx
-msgid "This can be overriden by setting the authentication requirements directly on each recipient in the next step."
-msgstr "Esto se puede anular configurando los requisitos de autenticación directamente en cada destinatario en el siguiente paso."
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "This claim is locked and cannot be deleted."
+msgstr ""
 
 #: packages/email/template-components/template-document-super-delete.tsx
 msgid "This document can not be recovered, if you would like to dispute the reason for future documents please contact support."
@@ -5991,13 +6715,11 @@ msgstr "Este documento ha sido cancelado por el propietario y ya no está dispon
 msgid "This document has been cancelled by the owner."
 msgstr "Este documento ha sido cancelado por el propietario."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document has been rejected by a recipient"
 msgstr "Este documento ha sido rechazado por un destinatario"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document has been signed by all recipients"
 msgstr "Este documento ha sido firmado por todos los destinatarios"
 
@@ -6005,8 +6727,7 @@ msgstr "Este documento ha sido firmado por todos los destinatarios"
 msgid "This document is available in your Documenso account. You can view more details, recipients, and audit logs there."
 msgstr "Este documento está disponible en tu cuenta de Documenso. Puedes ver más detalles, destinatarios y registros de auditoría allí."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document is currently a draft and has not been sent"
 msgstr "Este documento es actualmente un borrador y no ha sido enviado"
 
@@ -6063,14 +6784,22 @@ msgstr "Este nombre de carpeta ya está en uso."
 msgid "This is how the document will reach the recipients once the document is ready for signing."
 msgstr "Así es como el documento llegará a los destinatarios una vez que esté listo para firmarse."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "This is the claim that this organisation was initially created with. Any feature flag changes to this claim will be backported into this organisation."
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "This link is invalid or has expired. Please contact your team to resend a transfer request."
-msgstr "Este enlace es inválido o ha expirado. Por favor, contacta a tu equipo para reenviar una solicitud de transferencia."
+msgid "This link is invalid or has expired."
+msgstr ""
 
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "This link is invalid or has expired. Please contact your team to resend a verification."
 msgstr "Este enlace es inválido o ha expirado. Por favor, contacta a tu equipo para reenviar una verificación."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "This organisation, and any associated data will be permanently deleted."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "This passkey has already been registered."
 msgstr "Esta clave de acceso ya ha sido registrada."
@@ -6079,10 +6808,6 @@ msgstr "Esta clave de acceso ya ha sido registrada."
 msgid "This passkey is not configured for this application. Please login and add one in the user settings."
 msgstr "Esta clave de acceso no está configurada para esta aplicación. Por favor, inicia sesión y añade una en la configuración del usuario."
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "This price includes minimum 5 seats."
-msgstr "Este precio incluye un mínimo de 5 asientos."
-
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "This recipient can no longer be modified as they have signed a field, or completed the document."
 msgstr "Este destinatario ya no puede ser modificado ya que ha firmado un campo o completado el documento."
@@ -6107,23 +6832,20 @@ msgstr "Esta plantilla no se pudo eliminar en este momento. Por favor, inténtal
 msgid "This template is using legacy field insertion, we recommend using the new field insertion method for more accurate results."
 msgstr "Esta plantilla utiliza inserción de campos heredada, recomendamos usar el nuevo método para resultados más precisos."
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "This token is invalid or has expired. No action is needed."
 msgstr "Este token es inválido o ha expirado. No se necesita ninguna acción."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "This token is invalid or has expired. Please contact your team for a new invitation."
 msgstr "Este token es inválido o ha expirado. Por favor, contacta a tu equipo para una nueva invitación."
 
 #: apps/remix/app/components/forms/team-update-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "This URL is already in use."
 msgstr "Esta URL ya está en uso."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "This username has already been taken"
-msgstr "Este nombre de usuario ya ha sido tomado"
-
 #: packages/ui/components/document/document-email-checkboxes.tsx
 msgid "This will be sent to all recipients if a pending document has been deleted."
 msgstr "Esto se enviará a todos los destinatarios si un documento pendiente ha sido eliminado."
@@ -6136,17 +6858,16 @@ msgstr "Esto se enviará a todos los destinatarios una vez que el documento est
 msgid "This will be sent to the document owner once the document has been fully completed."
 msgstr "Esto se enviará al propietario del documento una vez que el documento se haya completado por completo."
 
-#: packages/ui/components/recipient/recipient-action-auth-select.tsx
-msgid "This will override any global settings."
-msgstr "Esto anulará cualquier configuración global."
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "This will ONLY backport feature flags which are set to true, anything disabled in the initial claim will not be backported"
+msgstr ""
 
 #: apps/remix/app/components/tables/internal-audit-log-table.tsx
 #: apps/remix/app/components/tables/document-logs-table.tsx
 msgid "Time"
 msgstr "Hora"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Time zone"
 msgstr "Zona horaria"
 
@@ -6159,6 +6880,7 @@ msgstr "Zona horaria"
 
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 #: apps/remix/app/components/tables/templates-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-view.tsx
@@ -6170,7 +6892,7 @@ msgstr "Título"
 msgid "Title cannot be empty"
 msgstr "El título no puede estar vacío"
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "To accept this invitation you must create an account."
 msgstr "Para aceptar esta invitación debes crear una cuenta."
 
@@ -6191,10 +6913,6 @@ msgstr "Para confirmar, por favor ingresa la dirección de correo electrónico d
 msgid "To confirm, please enter the reason"
 msgstr "Para confirmar, por favor ingresa la razón"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "To decline this invitation you must create an account."
-msgstr "Para rechazar esta invitación debes crear una cuenta."
-
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "To enable two-factor authentication, scan the following QR code using your authenticator app."
 msgstr "Para habilitar la autenticación de dos factores, escanea el siguiente código QR usando tu aplicación de autenticador."
@@ -6223,11 +6941,11 @@ msgstr "Para usar nuestro servicio de firma electrónica, debe tener acceso a:"
 msgid "To view this document you need to be signed into your account, please sign in to continue."
 msgstr "Para ver este documento debes iniciar sesión en tu cuenta, por favor inicia sesión para continuar."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Toggle the switch to hide your profile from the public."
 msgstr "Activa el interruptor para ocultar tu perfil del público."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Toggle the switch to show your profile to the public."
 msgstr "Activa el interruptor para mostrar tu perfil al público."
 
@@ -6247,7 +6965,7 @@ msgstr "Token creado"
 msgid "Token deleted"
 msgstr "Token eliminado"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Token doesn't have an expiration date"
 msgstr "El token no tiene una fecha de expiración"
 
@@ -6283,26 +7001,7 @@ msgstr "Total de firmantes que se registraron"
 msgid "Total Users"
 msgstr "Total de usuarios"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "transfer {teamName}"
-msgstr "transferir {teamName}"
-
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Transfer ownership of this team to a selected team member."
-msgstr "Transferir la propiedad de este equipo a un miembro del equipo seleccionado."
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Transfer team"
-msgstr "Transferir equipo"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-msgid "Transfer the ownership of the team to another team member."
-msgstr "Transferir la propiedad del equipo a otro miembro del equipo."
-
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Triggers"
 msgstr "Desencadenadores"
@@ -6369,11 +7068,11 @@ msgstr "No se pudo copiar el token"
 msgid "Unable to create direct template access. Please try again later."
 msgstr "No se pudo crear acceso directo a la plantilla. Por favor, inténtalo de nuevo más tarde."
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Unable to decline this team invitation at this time."
-msgstr "No se pudo rechazar esta invitación al equipo en este momento."
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Unable to decline this invitation at this time."
+msgstr ""
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Unable to delete invitation. Please try again."
 msgstr "No se pudo eliminar la invitación. Por favor, inténtalo de nuevo."
 
@@ -6385,9 +7084,9 @@ msgstr "No se pudo eliminar el equipo"
 msgid "Unable to disable two-factor authentication"
 msgstr "No se pudo desactivar la autenticación de dos factores"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Unable to join this team at this time."
-msgstr "No se pudo unirte a este equipo en este momento."
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Unable to join this organisation at this time."
+msgstr ""
 
 #: apps/remix/app/components/general/document/document-page-view-recent-activity.tsx
 #: apps/remix/app/components/general/document/document-history-sheet.tsx
@@ -6410,7 +7109,7 @@ msgstr "No se pudo eliminar la verificación de correo electrónico en este mome
 msgid "Unable to remove team email at this time. Please try again."
 msgstr "No se pudo eliminar el correo electrónico del equipo en este momento. Por favor, inténtalo de nuevo."
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Unable to resend invitation. Please try again."
 msgstr "No se pudo reenviar la invitación. Por favor, inténtalo de nuevo."
 
@@ -6432,7 +7131,10 @@ msgstr "No se pudo configurar la autenticación de dos factores"
 msgid "Unable to sign in"
 msgstr "No se pudo iniciar sesión"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 msgid "Unauthorized"
 msgstr "No autorizado"
@@ -6446,22 +7148,35 @@ msgstr "Incompleto"
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "Unpaid"
-msgstr "No pagado"
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "Unlimited"
+msgstr ""
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Unlimited documents, API and more"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Untitled Group"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Update"
@@ -6471,10 +7186,31 @@ msgstr "Actualizar"
 msgid "Update Banner"
 msgstr "Actualizar banner"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Update Billing"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Update Claim"
+msgstr ""
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Update current organisation"
+msgstr ""
+
 #: apps/remix/app/components/general/legacy-field-warning-popover.tsx
 msgid "Update Fields"
 msgstr "Actualizar Campos"
 
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Update organisation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "Update organisation member"
+msgstr ""
+
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "Update passkey"
 msgstr "Actualizar clave de acceso"
@@ -6493,10 +7229,16 @@ msgstr "Actualizar perfil"
 msgid "Update Recipient"
 msgstr "Actualizar destinatario"
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
 msgid "Update role"
 msgstr "Actualizar rol"
 
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Update Subscription Claim"
+msgstr ""
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 msgid "Update team"
 msgstr "Actualizar equipo"
@@ -6506,6 +7248,11 @@ msgstr "Actualizar equipo"
 msgid "Update team email"
 msgstr "Actualizar correo electrónico del equipo"
 
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "Update team group"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 msgid "Update team member"
@@ -6520,7 +7267,6 @@ msgid "Update user"
 msgstr "Actualizar usuario"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Update webhook"
 msgstr "Actualizar webhook"
 
@@ -6537,6 +7283,11 @@ msgstr "Actualizando Su Información"
 msgid "Upgrade"
 msgstr "Actualizar"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Upgrade <0>{0}</0> to {planName}"
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
 msgid "Upgrade your plan to upload more documents"
 msgstr "Actualiza tu plan para cargar más documentos"
@@ -6584,7 +7335,7 @@ msgstr "Subir firma"
 msgid "Upload Template Document"
 msgstr "Cargar Documento Plantilla"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Upload your brand logo (max 5MB, JPG, PNG, or WebP)"
 msgstr "Carga el logo de tu marca (máx 5MB, JPG, PNG o WebP)"
 
@@ -6609,8 +7360,7 @@ msgstr "El archivo subido no es un tipo de archivo permitido"
 msgid "Uploading document..."
 msgstr "Cargando documento..."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Use"
 msgstr "Usar"
 
@@ -6628,6 +7378,10 @@ msgstr "Usar Código de Respaldo"
 msgid "Use Template"
 msgstr "Usar Plantilla"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Use your passkey for authentication"
+msgstr ""
+
 #: apps/remix/app/components/tables/internal-audit-log-table.tsx
 #: apps/remix/app/components/tables/document-logs-table.tsx
 msgid "User"
@@ -6637,9 +7391,9 @@ msgstr "Usuario"
 msgid "User has no password."
 msgstr "El usuario no tiene contraseña."
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "User ID"
-msgstr "ID de Usuario"
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "User not found"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
@@ -6647,6 +7401,10 @@ msgstr "ID de Usuario"
 msgid "User not found."
 msgstr "Usuario no encontrado."
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "User Organisations"
+msgstr ""
+
 #: apps/remix/app/components/forms/signup.tsx
 msgid "User profiles are here!"
 msgstr "¡Los perfiles de usuario están aquí!"
@@ -6659,10 +7417,6 @@ msgstr "Configuraciones del usuario"
 msgid "User with this email already exists. Please use a different email address."
 msgstr "Un usuario con este correo electrónico ya existe. Por favor, use una dirección de correo diferente."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Username can only container alphanumeric characters and dashes."
-msgstr "El nombre de usuario solo puede contener caracteres alfanuméricos y guiones."
-
 #: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
 msgid "Users"
 msgstr "Usuarios"
@@ -6710,12 +7464,15 @@ msgstr "Verifica tu dirección de correo electrónico del equipo"
 msgid "Version History"
 msgstr "Historial de Versiones"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/document/document-page-view-button.tsx
 #: apps/remix/app/components/forms/2fa/view-recovery-codes-dialog.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "View"
 msgstr "Ver"
@@ -6765,7 +7522,7 @@ msgstr "Ver Documento"
 msgid "View documents associated with this email"
 msgstr "Ver documentos asociados con este correo electrónico"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "View invites"
 msgstr "Ver invitaciones"
 
@@ -6773,10 +7530,18 @@ msgstr "Ver invitaciones"
 msgid "View more"
 msgstr "Ver más"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "View next document"
+msgstr ""
+
 #: apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
 msgid "View Original Document"
 msgstr "Ver Documento Original"
 
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "View owner"
+msgstr ""
+
 #: packages/email/template-components/template-document-self-signed.tsx
 msgid "View plans"
 msgstr "Ver planes"
@@ -6792,6 +7557,7 @@ msgstr "Ver equipos"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "Viewed"
 msgstr "Visto"
@@ -6846,9 +7612,8 @@ msgstr "¿Quieres tu propio perfil público?"
 msgid "Warning: Assistant as last signer"
 msgstr "Advertencia: Asistente como último firmante"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "We are unable to proceed to the billing portal at this time. Please try again, or contact support."
 msgstr "No podemos proceder al portal de facturación en este momento. Por favor, inténtalo de nuevo o contacta con soporte."
 
@@ -6860,19 +7625,45 @@ msgstr "No podemos eliminar esta clave de acceso en este momento. Por favor, int
 msgid "We are unable to update this passkey at the moment. Please try again later."
 msgstr "No podemos actualizar esta clave de acceso en este momento. Por favor, inténtalo de nuevo más tarde."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "We couldn't create a Stripe customer. Please try again."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "We couldn't update the group. Please try again."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "We couldn't update the organisation. Please try again."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "We encountered an error while removing the direct template link. Please try again later."
 msgstr "Encontramos un error al eliminar el enlace directo de la plantilla. Por favor, inténtalo de nuevo más tarde."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "We encountered an error while updating the webhook. Please try again later."
 msgstr "Encontramos un error al actualizar el webhook. Por favor, inténtalo de nuevo más tarde."
 
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to add team members. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 msgid "We encountered an unknown error while attempting to add this email. Please try again later."
 msgstr "Encontramos un error desconocido al intentar añadir este correo electrónico. Por favor, inténtalo de nuevo más tarde."
 
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to create a group. Please try again later."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to create a organisation. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "We encountered an unknown error while attempting to create a team. Please try again later."
 msgstr "Encontramos un error desconocido al intentar crear un equipo. Por favor, inténtalo de nuevo más tarde."
@@ -6881,9 +7672,9 @@ msgstr "Encontramos un error desconocido al intentar crear un equipo. Por favor,
 msgid "We encountered an unknown error while attempting to delete it. Please try again later."
 msgstr "Encontramos un error desconocido al intentar eliminarlo. Por favor, inténtalo de nuevo más tarde."
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "We encountered an unknown error while attempting to delete the pending team. Please try again later."
-msgstr "Encontramos un error desconocido al intentar eliminar el equipo pendiente. Por favor, inténtalo de nuevo más tarde."
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "We encountered an unknown error while attempting to delete this organisation. Please try again later."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "We encountered an unknown error while attempting to delete this team. Please try again later."
@@ -6897,30 +7688,36 @@ msgstr "Encontramos un error desconocido al intentar eliminar este token. Por fa
 msgid "We encountered an unknown error while attempting to delete your account. Please try again later."
 msgstr "Encontramos un error desconocido al intentar eliminar tu cuenta. Por favor, inténtalo de nuevo más tarde."
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "We encountered an unknown error while attempting to invite team members. Please try again later."
-msgstr "Encontramos un error desconocido al intentar invitar a miembros del equipo. Por favor, inténtalo de nuevo más tarde."
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "We encountered an unknown error while attempting to disable access."
+msgstr ""
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "We encountered an unknown error while attempting to leave this team. Please try again later."
-msgstr "Encontramos un error desconocido al intentar salir de este equipo. Por favor, inténtalo de nuevo más tarde."
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "We encountered an unknown error while attempting to enable access."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "We encountered an unknown error while attempting to invite organisation members. Please try again later."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "We encountered an unknown error while attempting to leave this organisation. Please try again later."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "We encountered an unknown error while attempting to remove this group. Please try again later."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "We encountered an unknown error while attempting to remove this template from your profile. Please try again later."
 msgstr "Encontramos un error desconocido al intentar eliminar esta plantilla de tu perfil. Por favor, inténtalo de nuevo más tarde."
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "We encountered an unknown error while attempting to remove this transfer. Please try again or contact support."
-msgstr "Encontramos un error desconocido al intentar eliminar esta transferencia. Por favor, inténtalo de nuevo o contacta con soporte."
-
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
 msgid "We encountered an unknown error while attempting to remove this user. Please try again later."
 msgstr "Encontramos un error desconocido al intentar eliminar a este usuario. Por favor, inténtalo de nuevo más tarde."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "We encountered an unknown error while attempting to request a transfer of this team. Please try again later."
-msgstr "Encontramos un error desconocido al intentar solicitar una transferencia de este equipo. Por favor, inténtalo de nuevo más tarde."
-
 #: apps/remix/app/components/forms/reset-password.tsx
 msgid "We encountered an unknown error while attempting to reset your password. Please try again later."
 msgstr "Encontramos un error desconocido al intentar restablecer tu contraseña. Por favor, inténtalo de nuevo más tarde."
@@ -6947,10 +7744,19 @@ msgstr "Encontramos un error desconocido al intentar actualizar el banner. Por f
 msgid "We encountered an unknown error while attempting to update the template. Please try again later."
 msgstr "Encontramos un error desconocido al intentar actualizar la plantilla. Por favor, inténtalo de nuevo más tarde."
 
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "We encountered an unknown error while attempting to update this organisation member. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
 msgid "We encountered an unknown error while attempting to update this team member. Please try again later."
 msgstr "Encontramos un error desconocido al intentar actualizar a este miembro del equipo. Por favor, inténtalo de nuevo más tarde."
 
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "We encountered an unknown error while attempting to update your organisation. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/forms/password.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 msgid "We encountered an unknown error while attempting to update your password. Please try again later."
@@ -6976,10 +7782,6 @@ msgstr "Encontramos un error desconocido al intentar actualizar su perfil. Por f
 msgid "We have sent a confirmation email for verification."
 msgstr "Hemos enviado un correo electrónico de confirmación para la verificación."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "We need a username to create your profile"
-msgstr "Necesitamos un nombre de usuario para crear tu perfil"
-
 #: apps/remix/app/components/forms/signup.tsx
 msgid "We need your signature to sign documents"
 msgstr "Necesitamos su firma para firmar documentos"
@@ -6992,10 +7794,6 @@ msgstr "No pudimos copiar el token en tu portapapeles. Por favor, inténtalo de
 msgid "We were unable to copy your recovery code to your clipboard. Please try again."
 msgstr "No pudimos copiar tu código de recuperación en tu portapapeles. Por favor, inténtalo de nuevo."
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "We were unable to create a checkout session. Please try again, or contact support"
-msgstr "No pudimos crear una sesión de pago. Por favor, inténtalo de nuevo o contacta con soporte"
-
 #: apps/remix/app/components/forms/signup.tsx
 msgid "We were unable to create your account. Please review the information you provided and try again."
 msgstr "No pudimos crear su cuenta. Revise la información que proporcionó e inténtelo de nuevo."
@@ -7010,7 +7808,7 @@ msgstr "No pudimos desactivar la autenticación de dos factores para tu cuenta.
 msgid "We were unable to log you out at this time."
 msgstr "No pudimos cerrar sesión en este momento."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "We were unable to set your public profile to public. Please try again."
 msgstr "No pudimos configurar tu perfil público como público. Por favor, inténtalo de nuevo."
 
@@ -7025,14 +7823,17 @@ msgstr "No pudimos configurar la autenticación de dos factores para tu cuenta.
 msgid "We were unable to submit this document at this time. Please try again later."
 msgstr "No pudimos enviar este documento en este momento. Por favor, inténtalo de nuevo más tarde."
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "We were unable to update your branding preferences at this time, please try again later"
 msgstr "No pudimos actualizar tus preferencias de marca en este momento, por favor intenta de nuevo más tarde"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "We were unable to update your document preferences at this time, please try again later"
 msgstr "No pudimos actualizar tus preferencias de documento en este momento, por favor intenta de nuevo más tarde"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 msgid "We were unable to verify your details. Please try again or contact support"
 msgstr "No pudimos verificar tus datos. Por favor, inténtalo de nuevo o contacta con soporte"
@@ -7058,8 +7859,8 @@ msgstr "Generaremos enlaces de firma para ti, que podrás enviar a los destinata
 msgid "We won't send anything to notify recipients."
 msgstr "No enviaremos nada para notificar a los destinatarios."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "We're all empty"
 msgstr "No hay nada aquí"
@@ -7085,17 +7886,14 @@ msgid "Webhook deleted"
 msgstr "Webhook eliminado"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Webhook updated"
 msgstr "Webhook actualizado"
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Webhook URL"
 msgstr "URL del Webhook"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -7103,10 +7901,6 @@ msgstr "URL del Webhook"
 msgid "Webhooks"
 msgstr "Webhooks"
 
-#: apps/remix/app/components/general/billing-plans.tsx
-msgid "Weekly"
-msgstr "Semanal"
-
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Welcome"
 msgstr "Bienvenido"
@@ -7115,6 +7909,10 @@ msgstr "Bienvenido"
 msgid "Welcome back, we are lucky to have you."
 msgstr "Bienvenido de nuevo, somos afortunados de tenerte."
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Welcome back! Here's an overview of your account."
+msgstr ""
+
 #: packages/email/template-components/template-confirmation-email.tsx
 msgid "Welcome to Documenso!"
 msgstr "¡Bienvenido a Documenso!"
@@ -7123,6 +7921,10 @@ msgstr "¡Bienvenido a Documenso!"
 msgid "Were you trying to edit this document instead?"
 msgstr "¿Estabas intentando editar este documento en su lugar?"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "What you can do with teams:"
+msgstr ""
+
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
 #: packages/ui/primitives/document-flow/add-signers.tsx
@@ -7145,6 +7947,10 @@ msgstr "Cuando utilice nuestra plataforma para colocar su firma electrónica en
 msgid "While waiting for them to do so you can create your own Documenso account and get started with document signing right away."
 msgstr "Mientras esperas a que ellos lo hagan, puedes crear tu propia cuenta de Documenso y comenzar a firmar documentos de inmediato."
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Whitelabeling, unlimited members and more"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 msgid "Who do you want to remind?"
 msgstr "¿A quién deseas recordar?"
@@ -7154,18 +7960,19 @@ msgid "Withdrawing Consent"
 msgstr "Retirar Consentimiento"
 
 #: apps/remix/app/components/forms/public-profile-form.tsx
-msgid "Write about the team"
-msgstr "Escribe sobre el equipo"
+msgid "Write a description to display on your public profile"
+msgstr ""
 
-#: apps/remix/app/components/forms/public-profile-form.tsx
-msgid "Write about yourself"
-msgstr "Escribe sobre ti mismo"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Yearly"
 msgstr "Anual"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Yes"
+msgstr ""
+
 #: apps/remix/app/components/general/template/template-page-view-information.tsx
 #: apps/remix/app/components/general/document/document-page-view-information.tsx
 #: packages/lib/utils/document-audit-logs.ts
@@ -7176,17 +7983,42 @@ msgstr "Tú"
 msgid "You are about to delete <0>\"{documentTitle}\"</0>"
 msgstr "Estás a punto de eliminar <0>\"{documentTitle}\"</0>"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "You are about to delete <0>{0}</0>. All data related to this organisation such as teams, documents, and all other resources will be deleted. This action is irreversible."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 msgid "You are about to delete the following team email from <0>{teamName}</0>."
 msgstr "Estás a punto de eliminar el siguiente correo electrónico del equipo de <0>{teamName}</0>."
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "You are about to give all organisation members access to this team under their organisation role."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "You are about to hide <0>\"{documentTitle}\"</0>"
 msgstr "Estás a punto de ocultar <0>\"{documentTitle}\"</0>"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "You are about to leave the following team."
-msgstr "Estás a punto de salir del siguiente equipo."
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "You are about to leave the following organisation."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "You are about to remove default access to this team for all organisation members. Any members not explicitly added to this team will no longer have access."
+msgstr ""
+
+#. placeholder {0}: team.name
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "You are about to remove the following group from <0>{0}</0>."
+msgstr ""
+
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "You are about to remove the following user from <0>{0}</0>."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "You are about to remove the following user from <0>{teamName}</0>."
@@ -7202,21 +8034,38 @@ msgstr "Estás a punto de revocar el acceso para el equipo <0>{0}</0> ({1}) para
 msgid "You are about to send this document to the recipients. Are you sure you want to continue?"
 msgstr "Está a punto de enviar este documento a los destinatarios. ¿Está seguro de que desea continuar?"
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "You are about to subscribe to the {planName}"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
 msgid "You are currently on the <0>Free Plan</0>."
 msgstr "Actualmente estás en el <0>Plan Gratuito</0>."
 
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-msgid "You are currently updating <0>{teamMemberName}.</0>"
-msgstr "Actualmente estás actualizando <0>{teamMemberName}.</0>"
+msgid "You are currently updating <0>{memberName}.</0>"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You are currently updating <0>{organisationMemberName}.</0>"
+msgstr ""
 
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "You are currently updating the <0>{passkeyName}</0> passkey."
 msgstr "Actualmente estás actualizando la clave <0>{passkeyName}</0>."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "You are not a member of this team."
-msgstr "No eres miembro de este equipo."
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You are currently updating the <0>{teamGroupName}</0> team group."
+msgstr ""
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "You are currently updating your \"Personal\" organisation to a plan where you can add multiple members. These members may have access to the documents, templates and other data in this organisation, including documents sent to you."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+msgid "You are not authorized to access this page."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx
 msgid "You are not authorized to delete this user."
@@ -7234,18 +8083,18 @@ msgstr "No estás autorizado para habilitar a este usuario."
 msgid "You can also copy and paste this link into your browser: {confirmationLink} (link expires in 1 hour)"
 msgstr "También puedes copiar y pegar este enlace en tu navegador: {confirmationLink} (el enlace expira en 1 hora)"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You can choose to enable or disable your profile for public view."
-msgstr "Puedes elegir habilitar o deshabilitar tu perfil para la vista pública."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You can choose to enable or disable your team profile for public view."
-msgstr "Puedes elegir habilitar o deshabilitar el perfil de tu equipo para la vista pública."
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
+msgid "You can choose to enable or disable the profile for public view."
+msgstr ""
 
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 msgid "You can copy and share these links to recipients so they can action the document."
 msgstr "Puede copiar y compartir estos enlaces con los destinatarios para que puedan gestionar el documento."
 
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "You can enable access to allow all organisation members to access this team by default."
+msgstr ""
+
 #: packages/email/templates/confirm-team-email.tsx
 msgid "You can revoke access at any time in your team settings on Documenso <0>here.</0>"
 msgstr "Puedes revocar el acceso en cualquier momento en la configuración de tu equipo en Documenso <0>aquí.</0>"
@@ -7275,14 +8124,30 @@ msgstr "Puede ver el documento y su estado haciendo clic en el botón de abajo."
 msgid "You cannot add assistants when signing order is disabled."
 msgstr "No puedes añadir asistentes cuando el orden de firma está deshabilitado."
 
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "You cannot delete a group which has a higher role than you."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "You cannot have more than {MAXIMUM_PASSKEYS} passkeys."
 msgstr "No puedes tener más de {MAXIMUM_PASSKEYS} claves de acceso."
 
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You cannot modify a group which has a higher role than you."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You cannot modify a organisation member who has a higher role than you."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 msgid "You cannot modify a team member who has a higher role than you."
 msgstr "No puedes modificar a un miembro del equipo que tenga un rol más alto que tú."
 
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+msgid "You cannot remove members from this team if the inherit member feature is enabled."
+msgstr ""
+
 #: packages/ui/primitives/document-upload.tsx
 #: packages/ui/primitives/document-dropzone.tsx
 msgid "You cannot upload documents at this time."
@@ -7293,9 +8158,13 @@ msgstr "No puede cargar documentos en este momento."
 msgid "You cannot upload encrypted PDFs"
 msgstr "No puedes subir PDFs encriptados"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-msgid "You do not currently have a customer record, this should not happen. Please contact support for assistance."
-msgstr "Actualmente no tienes un registro de cliente, esto no debería suceder. Por favor contacta a soporte para obtener asistencia."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "You currently have an inactive <0>{currentProductName}</0> subscription"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "You currently have no access to any teams within this organisation. Please contact your organisation to request access."
+msgstr ""
 
 #: apps/remix/app/components/forms/token.tsx
 msgid "You do not have permission to create a token for this team"
@@ -7305,50 +8174,43 @@ msgstr "No tiene permiso para crear un token para este equipo"
 msgid "You don't need to sign it anymore."
 msgstr "Ya no necesitas firmarlo."
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-msgid "You have accepted an invitation from <0>{0}</0> to join their team."
-msgstr "Has aceptado una invitación de <0>{0}</0> para unirte a su equipo."
-
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "You have already completed the ownership transfer for <0>{0}</0>."
-msgstr "Ya has completado la transferencia de propiedad para <0>{0}</0>."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "You have accepted an invitation from <0>{0}</0> to join their organisation."
+msgstr ""
 
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "You have already verified your email address for <0>{0}</0>."
 msgstr "Ya has verificado tu dirección de correo electrónico para <0>{0}</0>."
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "You have been invited by <0>{0}</0> to join their team."
-msgstr "Has sido invitado por <0>{0}</0> para unirte a su equipo."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "You have been invited by <0>{0}</0> to join their organisation."
+msgstr ""
 
-#. placeholder {0}: team.name
-#: packages/lib/server-only/team/create-team-member-invites.ts
+#. placeholder {0}: organisation.name
+#: packages/lib/server-only/organisation/create-organisation-member-invites.ts
 msgid "You have been invited to join {0} on Documenso"
 msgstr "Te han invitado a unirte a {0} en Documenso"
 
-#: packages/email/templates/team-invite.tsx
-msgid "You have been invited to join the following team"
-msgstr "Te han invitado a unirte al siguiente equipo"
+#: packages/email/templates/organisation-invite.tsx
+msgid "You have been invited to join the following organisation"
+msgstr ""
 
 #: packages/lib/server-only/recipient/set-document-recipients.ts
 #: packages/lib/server-only/recipient/delete-document-recipient.ts
 msgid "You have been removed from a document"
 msgstr "Te han eliminado de un documento"
 
-#. placeholder {0}: team.name
-#: packages/lib/server-only/team/request-team-ownership-transfer.ts
-msgid "You have been requested to take ownership of team {0} on Documenso"
-msgstr "Se te ha solicitado asumir la propiedad del equipo {0} en Documenso"
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "You have been requested to sign the following documents. Review each document carefully and complete the signing process."
+msgstr ""
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "You have declined the invitation from <0>{0}</0> to join their team."
-msgstr "Has rechazado la invitación de <0>{0}</0> para unirte a su equipo."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
+msgid "You have declined the invitation from <0>{0}</0> to join their organisation."
+msgstr ""
 
 #. placeholder {0}: `"${document.title}"`
 #: packages/lib/server-only/document/resend-document.tsx
@@ -7357,12 +8219,11 @@ msgid "You have initiated the document {0} that requires you to {recipientAction
 msgstr "Has iniciado el documento {0} que requiere que {recipientActionVerb}."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "You have no webhooks yet. Your webhooks will be shown here once you create them."
 msgstr "Aún no tienes webhooks. Tus webhooks se mostrarán aquí una vez que los crees."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
 msgid "You have not yet created any templates. To create a template please upload one."
 msgstr "Aún no has creado plantillas. Para crear una plantilla, por favor carga una."
 
@@ -7375,6 +8236,10 @@ msgstr "Aún no has creado ni recibido documentos. Para crear un documento, por
 msgid "You have reached the maximum limit of {0} direct templates. <0>Upgrade your account to continue!</0>"
 msgstr "Has alcanzado el límite máximo de {0} plantillas directas. <0>¡Actualiza tu cuenta para continuar!</0>"
 
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
+msgid "You have reached the maximum number of teams for your plan. Please contact sales at <0>support@documenso.com</0> if you would like to adjust your plan."
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-upload.tsx
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
 msgid "You have reached your document limit for this month. Please upgrade your plan."
@@ -7402,15 +8267,27 @@ msgstr "You have rejected this document"
 msgid "You have signed “{documentName}”"
 msgstr "Has firmado “{documentName}”"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "You have successfully left this team."
-msgstr "Has salido de este equipo con éxito."
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "You have successfully left this organisation."
+msgstr ""
 
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/signup.tsx
 msgid "You have successfully registered. Please verify your account by clicking on the link you received in the email."
 msgstr "Te has registrado con éxito. Por favor verifica tu cuenta haciendo clic en el enlace que recibiste en el correo electrónico."
 
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "You have successfully removed this group from the organisation."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "You have successfully removed this group from the team."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "You have successfully removed this user from the organisation."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "You have successfully removed this user from the team."
 msgstr "Has eliminado a este usuario del equipo con éxito."
@@ -7424,38 +8301,35 @@ msgid "You have the right to withdraw your consent to use electronic signatures
 msgstr "Usted tiene el derecho de retirar su consentimiento para usar firmas electrónicas en cualquier momento antes de completar el proceso de firma. Para retirar su consentimiento, comuníquese con el remitente del documento. Si no se comunica con el remitente, puede comunicarse con <0>{SUPPORT_EMAIL}</0> para obtener asistencia. Tenga en cuenta que retirar el consentimiento puede retrasar o detener la finalización de la transacción o servicio relacionado."
 
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-msgid "You have updated {teamMemberName}."
-msgstr "Has actualizado a {teamMemberName}."
+msgid "You have updated {memberName}."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You have updated {organisationMemberName}."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You have updated the team group."
+msgstr ""
 
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "You have verified your email address for <0>{0}</0>."
 msgstr "Has verificado tu dirección de correo electrónico para <0>{0}</0>."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "You must be an admin of this team to manage billing."
-msgstr "Debes ser un administrador de este equipo para gestionar la facturación."
-
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 msgid "You must enter '{deleteMessage}' to proceed"
 msgstr "Debes ingresar '{deleteMessage}' para continuar"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "You must have at least one other team member to transfer ownership."
-msgstr "Debes tener al menos otro miembro del equipo para transferir la propiedad."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You must set a profile URL before enabling your public profile."
-msgstr "Debes establecer una URL de perfil antes de habilitar tu perfil público."
-
 #: apps/remix/app/components/dialogs/template-folder-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/folder-delete-dialog.tsx
 msgid "You must type '{deleteMessage}' to confirm"
 msgstr "Debes escribir '{deleteMessage}' para confirmar"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "You need to be an admin to manage API tokens."
 msgstr "Necesitas ser administrador para gestionar tokens de API."
 
@@ -7471,9 +8345,9 @@ msgstr "Debes iniciar sesión para ver esta página."
 msgid "You need to setup 2FA to mark this document as viewed."
 msgstr "Debes configurar 2FA para marcar este documento como visto."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "You will get notified & be able to set up your documenso public profile when we launch the feature."
-msgstr "Recibirás una notificación y podrás configurar tu perfil público de Documenso cuando lanzemos la función."
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "You will need to configure any claims or subscription after creating this organisation"
+msgstr ""
 
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "You will now be required to enter a code from your authenticator app when signing in."
@@ -7495,11 +8369,12 @@ msgstr "Tu avatar ha sido actualizado con éxito."
 msgid "Your banner has been updated successfully."
 msgstr "Tu banner ha sido actualizado con éxito."
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Your brand website URL"
 msgstr "La URL de tu sitio web de marca"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Your branding preferences have been updated"
 msgstr "Tus preferencias de marca han sido actualizadas"
 
@@ -7511,9 +8386,17 @@ msgstr "Tu envío masivo ha sido iniciado. Recibirás una notificación por corr
 msgid "Your bulk send operation for template \"{templateName}\" has completed."
 msgstr "Tu operación de envío masivo para la plantilla \"{templateName}\" ha sido completada."
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
-msgid "Your current plan is past due. Please update your payment information."
-msgstr "Tu plan actual está vencido. Por favor actualiza tu información de pago."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current {currentProductName} plan is past due. Please update your payment information."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current plan is inactive."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current plan is past due."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Your direct signing templates"
@@ -7558,7 +8441,8 @@ msgstr "Tu documento ha sido subido con éxito."
 msgid "Your document has been uploaded successfully. You will be redirected to the template page."
 msgstr "Tu documento ha sido subido con éxito. Serás redirigido a la página de plantillas."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Your document preferences have been updated"
 msgstr "Tus preferencias de documento han sido actualizadas"
 
@@ -7580,7 +8464,7 @@ msgstr "¡Tu correo electrónico ha sido confirmado con éxito! Ahora puedes usa
 msgid "Your email is currently being used by team <0>{0}</0> ({1})."
 msgstr "Tu correo electrónico está siendo utilizado actualmente por el equipo <0>{0}</0> ({1})."
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Your existing tokens"
 msgstr "Tus tokens existentes"
 
@@ -7589,6 +8473,18 @@ msgstr "Tus tokens existentes"
 msgid "Your new password cannot be the same as your old password."
 msgstr "Tu nueva contraseña no puede ser la misma que tu antigua contraseña."
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Your organisation has been created."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "Your organisation has been successfully deleted."
+msgstr ""
+
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Your organisation has been successfully updated."
+msgstr ""
+
 #: apps/remix/app/components/forms/reset-password.tsx
 #: apps/remix/app/components/forms/password.tsx
 msgid "Your password has been updated successfully."
@@ -7598,10 +8494,18 @@ msgstr "Tu contraseña ha sido actualizada con éxito."
 msgid "Your password has been updated."
 msgstr "Tu contraseña ha sido actualizada."
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Your payment for teams is overdue. Please settle the payment to avoid any service disruptions."
 msgstr "Tu pago por equipos está vencido. Por favor, salda el pago para evitar interrupciones en el servicio."
 
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+msgid "Your personal organisation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Your plan does not support inviting members. Please upgrade or your plan or contact sales at <0>support@documenso.com</0> if you would like to discuss your options."
+msgstr ""
+
 #: apps/remix/app/components/forms/profile.tsx
 msgid "Your profile has been updated successfully."
 msgstr "Tu perfil ha sido actualizado con éxito."
@@ -7623,19 +8527,10 @@ msgstr "Tu código de recuperación ha sido copiado en tu portapapeles."
 msgid "Your recovery codes are listed below. Please store them in a safe place."
 msgstr "Tus códigos de recuperación se enumeran a continuación. Por favor, guárdalos en un lugar seguro."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Your subscription is currently active."
-msgstr "Tu suscripción está actualmente activa."
-
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Your team has been created."
 msgstr "Tu equipo ha sido creado."
 
-#: packages/email/templates/team-delete.tsx
-#: packages/email/templates/team-delete.tsx
-msgid "Your team has been deleted"
-msgstr "Tu equipo ha sido eliminado"
-
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Your team has been successfully deleted."
 msgstr "Tu equipo ha sido eliminado con éxito."
@@ -7672,7 +8567,7 @@ msgstr "¡Tu token ha expirado!"
 msgid "Your token was created successfully! Make sure to copy it because you won't be able to see it again!"
 msgstr "¡Tu token se creó con éxito! ¡Asegúrate de copiarlo porque no podrás verlo de nuevo!"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Your tokens will be shown here once you create them."
 msgstr "Tus tokens se mostrarán aquí una vez que los crees."
 
diff --git a/packages/lib/translations/fr/web.po b/packages/lib/translations/fr/web.po
index 5ebdf3525..f0436e3a6 100644
--- a/packages/lib/translations/fr/web.po
+++ b/packages/lib/translations/fr/web.po
@@ -22,19 +22,10 @@ msgstr ""
 msgid " Enable direct link signing"
 msgstr " Activer la signature de lien direct"
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
-msgid " The events that will trigger a webhook to be sent to your URL."
-msgstr " Les événements qui déclencheront l'envoi d'un webhook vers votre URL."
-
 #: apps/remix/app/components/embed/authoring/configure-document-upload.tsx
 msgid ".PDF documents accepted (max {APP_DOCUMENT_UPLOAD_SIZE_LIMIT}MB)"
 msgstr ".Des documents PDF acceptés (max {APP_DOCUMENT_UPLOAD_SIZE_LIMIT}Mo)"
 
-#. placeholder {0}: team.name
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-msgid "\"{0}\" has invited you to sign \"example document\"."
-msgstr "\"{0}\" vous a invité à signer \"example document\"."
-
 #. placeholder {0}: field.customText
 #. placeholder {1}: timezone || ''
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
@@ -57,10 +48,13 @@ msgstr "“{documentName}” a été signé par tous les signataires"
 msgid "\"{documentTitle}\" has been successfully deleted"
 msgstr "\"{documentTitle}\" a été supprimé avec succès"
 
-#. placeholder {0}: team.name
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-msgid "\"{placeholderEmail}\" on behalf of \"{0}\" has invited you to sign \"example document\"."
-msgstr "\"{placeholderEmail}\" au nom de \"{0}\" vous a invité à signer \"exemple de document\"."
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "\"{placeholderEmail}\" on behalf of \"Team Name\" has invited you to sign \"example document\"."
+msgstr ""
+
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "\"Team Name\" has invited you to sign \"example document\"."
+msgstr ""
 
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
@@ -83,16 +77,16 @@ msgstr "{0, plural, one {# caractère au-dessus de la limite} other {# caractèr
 msgid "{0, plural, one {# recipient} other {# recipients}}"
 msgstr "{0, plural, one {# destinataire} other {# destinataires}}"
 
-#. placeholder {0}: row.original.quantity
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "{0, plural, one {# Seat} other {# Seats}}"
-msgstr "{0, plural, one {# siège} other {# sièges}}"
+#. placeholder {0}: org.teams.length
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "{0, plural, one {# team} other {# teams}}"
+msgstr ""
 
 #. placeholder {0}: data.length
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "{0, plural, one {<0>You have <1>1</1> pending team invitation</0>} other {<2>You have <3>#</3> pending team invitations</2>}}"
-msgstr "{0, plural, one {<0>Vous avez <1>1</1> invitation d'équipe en attente</0>} other {<2>Vous avez <3>#</3> invitations d'équipe en attente</2>}}"
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "{0, plural, one {<0>You have <1>1</1> pending invitation</0>} other {<2>You have <3>#</3> pending invitations</2>}}"
+msgstr ""
 
 #. placeholder {0}: autoSignableFields.filter((f) => f.type === fieldType).length
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
@@ -100,18 +94,18 @@ msgid "{0, plural, one {1 matching field} other {# matching fields}}"
 msgstr "{0, plural, one {1 champ correspondant} other {# champs correspondants}}"
 
 #. placeholder {0}: recipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
 msgid "{0, plural, one {1 Recipient} other {# Recipients}}"
 msgstr "{0, plural, one {1 Destinataire} other {# Destinataires}}"
 
 #. placeholder {0}: pendingRecipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "{0, plural, one {Waiting on 1 recipient} other {Waiting on # recipients}}"
 msgstr "{0, plural, one {En attente d'1 destinataire} other {En attente de # destinataires}}"
 
+#. placeholder {0}: route.label
 #. placeholder {0}: _(FRIENDLY_FIELD_TYPE[fieldType as FieldType])
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
 msgid "{0}"
 msgstr "{0}"
@@ -132,16 +126,6 @@ msgstr "{0} vous a invité à {recipientActionVerb} le document \"{1}\"."
 msgid "{0} invited you to {recipientActionVerb} a document"
 msgstr "{0} vous a invité à {recipientActionVerb} un document"
 
-#. placeholder {0}: memberName || memberEmail
-#: packages/email/templates/team-join.tsx
-msgid "{0} joined the team {teamName} on Documenso"
-msgstr "{0} a rejoint l'équipe {teamName} sur Documenso"
-
-#. placeholder {0}: memberName || memberEmail
-#: packages/email/templates/team-leave.tsx
-msgid "{0} left the team {teamName} on Documenso"
-msgstr "{0} a quitté l'équipe {teamName} sur Documenso"
-
 #. placeholder {0}: remaining.documents
 #. placeholder {1}: quota.documents
 #: apps/remix/app/components/general/document/document-upload.tsx
@@ -163,11 +147,15 @@ msgid "{0} on behalf of \"{1}\" has invited you to {recipientActionVerb} the doc
 msgstr "{0} représentant \"{1}\" vous a invité à {recipientActionVerb} le document \"{2}\"."
 
 #. placeholder {0}: recipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "{0} Recipient(s)"
 msgstr "{0} Destinataire(s)"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "{0} Teams"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 msgid "{charactersRemaining, plural, one {1 character remaining} other {{charactersRemaining} characters remaining}}"
 msgstr "{charactersRemaining, plural, one {1 caractère restant} other {{charactersRemaining} caractères restants}}"
@@ -220,18 +208,6 @@ msgstr "{inviterName} représentant \"{teamName}\" vous a invité à {0}<0/>\"{d
 msgid "{inviterName} on behalf of \"{teamName}\" has invited you to {action} {documentName}"
 msgstr "{inviterName} représentant \"{teamName}\" vous a invité à {action} {documentName}"
 
-#: packages/email/templates/team-join.tsx
-msgid "{memberEmail} joined the following team"
-msgstr "{memberEmail} a rejoint l'équipe suivante"
-
-#: packages/email/templates/team-leave.tsx
-msgid "{memberEmail} left the following team"
-msgstr "{memberEmail} a quitté l'équipe suivante"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "{numberOfSeats, plural, one {# member} other {# members}}"
-msgstr "{numberOfSeats, plural, one {# membre} other {# membres}}"
-
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} added a field"
 msgstr "{prefix} a ajouté un champ"
@@ -377,10 +353,6 @@ msgstr "{teamName} vous a invité à {0}<0/>\"{documentName}\""
 msgid "{teamName} has invited you to {action} {documentName}"
 msgstr "{teamName} vous a invité à {action} {documentName}"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "{teamName} ownership transfer request"
-msgstr "Demande de transfert de propriété de {teamName}"
-
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{userName} approved the document"
 msgstr "{userName} a approuvé le document"
@@ -414,10 +386,6 @@ msgstr "{visibleRows, plural, one {Affichage de # résultat.} other {Affichage d
 msgid "<0>\"{0}\"</0>is no longer available to sign"
 msgstr "<0>\"{0}\"</0> n'est plus disponible pour signer"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "<0>{senderName}</0> has requested that you take ownership of the following team"
-msgstr "<0>{senderName}</0> a demandé que vous preniez en charge l'équipe suivante"
-
 #: packages/email/templates/confirm-team-email.tsx
 msgid "<0>{teamName}</0> has requested to use your email address for their team on Documenso."
 msgstr "<0>{teamName}</0> a demandé à utiliser votre adresse e-mail pour leur équipe sur Documenso."
@@ -472,6 +440,10 @@ msgstr "<0>Nécessite un compte</0> - Le destinataire doit être connecté pour
 msgid "<0>Require passkey</0> - The recipient must have an account and passkey configured via their settings"
 msgstr "<0>Clé d'accès requise</0> - Le destinataire doit avoir un compte et une clé d'accès configurés via ses paramètres"
 
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "<0>Require password</0> - The recipient must have an account and password configured via their settings, the password will be verified during signing"
+msgstr ""
+
 #: apps/remix/app/components/tables/documents-table-sender-filter.tsx
 msgid "<0>Sender:</0> All"
 msgstr "<0>Expéditeur :</0> Tous"
@@ -497,6 +469,14 @@ msgstr "<0>Vous êtes sur le point de terminer la signature de \"<1>{documentTit
 msgid "<0>You are about to complete viewing \"<1>{documentTitle}</1>\".</0><2/> Are you sure?"
 msgstr "<0>Vous êtes sur le point de terminer la visualisation de \"<1>{documentTitle}</1>\".</0><2/> Êtes-vous sûr ?"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "0 Free organisations left"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "1 Free organisations left"
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "1 month"
 msgstr "1 mois"
@@ -505,22 +485,53 @@ msgstr "1 mois"
 msgid "12 months"
 msgstr "12 mois"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "2FA"
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "3 months"
 msgstr "3 mois"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+msgid "401 Unauthorized"
+msgstr ""
+
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "404 not found"
 msgstr "404 non trouvé"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "404 Organisation group not found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "404 Organisation not found"
+msgstr ""
+
 #: apps/remix/app/routes/_profile+/_layout.tsx
 msgid "404 Profile not found"
 msgstr "404 Profil non trouvé"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "404 Team not found"
 msgstr "404 Équipe non trouvée"
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "404 User not found"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "5 documents a month"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "5 Documents a month"
+msgstr ""
+
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "500 Internal Server Error"
 msgstr "500 Erreur Interne du Serveur"
@@ -565,9 +576,29 @@ msgstr "Un champ a été mis à jour"
 msgid "A means to print or download documents for your records"
 msgstr "Un moyen d'imprimer ou de télécharger des documents pour vos dossiers"
 
-#: packages/lib/jobs/definitions/emails/send-team-member-joined-email.handler.ts
-msgid "A new member has joined your team"
-msgstr "Un nouveau membre a rejoint votre équipe"
+#: packages/email/templates/organisation-join.tsx
+msgid "A member has joined your organisation on Documenso"
+msgstr ""
+
+#: packages/lib/jobs/definitions/emails/send-organisation-member-left-email.handler.ts
+msgid "A member has left your organisation"
+msgstr ""
+
+#: packages/email/templates/organisation-leave.tsx
+msgid "A member has left your organisation {organisationName}"
+msgstr ""
+
+#: packages/email/templates/organisation-leave.tsx
+msgid "A member has left your organisation on Documenso"
+msgstr ""
+
+#: packages/lib/jobs/definitions/emails/send-organisation-member-joined-email.handler.ts
+msgid "A new member has joined your organisation"
+msgstr ""
+
+#: packages/email/templates/organisation-join.tsx
+msgid "A new member has joined your organisation {organisationName}"
+msgstr ""
 
 #: apps/remix/app/components/forms/token.tsx
 msgid "A new token was created successfully."
@@ -590,12 +621,6 @@ msgstr "Un destinataire a été supprimé"
 msgid "A recipient was updated"
 msgstr "Un destinataire a été mis à jour"
 
-#. placeholder {0}: transferVerification.name
-#. placeholder {1}: transferVerification.email
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "A request to transfer the ownership of this team has been sent to <0>{0} ({1})</0>"
-msgstr "Une demande pour transférer la propriété de cette équipe a été envoyée à <0>{0} ({1})</0>"
-
 #. placeholder {0}: team.name
 #: packages/lib/server-only/team/create-team-email-verification.ts
 msgid "A request to use your email has been initiated by {0} on Documenso"
@@ -606,7 +631,6 @@ msgid "A secret that will be sent to your URL so you can verify that the request
 msgstr "Un secret qui sera envoyé à votre URL afin que vous puissiez vérifier que la demande a été envoyée par Documenso"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "A secret that will be sent to your URL so you can verify that the request has been sent by Documenso."
 msgstr "Un secret qui sera envoyé à votre URL afin que vous puissiez vérifier que la demande a été envoyée par Documenso."
 
@@ -614,19 +638,6 @@ msgstr "Un secret qui sera envoyé à votre URL afin que vous puissiez vérifier
 msgid "A stable internet connection"
 msgstr "Une connexion Internet stable"
 
-#: packages/email/templates/team-join.tsx
-msgid "A team member has joined a team on Documenso"
-msgstr "Un membre de l'équipe a rejoint une équipe sur Documenso"
-
-#. placeholder {0}: team.name
-#: packages/lib/jobs/definitions/emails/send-team-member-left-email.handler.ts
-msgid "A team member has left {0}"
-msgstr "Un membre de l'équipe a quitté {0}"
-
-#: packages/email/templates/team-leave.tsx
-msgid "A team member has left a team on Documenso"
-msgstr "Un membre de l'équipe a quitté une équipe sur Documenso"
-
 #: packages/email/templates/team-delete.tsx
 #: packages/email/templates/team-delete.tsx
 msgid "A team you were a part of has been deleted"
@@ -636,6 +647,14 @@ msgstr "Une équipe dont vous faisiez partie a été supprimée"
 msgid "A unique URL to access your profile"
 msgstr "Une URL unique pour accéder à votre profil"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "A unique URL to identify the organisation"
+msgstr ""
+
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "A unique URL to identify your organisation"
+msgstr ""
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "A unique URL to identify your team"
@@ -645,32 +664,36 @@ msgstr "Une URL unique pour identifier votre équipe"
 msgid "A verification email will be sent to the provided email."
 msgstr "Un e-mail de vérification sera envoyé à l'adresse e-mail fournie."
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: packages/email/templates/team-transfer-request.tsx
-#: packages/email/templates/team-invite.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: packages/email/templates/organisation-invite.tsx
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Accept"
 msgstr "Accepter"
 
-#: packages/email/templates/team-invite.tsx
-msgid "Accept invitation to join a team on Documenso"
-msgstr "Accepter l'invitation à rejoindre une équipe sur Documenso"
+#: packages/email/templates/organisation-invite.tsx
+msgid "Accept invitation to join an organisation on Documenso"
+msgstr ""
 
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Accept team email request for {teamName} on Documenso"
 msgstr "Accepter la demande d'e-mail de l'équipe pour {teamName} sur Documenso"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "Accept team transfer request on Documenso"
-msgstr "Accepter la demande de transfert d'équipe sur Documenso"
-
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Acceptance and Consent"
 msgstr "Acceptation et consentement"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Accepted team invitation"
-msgstr "Invitation d'équipe acceptée"
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "Access disabled"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Access enabled"
+msgstr ""
+
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Account"
+msgstr ""
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 msgid "Account Authentication"
@@ -707,18 +730,25 @@ msgid "Action"
 msgstr "Action"
 
 #: apps/remix/app/components/tables/templates-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Actions"
 msgstr "Actions"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
 msgid "Active"
 msgstr "Actif"
 
@@ -783,7 +813,29 @@ msgstr "Ajouter un e-mail"
 msgid "Add Fields"
 msgstr "Ajouter des champs"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add group roles"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add groups"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Add Members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Add members roles"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Add more"
 msgstr "Ajouter davantage"
 
@@ -841,15 +893,12 @@ msgstr "Ajouter les personnes qui signeront le document."
 msgid "Add the recipients to create the document with"
 msgstr "Ajouter les destinataires pour créer le document avec"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Adding and removing seats will adjust your invoice accordingly."
-msgstr "Ajouter et supprimer des sièges ajustera votre facture en conséquence."
-
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Additional brand information to display at the bottom of emails"
 msgstr "Informations supplémentaires sur la marque à afficher en bas des e-mails"
 
-#: packages/lib/constants/teams.ts
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Admin"
 msgstr "Administrateur"
 
@@ -857,10 +906,15 @@ msgstr "Administrateur"
 msgid "Admin Actions"
 msgstr "Actions administratives"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 msgid "Admin panel"
 msgstr "Panneau d'administration"
 
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+msgid "Admin Panel"
+msgstr ""
+
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
 #: packages/ui/primitives/document-flow/add-settings.tsx
 msgid "Advanced Options"
@@ -893,6 +947,10 @@ msgstr "Tout"
 msgid "All documents"
 msgstr "Tous les documents"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "All documents have been completed!"
+msgstr ""
+
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "All documents have been processed. Any new documents that are sent or received will show here."
 msgstr "Tous les documents ont été traités. Tous nouveaux documents envoyés ou reçus s'afficheront ici."
@@ -901,8 +959,8 @@ msgstr "Tous les documents ont été traités. Tous nouveaux documents envoyés
 msgid "All documents related to the electronic signing process will be provided to you electronically through our platform or via email. It is your responsibility to ensure that your email address is current and that you can receive and open our emails."
 msgstr "Tous les documents relatifs au processus de signature électronique vous seront fournis électroniquement via notre plateforme ou par e-mail. Il est de votre responsabilité de vous assurer que votre adresse e-mail est à jour et que vous pouvez recevoir et ouvrir nos e-mails."
 
-#: apps/remix/app/routes/_authenticated+/templates.folders._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.folders._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.folders._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.folders._index.tsx
 msgid "All Folders"
 msgstr "Tous les dossiers"
 
@@ -930,6 +988,10 @@ msgstr "Tous les modèles"
 msgid "All Time"
 msgstr "Depuis toujours"
 
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
+msgid "Allow all organisation members to access this team"
+msgstr ""
+
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Allow document recipients to reply directly to this email address"
 msgstr "Autoriser les destinataires du document à répondre directement à cette adresse e-mail"
@@ -946,6 +1008,10 @@ msgstr "Permettre aux signataires de dicter le prochain signataire"
 msgid "Allowed Signature Types"
 msgstr "Types de signatures autorisées"
 
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "Allowed teams"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security._index.tsx
 msgid "Allows authenticating using biometrics, password managers, hardware keys, etc."
 msgstr "Permet d'authentifier en utilisant des biométries, des gestionnaires de mots de passe, des clés matérielles, etc."
@@ -954,7 +1020,7 @@ msgstr "Permet d'authentifier en utilisant des biométries, des gestionnaires de
 msgid "Already have an account? <0>Sign in instead</0>"
 msgstr "Vous avez déjà un compte ? <0>Connectez-vous plutôt</0>"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
 msgid "Amount"
 msgstr "Montant"
 
@@ -970,14 +1036,13 @@ msgstr "Une signature électronique fournie par vous sur notre plateforme, obten
 msgid "An email account"
 msgstr "Un compte e-mail"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "An email containing an invitation will be sent to each member."
 msgstr "Un e-mail contenant une invitation sera envoyé à chaque membre."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "An email requesting the transfer of this team has been sent."
-msgstr "Un e-mail demandant le transfert de cette équipe a été envoyé."
-
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/token.tsx
 #: apps/remix/app/components/forms/signup.tsx
@@ -1024,6 +1089,7 @@ msgstr "Une erreur est survenue lors de la désactivation de la signature par li
 msgid "An error occurred while disabling the user."
 msgstr "Une erreur est survenue lors de la désactivation de l'utilisateur."
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
@@ -1046,21 +1112,15 @@ msgstr "Une erreur est survenue lors de l'activation de la signature par lien di
 msgid "An error occurred while enabling the user."
 msgstr "Une erreur est survenue lors de l'activation de l'utilisateur."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "An error occurred while loading team members. Please try again later."
-msgstr "Une erreur est survenue lors du chargement des membres de l'équipe. Veuillez réessayer plus tard."
-
 #: packages/ui/primitives/pdf-viewer.tsx
 msgid "An error occurred while loading the document."
 msgstr "Une erreur est survenue lors du chargement du document."
 
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "An error occurred while moving the document."
 msgstr "Une erreur est survenue lors du déplacement du document."
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 msgid "An error occurred while moving the template."
 msgstr "Une erreur est survenue lors du déplacement du modèle."
 
@@ -1113,6 +1173,7 @@ msgstr "Une erreur s'est produite lors de la signature en tant qu'assistant."
 #: apps/remix/app/components/general/document-signing/document-signing-dropdown-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-checkbox-field.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "An error occurred while signing the document."
 msgstr "Une erreur est survenue lors de la signature du document."
 
@@ -1144,7 +1205,6 @@ msgstr "Une erreur inattendue est survenue."
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/forms/signup.tsx
@@ -1153,20 +1213,31 @@ msgstr "Une erreur inattendue est survenue."
 #: apps/remix/app/components/forms/signin.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
 #: apps/remix/app/components/forms/profile.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/account-delete-dialog.tsx
 msgid "An unknown error occurred"
@@ -1187,9 +1258,9 @@ msgstr "Une erreur inconnue s'est produite lors de la suppression du dossier."
 msgid "An unknown error occurred while moving the folder."
 msgstr "Une erreur inconnue s'est produite lors du déplacement du dossier."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Any payment methods attached to this team will remain attached to this team. Please contact us if you need to update this information."
-msgstr "Tous les moyens de paiement associés à cette équipe resteront associés à cette équipe. Veuillez nous contacter si vous avez besoin de mettre à jour ces informations."
+#: apps/remix/app/routes/_authenticated+/inbox.tsx
+msgid "Any documents that you have been invited to will appear here"
+msgstr ""
 
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Any Source"
@@ -1199,7 +1270,7 @@ msgstr "Toute source"
 msgid "Any Status"
 msgstr "Tout statut"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -1211,6 +1282,7 @@ msgstr "Tokens API"
 msgid "App Version"
 msgstr "Version de l'application"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
@@ -1246,6 +1318,10 @@ msgstr "Approval en cours"
 msgid "Are you sure you want to complete the document? This action cannot be undone. Please ensure that you have completed prefilling all relevant fields before proceeding."
 msgstr "Êtes-vous sûr de vouloir terminer le document ? Cette action ne peut être annulée. Veuillez vous assurer d'avoir pré-rempli tous les champs pertinents avant de procéder."
 
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Are you sure you want to delete the following claim?"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 msgid "Are you sure you want to delete this token?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce token ?"
@@ -1258,6 +1334,10 @@ msgstr "Êtes-vous sûr de vouloir rejeter ce document ? Cette action ne peut pa
 msgid "Are you sure you want to remove the <0>{passkeyName}</0> passkey."
 msgstr "Êtes-vous sûr de vouloir supprimer la clé de passe <0>{passkeyName}</0>."
 
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "Are you sure you wish to delete this organisation?"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Are you sure you wish to delete this team?"
 msgstr "Êtes-vous sûr de vouloir supprimer cette équipe ?"
@@ -1265,13 +1345,22 @@ msgstr "Êtes-vous sûr de vouloir supprimer cette équipe ?"
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "Are you sure?"
 msgstr "Êtes-vous sûr ?"
 
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+msgid "Assigned Teams"
+msgstr ""
+
 #: packages/lib/constants/recipient-roles.ts
 msgid "Assist"
 msgstr "Aider"
@@ -1297,6 +1386,10 @@ msgstr "Le rôle d'assistant est uniquement disponible lorsque le document est e
 msgid "Assistants"
 msgstr "\"\""
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Assistants and Copy roles are currently not compatible with the multi-sign experience."
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "Assisted"
@@ -1306,7 +1399,7 @@ msgstr "Assisté"
 msgid "Assisting"
 msgstr "En assistance"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.types.tsx
 #: packages/ui/primitives/document-flow/add-settings.types.ts
 #: packages/lib/types/document-meta.ts
@@ -1343,15 +1436,17 @@ msgid "Awaiting email confirmation"
 msgstr "En attente de confirmation par e-mail"
 
 #: apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx
-#: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/authoring/configure-fields-view.tsx
 #: apps/remix/app/components/embed/authoring/configure-fields-view.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Back"
 msgstr "Retour"
 
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
-msgid "Back to Documents"
-msgstr "Retour aux documents"
+msgid "Back home"
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "Background Color"
@@ -1370,20 +1465,14 @@ msgstr "Codes de sauvegarde"
 msgid "Banner Updated"
 msgstr "Bannière mise à jour"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Basic details"
-msgstr "Détails de base"
-
 #: packages/email/template-components/template-confirmation-email.tsx
 msgid "Before you get started, please confirm your email address by clicking the button below:"
 msgstr "Avant de commencer, veuillez confirmer votre adresse e-mail en cliquant sur le bouton ci-dessous :"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
-#: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
-#: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
 msgid "Billing"
 msgstr "Facturation"
 
@@ -1395,11 +1484,26 @@ msgstr "Noir"
 msgid "Blue"
 msgstr "Bleu"
 
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Brand Details"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Brand Website"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Branding Logo"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Branding Preferences"
 msgstr "Préférences de branding"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Branding preferences updated"
 msgstr "Préférences de branding mises à jour"
 
@@ -1412,7 +1516,7 @@ msgstr "Navigateur"
 msgid "Bulk Copy"
 msgstr "Copie groupée"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Bulk Import"
 msgstr "Importation en masse"
 
@@ -1434,7 +1538,7 @@ msgstr "Envoi de modèle groupé via CSV"
 msgid "Bulk Send via CSV"
 msgstr "Envoi en masse via CSV"
 
-#: packages/email/templates/team-invite.tsx
+#: packages/email/templates/organisation-invite.tsx
 msgid "by <0>{senderName}</0>"
 msgstr "par <0>{senderName}</0>"
 
@@ -1442,10 +1546,6 @@ msgstr "par <0>{senderName}</0>"
 msgid "By accepting this request, you will be granting <0>{teamName}</0> access to:"
 msgstr "En acceptant cette demande, vous accorderez à <0>{teamName}</0> l'accès à :"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "By accepting this request, you will take responsibility for any billing items associated with this team."
-msgstr "En acceptant cette demande, vous assumerez la responsabilité de tous les éléments de facturation associés à cette équipe."
-
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "By deleting this document, the following will occur:"
 msgstr "En supprimant ce document, les éléments suivants se produiront :"
@@ -1476,7 +1576,6 @@ msgstr "Peut préparer"
 
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-signature-field.tsx
@@ -1487,6 +1586,7 @@ msgstr "Peut préparer"
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-account.tsx
@@ -1497,30 +1597,44 @@ msgstr "Peut préparer"
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/template-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 #: apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
 #: apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 #: packages/ui/primitives/signature-pad/signature-pad-dialog.tsx
 #: packages/ui/primitives/document-flow/send-document-action-dialog.tsx
 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx
@@ -1572,7 +1686,8 @@ msgstr "Case à cocher"
 msgid "Checkbox values"
 msgstr "Valeurs de la case à cocher"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Checkout"
 msgstr "Passer à la caisse"
 
@@ -1592,6 +1707,10 @@ msgstr "Choisissez comment le document atteindra les destinataires"
 msgid "Choose how to distribute your document to recipients. Email will send notifications, None will generate signing links for manual distribution."
 msgstr "Choisissez comment distribuer votre document aux destinataires. L'email enverra des notifications, Aucun générera des liens de signature pour une distribution manuelle."
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Choose your preferred authentication method:"
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "Choose..."
 msgstr "Choisissez..."
@@ -1600,13 +1719,9 @@ msgstr "Choisissez..."
 msgid "Claim account"
 msgstr "Revendiquer le compte"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Claim username"
-msgstr "Revendiquer le nom d'utilisateur"
-
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Claim your username now"
-msgstr "Revendiquer votre nom d'utilisateur maintenant"
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+msgid "Claims"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Clear file"
@@ -1631,7 +1746,7 @@ msgstr "Cliquez ici pour commencer"
 msgid "Click here to retry"
 msgstr "Cliquez ici pour réessayer"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Click here to upload"
 msgstr "Cliquez ici pour importer"
 
@@ -1644,10 +1759,11 @@ msgstr "Cliquez pour copier le lien de signature à envoyer au destinataire"
 #: apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Click to insert field"
 msgstr "Cliquez pour insérer un champ"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
@@ -1655,6 +1771,9 @@ msgstr "Cliquez pour insérer un champ"
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: packages/ui/primitives/document-flow/missing-signature-field-dialog.tsx
@@ -1665,11 +1784,16 @@ msgstr "Fermer"
 msgid "Communication"
 msgstr "Communication"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Compare all plans and features in detail"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Complete"
 msgstr "Compléter"
 
@@ -1701,6 +1825,7 @@ msgstr "Compléter la visualisation"
 #: apps/remix/app/components/general/stack-avatars-with-tooltip.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/document.ts
 #: packages/email/template-components/template-document-self-signed.tsx
 #: packages/email/template-components/template-document-recipient-signed.tsx
@@ -1776,16 +1901,21 @@ msgstr "Configurer le champ {0}"
 msgid "Configure the fields you want to place on the document."
 msgstr "Configurez les champs que vous souhaitez placer sur le document."
 
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Configure the team roles for each group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Configure the team roles for each member"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Confirm by typing <0>{confirmTransferMessage}</0>"
-msgstr "Confirmer en tapant <0>{confirmTransferMessage}</0>"
-
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 msgid "Confirm by typing <0>{deleteMessage}</0>"
 msgstr "Confirmer en tapant <0>{deleteMessage}</0>"
 
@@ -1817,20 +1947,24 @@ msgstr "Consentement aux transactions électroniques"
 msgid "Contact Information"
 msgstr "Coordonnées"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Contact sales here"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "Content"
 msgstr "Contenu"
 
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-view.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx
 #: packages/ui/primitives/document-flow/document-flow-root.tsx
 msgid "Continue"
@@ -1856,19 +1990,19 @@ msgstr "Continuer en signant le document."
 msgid "Continue by viewing the document."
 msgstr "Continuer en consultant le document."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "Continue to login"
 msgstr "Continuer vers la connexion"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the default language of an uploaded document. This will be used as the language in email communications with the recipients."
 msgstr "Contrôle la langue par défaut d'un document importé. Cela sera utilisé comme langue dans les communications par e-mail avec les destinataires."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the default visibility of an uploaded document."
 msgstr "Contrôle la visibilité par défaut d'un document importé."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the formatting of the message that will be sent when inviting a recipient to sign a document. If a custom message has been provided while configuring the document, it will be used instead."
 msgstr "Contrôle le formatage du message qui sera envoyé lors de l'invitation d'un destinataire à signer un document. Si un message personnalisé a été fourni lors de la configuration du document, il sera utilisé à la place."
 
@@ -1876,11 +2010,11 @@ msgstr "Contrôle le formatage du message qui sera envoyé lors de l'invitation
 msgid "Controls the language for the document, including the language to be used for email notifications, and the final certificate that is generated and attached to the document."
 msgstr "Contrôle la langue du document, y compris la langue à utiliser pour les notifications par email et le certificat final qui est généré et attaché au document."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls whether the signing certificate will be included in the document when it is downloaded. The signing certificate can still be downloaded from the logs page separately."
 msgstr "Contrôle si le certificat de signature sera inclus dans le document lorsqu'il sera téléchargé. Le certificat de signature peut toujours être téléchargé séparément à partir de la page d'historique'."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls which signatures are allowed to be used when signing a document."
 msgstr "Contrôle quelles signatures sont autorisées lors de la signature d'un document."
 
@@ -1929,6 +2063,9 @@ msgstr "Copier le token"
 
 #: apps/remix/app/routes/_profile+/_layout.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 msgid "Create"
 msgstr "Créer"
 
@@ -1940,16 +2077,31 @@ msgstr "Créez un <0>compte gratuit</0> pour accéder à vos documents signés 
 msgid "Create a new account"
 msgstr "Créer un nouveau compte"
 
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Create a new organisation with {planName} plan. Keep your current organisation on it's current plan"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create a team to collaborate with your team members."
 msgstr "Créer une équipe pour collaborer avec vos membres."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 #: packages/email/template-components/template-document-self-signed.tsx
 msgid "Create account"
 msgstr "Créer un compte"
 
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Create an organisation for this user"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Create an organisation to collaborate with teams"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Create an organisation to get started."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Create and send"
 msgstr "Créer et envoyer"
@@ -1962,6 +2114,14 @@ msgstr "Créer en tant que brouillon"
 msgid "Create as pending"
 msgstr "Créer comme en attente"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create claim"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create Claim"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog-wrapper.tsx
 msgid "Create Direct Link"
 msgstr "Créer un lien direct"
@@ -1974,6 +2134,15 @@ msgstr "Créer un lien de signature directe"
 msgid "Create document from template"
 msgstr "Créer un document à partir du modèle"
 
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Create group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Create Groups"
+msgstr ""
+
 #: apps/remix/app/routes/_profile+/_layout.tsx
 msgid "Create now"
 msgstr "Créer maintenant"
@@ -1982,17 +2151,47 @@ msgstr "Créer maintenant"
 msgid "Create one automatically"
 msgstr "Créer un automatiquement"
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Create organisation"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/menu-switcher.tsx
+msgid "Create Organisation"
+msgstr ""
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Create separate organisation"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Create signing links"
 msgstr "Créer des liens de signature"
 
-#: apps/remix/app/components/general/menu-switcher.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Create Stripe customer"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Create subscription"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create Subscription Claim"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create team"
 msgstr "Créer une équipe"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create Team"
 msgstr "Créer une équipe"
@@ -2025,6 +2224,8 @@ msgstr "Créez votre compte et commencez à utiliser la signature de documents 
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 #: apps/remix/app/components/tables/templates-table.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/tables/admin-leaderboard-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-information.tsx
@@ -2035,25 +2236,23 @@ msgid "Created"
 msgstr "Créé"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Created At"
 msgstr "Créé le"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Created by"
 msgstr "Créé par"
 
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table.tsx
 msgid "Created on"
 msgstr "Créé le"
 
 #. placeholder {0}: i18n.date(webhook.createdAt, DateTime.DATETIME_FULL)
 #. placeholder {0}: i18n.date(token.createdAt, DateTime.DATETIME_FULL)
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Created on {0}"
 msgstr "Créé le {0}"
 
@@ -2073,14 +2272,26 @@ msgstr "Le mot de passe actuel est incorrect."
 msgid "Current recipients:"
 msgstr "Destinataires actuels :"
 
-#: apps/remix/app/components/general/billing-plans.tsx
-msgid "Daily"
-msgstr "Quotidien"
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "Currently all organisation members can access this team"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Currently branding can only be configured for Teams and above plans."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups._index.tsx
+msgid "Custom Organisation Groups"
+msgstr ""
 
 #: apps/remix/app/components/general/app-command-menu.tsx
 msgid "Dark Mode"
 msgstr "Mode sombre"
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Dashboard"
+msgstr ""
+
 #: apps/remix/app/components/tables/settings-security-activity-table.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
@@ -2089,8 +2300,7 @@ msgstr "Mode sombre"
 msgid "Date"
 msgstr "Date"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Date created"
 msgstr "Date de création"
 
@@ -2100,24 +2310,20 @@ msgstr "Date de création"
 msgid "Date Format"
 msgstr "Format de date"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: packages/email/templates/team-invite.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: packages/email/templates/organisation-invite.tsx
 msgid "Decline"
 msgstr "Décliner"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Declined team invitation"
-msgstr "Invitation d'équipe refusée"
-
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Document Language"
 msgstr "Langue par défaut du document"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Document Visibility"
 msgstr "Visibilité par défaut du document"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Signature Settings"
 msgstr "Paramètres de Signature par Défaut"
 
@@ -2125,20 +2331,30 @@ msgstr "Paramètres de Signature par Défaut"
 msgid "delete"
 msgstr "supprimer"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/document/document-page-view-dropdown.tsx
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -2148,6 +2364,7 @@ msgstr "Supprimer"
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-folder-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/folder-delete-dialog.tsx
 msgid "delete {0}"
 msgstr "supprimer {0}"
@@ -2178,18 +2395,33 @@ msgstr "Supprimer le document"
 msgid "Delete Document"
 msgstr "Supprimer le document"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "Delete organisation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "Delete organisation group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "Delete organisation member"
+msgstr ""
+
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "Delete passkey"
 msgstr "Supprimer la clé d'accès"
 
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Delete Subscription Claim"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Delete team"
 msgstr "Supprimer l'équipe"
 
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-msgid "Delete team member"
-msgstr "Supprimer le membre de l'équipe"
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "Delete team group"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 msgid "Delete the document. This action is irreversible so proceed with caution."
@@ -2278,6 +2510,7 @@ msgstr "Modèle de lien direct supprimé"
 msgid "Direct template link usage exceeded ({0}/{1})"
 msgstr "L'utilisation du lien de modèle direct a été dépassée ({0}/{1})"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Disable"
 msgstr "Désactiver"
@@ -2288,6 +2521,10 @@ msgstr "Désactiver"
 msgid "Disable 2FA"
 msgstr "Désactiver 2FA"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "Disable access"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
 msgid "Disable account"
 msgstr "Désactiver le compte"
@@ -2302,7 +2539,6 @@ msgid "Disable Two Factor Authentication before deleting your account."
 msgstr "Désactiver l'authentification à deux facteurs avant de supprimer votre compte."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "Disabled"
 msgstr "Désactivé"
 
@@ -2338,8 +2574,7 @@ msgstr "Voulez-vous dupliquer ce modèle ?"
 msgid "Documenso will delete <0>all of your documents</0>, along with all of your completed documents, signatures, and all other resources belonging to your Account."
 msgstr "Documenso supprimera <0>tous vos documents</0>, ainsi que tous vos documents complétés, signatures, et toutes les autres ressources appartenant à votre compte."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Document"
 msgstr "Document"
@@ -2426,8 +2661,7 @@ msgstr "Document créé en utilisant un <0>lien direct</0>"
 msgid "Document Creation"
 msgstr "Création de document"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 #: packages/lib/utils/document-audit-logs.ts
@@ -2463,15 +2697,13 @@ msgstr "ID externe du document mis à jour"
 msgid "Document found in your account"
 msgstr "Document trouvé dans votre compte"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/components/general/document/document-history-sheet.tsx
 msgid "Document history"
 msgstr "Historique du document"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document ID"
 msgstr "ID du document"
 
@@ -2496,7 +2728,6 @@ msgid "Document metrics"
 msgstr "Métriques du document"
 
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "Document moved"
 msgstr "Document déplacé"
 
@@ -2520,7 +2751,8 @@ msgstr "Document en attente"
 msgid "Document pending email"
 msgstr "E-mail de document en attente"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Document preferences updated"
 msgstr "Préférences de document mises à jour"
 
@@ -2559,13 +2791,11 @@ msgstr "Authentification de signature de document mise à jour"
 msgid "Document signing process will be cancelled"
 msgstr "Le processus de signature du document sera annulé"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document status"
 msgstr "Statut du document"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document title"
 msgstr "Titre du document"
 
@@ -2603,16 +2833,13 @@ msgid "Document will be permanently deleted"
 msgstr "Le document sera supprimé de manière permanente"
 
 #: apps/remix/app/routes/_profile+/p.$url.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
 #: apps/remix/app/components/general/user-profile-timur.tsx
-#: apps/remix/app/components/general/generic-error-layout.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -2620,8 +2847,7 @@ msgstr "Le document sera supprimé de manière permanente"
 msgid "Documents"
 msgstr "Documents"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Documents created from template"
 msgstr "Documents créés à partir du modèle"
 
@@ -2629,6 +2855,10 @@ msgstr "Documents créés à partir du modèle"
 msgid "Documents Received"
 msgstr "Documents reçus"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
+msgid "Documents that require your attention will appear here"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
 msgid "Documents Viewed"
 msgstr "Documents consultés"
@@ -2638,7 +2868,8 @@ msgstr "Documents consultés"
 msgid "Don't have an account? <0>Sign up</0>"
 msgstr "Vous n'avez pas de compte? <0>Inscrivez-vous</0>"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/share-document-download-button.tsx
@@ -2711,7 +2942,7 @@ msgstr "Liste déroulante"
 msgid "Dropdown options"
 msgstr "Options de liste déroulante"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Due to an unpaid invoice, your team has been restricted. Please settle the payment to restore full access to your team."
 msgstr "En raison d'une facture impayée, votre équipe a été restreinte. Veuillez régler le paiement pour rétablir l'accès complet à votre équipe."
 
@@ -2730,7 +2961,6 @@ msgid "Duplicate on all pages"
 msgstr "Dupliquer sur toutes les pages"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
@@ -2741,13 +2971,11 @@ msgstr "Dupliquer sur toutes les pages"
 msgid "Edit"
 msgstr "Modifier"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Edit Template"
 msgstr "Modifier le modèle"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Edit webhook"
 msgstr "Modifier le webhook"
 
@@ -2762,6 +2990,7 @@ msgstr "Divulgation de signature électronique"
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/tables/admin-document-recipient-item-table.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-email-field.tsx
@@ -2772,6 +3001,7 @@ msgstr "Divulgation de signature électronique"
 #: apps/remix/app/components/forms/forgot-password.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
@@ -2793,7 +3023,7 @@ msgstr "Email"
 
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/send-confirmation-email.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Email address"
 msgstr "Adresse email"
 
@@ -2837,15 +3067,27 @@ msgstr "La vérification par email a été supprimée"
 msgid "Email verification has been resent"
 msgstr "La vérification par email a été renvoyée"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Embedding, 5 members included and more"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "Empty field"
 msgstr "Champ vide"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Enable"
+msgstr ""
+
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "Enable 2FA"
 msgstr "Activer 2FA"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Enable access"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 msgid "Enable account"
 msgstr "Activer le compte"
@@ -2859,9 +3101,17 @@ msgstr "Activer le Compte"
 msgid "Enable Authenticator App"
 msgstr "Activer l'application Authenticator"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
-msgid "Enable custom branding for all documents in this team."
-msgstr "Activer la personnalisation de la marque pour tous les documents de cette équipe."
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable Custom Branding"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable custom branding for all documents in this organisation"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable custom branding for all documents in this team"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: packages/lib/constants/template.ts
@@ -2876,8 +3126,6 @@ msgstr "Activer l'ordre de signature"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Enabled"
@@ -2891,11 +3139,15 @@ msgstr "Activer le compte permet à l'utilisateur de pouvoir utiliser le compte
 msgid "Enclosed Document"
 msgstr "Document joint"
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "Ends On"
-msgstr "Se termine le"
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Enter claim name"
+msgstr ""
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Enter your 2FA code"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Enter your brand details"
 msgstr "Entrez les informations de votre marque"
 
@@ -2911,15 +3163,24 @@ msgstr "Entrez votre adresse e-mail pour recevoir le document complété."
 msgid "Enter your name"
 msgstr "Entrez votre nom"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Enter your password"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 msgid "Enter your text here"
 msgstr "Entrez votre texte ici"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Enterprise"
+msgstr ""
+
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
 #: apps/remix/app/components/general/verify-email-banner.tsx
 #: apps/remix/app/components/general/template/template-edit-form.tsx
@@ -2954,15 +3215,14 @@ msgstr "Entrez votre texte ici"
 #: apps/remix/app/components/general/document/document-edit-form.tsx
 #: apps/remix/app/components/general/document/document-edit-form.tsx
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/template-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx
@@ -2975,7 +3235,7 @@ msgstr "Erreur"
 msgid "Error uploading file"
 msgstr "Erreur lors de l'importation du fichier"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Everyone can access and view the document"
 msgstr "Tout le monde peut accéder et voir le document"
 
@@ -2996,7 +3256,7 @@ msgid "Expired"
 msgstr "Expiré"
 
 #. placeholder {0}: i18n.date(token.expires, DateTime.DATETIME_FULL)
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Expires on {0}"
 msgstr "Expire le {0}"
 
@@ -3010,6 +3270,18 @@ msgstr "ID externe"
 msgid "Failed to create folder"
 msgstr "Échec de la création du dossier"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Failed to create subscription claim."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Failed to delete subscription claim."
+msgstr ""
+
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
+msgid "Failed to load document"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
 msgid "Failed to reseal document"
 msgstr "Échec du reseal du document"
@@ -3026,12 +3298,15 @@ msgstr "Échec de la mise à jour du document"
 msgid "Failed to update recipient"
 msgstr "Échec de la mise à jour du destinataire"
 
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Failed to update subscription claim."
+msgstr ""
+
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 msgid "Failed to update template"
 msgstr "Échec de la mise à jour du modèle"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Failed to update webhook"
 msgstr "Échec de la mise à jour du webhook"
 
@@ -3039,6 +3314,12 @@ msgstr "Échec de la mise à jour du webhook"
 msgid "Failed: {failedCount}"
 msgstr "Échoués : {failedCount}"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Feature Flags"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 msgid "Field character limit"
 msgstr "Limite de caractères du champ"
@@ -3096,6 +3377,10 @@ msgstr "Le fichier ne peut pas dépasser {APP_DOCUMENT_UPLOAD_SIZE_LIMIT} Mo"
 msgid "File size exceeds the limit of {APP_DOCUMENT_UPLOAD_SIZE_LIMIT} MB"
 msgstr "La taille du fichier dépasse la limite de {APP_DOCUMENT_UPLOAD_SIZE_LIMIT} MB"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Fill in the details to create a new subscription claim."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
 msgid "Folder"
@@ -3132,6 +3417,10 @@ msgstr "Pour toute question concernant cette divulgation, les signatures électr
 msgid "For each recipient, provide their email (required) and name (optional) in separate columns. Download the template CSV below for the correct format."
 msgstr "Pour chaque destinataire, fournissez son e-mail (obligatoire) et son nom (facultatif) dans des colonnes séparées. Téléchargez le modèle CSV ci-dessous pour obtenir le format requis."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "For example, if the claim has a new flag \"FLAG_1\" set to true, then this organisation will get that flag added."
+msgstr ""
+
 #: packages/lib/server-only/auth/send-forgot-password.ts
 msgid "Forgot Password?"
 msgstr "Mot de passe oublié ?"
@@ -3142,6 +3431,10 @@ msgstr "Mot de passe oublié ?"
 msgid "Forgot your password?"
 msgstr "Vous avez oublié votre mot de passe ?"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Free"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/types.ts
 msgid "Free Signature"
 msgstr "Signature gratuite"
@@ -3153,9 +3446,12 @@ msgstr "Signature gratuite"
 #: apps/remix/app/components/forms/profile.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Full Name"
 msgstr "Nom complet"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/template/template-edit-form.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
@@ -3173,8 +3469,16 @@ msgstr "Générer des liens"
 msgid "Global recipient action authentication"
 msgstr "Authentification d'action de destinataire globale"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Go back"
+msgstr ""
+
 #: apps/remix/app/routes/_recipient+/_layout.tsx
 #: apps/remix/app/routes/_profile+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
 #: packages/ui/primitives/document-flow/document-flow-root.tsx
 msgid "Go Back"
@@ -3192,6 +3496,10 @@ msgstr "Revenir au tableau de bord"
 msgid "Go Back Home"
 msgstr "Revenir au tableau de bord"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid "Go home"
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "Go to document"
 msgstr "Aller au document"
@@ -3200,6 +3508,10 @@ msgstr "Aller au document"
 msgid "Go to owner"
 msgstr "Aller au propriétaire"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Go to team"
+msgstr ""
+
 #: apps/remix/app/routes/_profile+/p.$url.tsx
 msgid "Go to your <0>public profile settings</0> to add documents."
 msgstr "Allez à vos <0>paramètres de profil public</0> pour ajouter des documents."
@@ -3208,6 +3520,34 @@ msgstr "Allez à vos <0>paramètres de profil public</0> pour ajouter des docume
 msgid "Green"
 msgstr "Vert"
 
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Group has been created."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Group has been updated successfully"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Group Name"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
+#: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Groups"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
 msgid "has invited you to approve this document"
 msgstr "t'a invité à approuver ce document"
@@ -3237,6 +3577,10 @@ msgstr "Avoir un assistant comme dernier signataire signifie qu'il ne pourra pre
 msgid "Help complete the document for other signers."
 msgstr "Aidez à compléter le document pour les autres signataires."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "Here you can edit your organisation details."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/profile.tsx
 msgid "Here you can edit your personal details."
 msgstr "Ici, vous pouvez modifier vos informations personnelles."
@@ -3245,14 +3589,23 @@ msgstr "Ici, vous pouvez modifier vos informations personnelles."
 msgid "Here you can manage your password and security settings."
 msgstr "Ici, vous pouvez gérer votre mot de passe et vos paramètres de sécurité."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Here you can set preferences and defaults for branding."
 msgstr "Ici, vous pouvez définir des préférences et des valeurs par défaut pour le branding."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Here you can set preferences and defaults for your organisation. Teams will inherit these settings by default."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Here you can set preferences and defaults for your team."
 msgstr "Ici, vous pouvez définir des préférences et des valeurs par défaut pour votre équipe."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Here you can set your general preferences"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "Here's how it works:"
 msgstr "Voici comment cela fonctionne :"
@@ -3269,7 +3622,7 @@ msgstr "Bonjour {userName},"
 msgid "Hi, {userName} <0>({userEmail})</0>"
 msgstr "Bonjour, {userName} <0>({userEmail})</0>"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "Hide"
@@ -3279,6 +3632,10 @@ msgstr "Cacher"
 msgid "Hide additional information"
 msgstr "Cacher des informations supplémentaires"
 
+#: apps/remix/app/components/general/generic-error-layout.tsx
+msgid "Home"
+msgstr ""
+
 #: packages/lib/constants/recipient-roles.ts
 msgid "I am a signer of this document"
 msgstr "Je suis un signataire de ce document"
@@ -3308,9 +3665,13 @@ msgstr "Je suis le propriétaire de ce document"
 msgid "I'm sure! Delete it"
 msgstr "Je suis sûr ! Supprimez-le"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "If they accept this request, the team will be transferred to their account."
-msgstr "S'ils acceptent cette demande, l'équipe sera transférée à leur compte."
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "ID"
+msgstr ""
+
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "ID copied to clipboard"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "If you do not want to use the authenticator prompted, you can close it, which will then display the next available authenticator."
@@ -3324,6 +3685,8 @@ msgstr "Si vous ne trouvez pas le lien de confirmation dans votre boîte de réc
 msgid "If your authenticator app does not support QR codes, you can use the following code instead:"
 msgstr "Si votre application d'authentification ne prend pas en charge les codes QR, vous pouvez utiliser le code suivant à la place :"
 
+#: apps/remix/app/components/general/app-nav-mobile.tsx
+#: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 msgid "Inbox"
 msgstr "Boîte de réception"
@@ -3332,7 +3695,7 @@ msgstr "Boîte de réception"
 msgid "Inbox documents"
 msgstr "Documents de la boîte de réception"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Include the Signing Certificate in the Document"
 msgstr "Includez le certificat de signature dans le document"
 
@@ -3341,11 +3704,27 @@ msgstr "Includez le certificat de signature dans le document"
 msgid "Information"
 msgstr "Information"
 
-#: packages/ui/components/recipient/recipient-action-auth-select.tsx
 #: packages/ui/components/recipient/recipient-action-auth-select.tsx
 msgid "Inherit authentication method"
 msgstr "Hériter de la méthode d'authentification"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Inherit from organisation"
+msgstr ""
+
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "Inherit organisation members"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Inherited subscription claim"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-initials-field.tsx
 #: packages/ui/primitives/document-flow/types.ts
 msgid "Initials"
@@ -3372,8 +3751,8 @@ msgstr "Email invalide"
 msgid "Invalid link"
 msgstr "Lien invalide"
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Invalid token"
 msgstr "Token invalide"
 
@@ -3381,43 +3760,52 @@ msgstr "Token invalide"
 msgid "Invalid token provided. Please try again."
 msgstr "Le token fourni est invalide. Veuillez réessayer."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Invitation accepted"
+msgstr ""
+
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "Invitation accepted!"
 msgstr "Invitation acceptée !"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "Invitation declined"
 msgstr "Invitation refusée"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invitation has been deleted"
 msgstr "L'invitation a été supprimée"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invitation has been resent"
 msgstr "L'invitation a été renvoyée"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite"
 msgstr "Inviter"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite member"
 msgstr "Inviter un membre"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite Members"
 msgstr "Inviter des membres"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "Invite team members"
-msgstr "Inviter des membres d'équipe"
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Invite organisation members"
+msgstr ""
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Invite team members to collaborate"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invited At"
 msgstr "Invité à"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
 msgid "Invoice"
 msgstr "Facture"
 
@@ -3435,6 +3823,10 @@ msgstr "Il est crucial de maintenir vos coordonnées, en particulier votre adres
 msgid "It looks like {0} hasn't added any documents to their profile yet."
 msgstr "Il semble que {0} n'ait pas encore ajouté de documents à son profil."
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "It looks like we ran into an issue!"
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
 msgid "It seems that the provided token has expired. We've just sent you another token, please check your email and try again."
 msgstr "Il semble que le token fourni ait expiré. Nous venons de vous envoyer un autre token, veuillez vérifier votre email et réessayer."
@@ -3451,9 +3843,14 @@ msgstr "Ce n'est actuellement pas votre tour de signer. Veuillez revenir bientô
 msgid "It's currently not your turn to sign. You will receive an email with instructions once it's your turn to sign the document."
 msgstr "Ce n'est actuellement pas votre tour de signer. Vous recevrez un e-mail avec des instructions une fois que ce sera votre tour de signer le document."
 
-#: packages/email/templates/team-invite.tsx
-msgid "Join {teamName} on Documenso"
-msgstr "Rejoindre {teamName} sur Documenso"
+#: packages/email/templates/organisation-invite.tsx
+msgid "Join {organisationName} on Documenso"
+msgstr ""
+
+#. placeholder {0}: DateTime.fromJSDate(team.createdAt).toRelative({ style: 'short' })
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Joined {0}"
+msgstr ""
 
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
@@ -3463,6 +3860,7 @@ msgstr "Rejoindre {teamName} sur Documenso"
 msgid "Label"
 msgstr "Étiquette"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
@@ -3487,8 +3885,7 @@ msgstr "7 derniers jours"
 msgid "Last modified"
 msgstr "Dernière modification"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Last updated"
 msgstr "Dernière mise à jour"
 
@@ -3508,14 +3905,20 @@ msgstr "Dernière utilisation"
 msgid "Leaderboard"
 msgstr "Classement"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
 msgid "Leave"
 msgstr "Quitter"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "Leave team"
-msgstr "Quitter l'équipe"
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Leave blank to inherit from the organisation."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "Leave organisation"
+msgstr ""
 
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Legality of Electronic Signatures"
@@ -3529,12 +3932,11 @@ msgstr "Mode clair"
 msgid "Like to have your own public profile with agreements?"
 msgstr "Vous voulez avoir votre propre profil public avec des accords ?"
 
-#: packages/email/templates/team-transfer-request.tsx
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Link expires in 1 hour."
 msgstr "Le lien expire dans 1 heure."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Link template"
 msgstr "Modèle de lien"
 
@@ -3544,7 +3946,6 @@ msgstr "Liens générés"
 
 #. placeholder {0}: webhook.eventTriggers .map((trigger) => toFriendlyWebhookEventName(trigger)) .join(', ')
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "Listening to {0}"
 msgstr "Écoute {0}"
 
@@ -3553,6 +3954,7 @@ msgid "Load older activity"
 msgstr "Charger l'activité plus ancienne"
 
 #: apps/remix/app/components/general/skeletons/document-edit-skeleton.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: packages/ui/primitives/pdf-viewer.tsx
 msgid "Loading document..."
 msgstr "Chargement du document..."
@@ -3562,11 +3964,6 @@ msgstr "Chargement du document..."
 msgid "Loading Document..."
 msgstr "Chargement du Document..."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Loading teams..."
-msgstr "Chargement des équipes..."
-
 #: apps/remix/app/components/general/document/document-page-view-recent-activity.tsx
 msgid "Loading..."
 msgstr "Chargement..."
@@ -3577,7 +3974,9 @@ msgstr "Chargement..."
 msgid "Login"
 msgstr "Connexion"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Manage"
 msgstr "Gérer"
 
@@ -3586,16 +3985,19 @@ msgstr "Gérer"
 msgid "Manage {0}'s profile"
 msgstr "Gérer le profil de {0}"
 
-#: apps/remix/app/routes/_authenticated+/settings+/teams.tsx
-msgid "Manage all teams you are currently associated with."
-msgstr "Gérer toutes les équipes avec lesquelles vous êtes actuellement associé."
+#: apps/remix/app/routes/_authenticated+/settings+/organisations.tsx
+msgid "Manage all organisations you are currently associated with."
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Manage all subscription claims"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Manage and view template"
 msgstr "Gérer et afficher le modèle"
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
 msgid "Manage billing"
 msgstr "Gérer la facturation"
 
@@ -3611,42 +4013,69 @@ msgstr "Gérer le lien direct"
 msgid "Manage documents"
 msgstr "Gérer les documents"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage organisation"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Manage organisations"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security._index.tsx
 msgid "Manage passkeys"
 msgstr "Gérer les clés d'accès"
 
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Manage permissions and access controls"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 msgid "Manage subscription"
 msgstr "Gérer l'abonnement"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-msgid "Manage Subscription"
-msgstr "Gérer l'abonnement"
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage the {0} organisation"
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "Manage subscriptions"
-msgstr "Gérer les abonnements"
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage the {0} organisation subscription"
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Manage team subscription."
-msgstr "Gérer l'abonnement de l'équipe."
-
-#: apps/remix/app/components/general/menu-switcher.tsx
-msgid "Manage teams"
-msgstr "Gérer les équipes"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups._index.tsx
+msgid "Manage the custom groups of members for your organisation."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "Manage the direct link signing for this template"
 msgstr "Gérer la signature de lien direct pour ce modèle"
 
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
+msgid "Manage the groups assigned to this team."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+msgid "Manage the members of your team."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 msgid "Manage the members or invite new members."
 msgstr "Gérer les membres ou inviter de nouveaux membres."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+msgid "Manage the teams in this organisation."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/users._index.tsx
 msgid "Manage users"
 msgstr "Gérer les utilisateurs"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Manage your organisation group settings."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.passkeys.tsx
 msgid "Manage your passkeys."
 msgstr "Gérer vos clés d'accès."
@@ -3655,7 +4084,8 @@ msgstr "Gérer vos clés d'accès."
 msgid "Manage your site settings here"
 msgstr "Gérer les paramètres de votre site ici"
 
-#: packages/lib/constants/teams.ts
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Manager"
 msgstr "Gestionnaire"
 
@@ -3684,18 +4114,33 @@ msgstr "Maximum"
 msgid "Maximum file size: 4MB. Maximum 100 rows per upload. Blank values will use template defaults."
 msgstr "Taille maximale du fichier : 4 Mo. Maximum de 100 lignes par importation. Les valeurs vides utiliseront les valeurs par défaut du modèle."
 
-#: packages/lib/constants/teams.ts
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Member"
 msgstr "Membre"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Member Count"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
 msgid "Member Since"
 msgstr "Membre depuis"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
 msgid "Members"
 msgstr "Membres"
 
@@ -3714,8 +4159,12 @@ msgstr "Min"
 msgid "Modify recipients"
 msgstr "Modifier les destinataires"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Modify the details of the subscription claim."
+msgstr ""
+
 #: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Monthly"
 msgstr "Mensuel"
 
@@ -3728,9 +4177,7 @@ msgid "Monthly Active Users: Users that had at least one of their documents comp
 msgstr "Utilisateurs actifs mensuels : utilisateurs ayant terminé au moins un de leurs documents"
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "Move"
 msgstr "Déplacer"
 
@@ -3742,36 +4189,18 @@ msgstr "Déplacer «{templateTitle}» vers un dossier"
 msgid "Move Document to Folder"
 msgstr "Déplacer le document vers un dossier"
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Move Document to Team"
-msgstr "Déplacer le document vers l'équipe"
-
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 msgid "Move Template to Folder"
 msgstr "Déplacer le modèle vers un dossier"
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Move Template to Team"
-msgstr "Déplacer le modèle vers l'équipe"
-
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 msgid "Move to Folder"
 msgstr "Déplacer vers le dossier"
 
-#: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
-#: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
-msgid "Move to Team"
-msgstr "Déplacer vers l'équipe"
-
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Moving..."
-msgstr "Déplacement..."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "My templates"
-msgstr "Mes modèles"
+#: packages/ui/components/document/document-global-auth-access-select.tsx
+msgid "Multiple access methods can be selected."
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table.tsx
@@ -3779,9 +4208,11 @@ msgstr "Mes modèles"
 #: apps/remix/app/components/tables/admin-leaderboard-table.tsx
 #: apps/remix/app/components/tables/admin-document-recipient-item-table.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-name-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
@@ -3799,6 +4230,10 @@ msgstr "Mes modèles"
 msgid "Name"
 msgstr "Nom"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Name is required"
+msgstr ""
+
 #: apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
 msgid "Need to sign documents?"
 msgstr "Besoin de signer des documents ?"
@@ -3827,18 +4262,16 @@ msgstr "Ne jamais expirer"
 msgid "New Password"
 msgstr "Nouveau Mot de Passe"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "New team owner"
-msgstr "Nouveau propriétaire d'équipe"
-
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
 msgid "New Template"
 msgstr "Nouveau modèle"
 
-#: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: packages/ui/primitives/signature-pad/signature-pad-dialog.tsx
 msgid "Next"
 msgstr "Suivant"
@@ -3847,6 +4280,11 @@ msgstr "Suivant"
 msgid "Next field"
 msgstr "Champ suivant"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "No"
+msgstr ""
+
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "No active drafts"
 msgstr "Pas de brouillons actifs"
@@ -3856,9 +4294,9 @@ msgstr "Pas de brouillons actifs"
 msgid "No further action is required from you at this time."
 msgstr "Aucune autre action n'est requise de votre part pour le moment."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "No payment required"
-msgstr "Aucun paiement requis"
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "No organisations found"
+msgstr ""
 
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
 msgid "No public profile templates found"
@@ -3890,8 +4328,6 @@ msgid "No recipients with this role"
 msgstr "Aucun destinataire avec ce rôle"
 
 #: packages/ui/components/document/document-global-auth-action-select.tsx
-#: packages/ui/components/document/document-global-auth-action-select.tsx
-#: packages/ui/components/document/document-global-auth-access-select.tsx
 #: packages/ui/components/document/document-global-auth-access-select.tsx
 msgid "No restrictions"
 msgstr "Aucune restriction"
@@ -3908,6 +4344,18 @@ msgstr "Aucun résultat trouvé."
 msgid "No signature field found"
 msgstr "Aucun champ de signature trouvé"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "No Stripe customer attached"
+msgstr ""
+
+#: apps/remix/app/components/tables/team-groups-table.tsx
+msgid "No team groups found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "No teams yet"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "No valid direct templates found"
 msgstr "Aucun modèle direct valide trouvé"
@@ -3926,6 +4374,7 @@ msgstr "Aucune valeur trouvée."
 msgid "No worries, it happens! Enter your email and we'll email you a special link to reset your password."
 msgstr "Pas de soucis, ça arrive ! Entrez votre email et nous vous enverrons un lien spécial pour réinitialiser votre mot de passe."
 
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/lib/constants/document.ts
 msgid "None"
@@ -3951,6 +4400,16 @@ msgstr "Numéro"
 msgid "Number format"
 msgstr "Format de numéro"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Number of members allowed. 0 = Unlimited"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Number of teams allowed. 0 = Unlimited"
+msgstr ""
+
 #. placeholder {0}: document.team?.name
 #: apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
 msgid "on behalf of \"{0}\" has invited you to approve this document"
@@ -3975,17 +4434,15 @@ msgstr "au nom de \"{0}\" vous a invité à voir ce document"
 msgid "On this page, you can create a new webhook."
 msgstr "Sur cette page, vous pouvez créer un nouveau webhook."
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "On this page, you can create and manage API tokens. See our <0>Documentation</0> for more information."
 msgstr "Sur cette page, vous pouvez créer et gérer des tokens API. Consultez notre <0>Documentation</0> pour plus d'informations."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "On this page, you can create new Webhooks and manage the existing ones."
 msgstr "Sur cette page, vous pouvez créer de nouveaux webhooks et gérer ceux existants."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "On this page, you can edit the webhook and its settings."
 msgstr "Sur cette page, vous pouvez modifier le webhook et ses paramètres."
 
@@ -4005,18 +4462,18 @@ msgstr "Une fois que vous avez scanné le code QR ou saisi le code manuellement,
 msgid "Once your template is set up, share the link anywhere you want. The person who opens the link will be able to enter their information in the direct link recipient field and complete any other fields assigned to them."
 msgstr "Une fois votre modèle configuré, partagez le lien où vous le souhaitez. La personne qui ouvre le lien pourra saisir ses informations dans le champ de destinataire de lien direct et remplir tout autre champ qui lui est attribué."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "One of the documents in the current bundle has a signing role that is not compatible with the current signing experience."
+msgstr ""
+
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Only admins can access and view the document"
 msgstr "Seules les administrateurs peuvent accéder et voir le document"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Only managers and above can access and view the document"
 msgstr "Seuls les responsables et au-dessus peuvent accéder et voir le document"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Only subscribers can have a username shorter than 6 characters"
-msgstr "Seuls les abonnés peuvent avoir un nom d'utilisateur de moins de 6 caractères"
-
 #: apps/remix/app/routes/_profile+/_layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
@@ -4036,15 +4493,131 @@ msgstr "Ou"
 msgid "Or continue with"
 msgstr "Ou continuez avec"
 
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "Organisation"
+msgstr ""
+
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Admin"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Organisation created"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Organisation group not found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Organisation Group Settings"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation has been updated successfully"
+msgstr ""
+
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "Organisation invitation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Organisation invitations have been sent."
+msgstr ""
+
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Manager"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Member"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation Members"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Organisation Name"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation not found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Organisation Preferences"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Organisation role"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Organisation Role"
+msgstr ""
+
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Organisation settings"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+msgid "Organisation Settings"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation Teams"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Organisation URL"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/routes/_authenticated+/settings+/organisations.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+#: apps/remix/app/components/general/settings-nav-mobile.tsx
+#: apps/remix/app/components/general/settings-nav-desktop.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Organisations"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "Organisations that the user is a member of."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Organise your members into groups which can be assigned to teams"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Organize your documents and templates"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Otherwise, the document will be created as a draft."
 msgstr "Sinon, le document sera créé sous forme de brouillon."
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Owner"
 msgstr "Propriétaire"
 
@@ -4059,10 +4632,7 @@ msgstr "Page {0} sur {1}"
 msgid "Page {0} of {numPages}"
 msgstr "Page {0} sur {numPages}"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "Paid"
-msgstr "Payé"
-
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/forms/signin.tsx
 msgid "Passkey"
 msgstr "Clé d'accès"
@@ -4105,12 +4675,18 @@ msgid "Passkeys are not supported on this browser"
 msgstr "Les clés d'accès ne sont pas prises en charge sur ce navigateur"
 
 #: apps/remix/app/components/general/app-command-menu.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/forms/signin.tsx
 #: apps/remix/app/components/forms/reset-password.tsx
 msgid "Password"
 msgstr "Mot de passe"
 
+#: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
+msgid "Password Re-Authentication"
+msgstr ""
+
 #: packages/email/templates/forgot-password.tsx
 msgid "Password Reset Requested"
 msgstr "Réinitialisation du mot de passe demandée"
@@ -4133,21 +4709,12 @@ msgstr "Mot de passe mis à jour"
 msgid "Password updated!"
 msgstr "Mot de passe mis à jour !"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "Pay"
-msgstr "Payer"
-
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Payment is required to finalise the creation of your team."
-msgstr "Un paiement est requis pour finaliser la création de votre équipe."
-
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Payment overdue"
 msgstr "Paiement en retard"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
@@ -4168,22 +4735,36 @@ msgstr "Documents en attente"
 msgid "Pending Documents"
 msgstr "Documents en attente"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "Pending invitations"
 msgstr "Invitations en attente"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "Pending team deleted."
-msgstr "Équipe en attente supprimée."
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "per month"
+msgstr ""
 
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "per year"
+msgstr ""
+
+#: apps/remix/app/components/tables/user-organisations-table.tsx
 msgid "Personal"
 msgstr "Personnel"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 msgid "Personal Account"
 msgstr "Compte personnel"
 
+#: apps/remix/app/routes/_authenticated+/inbox.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/menu-switcher.tsx
+msgid "Personal Inbox"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
 msgid "Pick a number"
 msgstr "Choisissez un numéro"
@@ -4223,7 +4804,7 @@ msgstr "Veuillez {recipientActionVerb} ce document créé par votre modèle dire
 msgid "Please {recipientActionVerb} your document"
 msgstr "Veuillez {recipientActionVerb} votre document"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Please check the CSV file and make sure it is according to our format"
 msgstr "Veuillez vérifier le fichier CSV et vous assurer qu'il est conforme à notre format"
 
@@ -4256,6 +4837,10 @@ msgstr "Veuillez confirmer votre adresse email"
 msgid "Please contact support if you would like to revert this action."
 msgstr "Veuillez contacter le support si vous souhaitez annuler cette action."
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Please contact the site owner for further assistance."
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "Please enter a meaningful name for your token. This will help you identify it later."
 msgstr "Veuillez entrer un nom significatif pour votre token. Cela vous aidera à l'identifier plus tard."
@@ -4341,17 +4926,25 @@ msgstr "Veuiillez taper {0} pour confirmer"
 msgid "Please type <0>{0}</0> to confirm."
 msgstr "Veuillez taper <0>{0}</0> pour confirmer."
 
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Please upload a logo"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
 msgid "Pre-formatted CSV template with example data."
 msgstr "Modèle CSV pré-formaté avec des données d'exemple."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/components/general/settings-nav-mobile.tsx
+#: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
 msgid "Preferences"
 msgstr "Préférences"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Preview"
 msgstr "Aperçu"
 
@@ -4379,11 +4972,11 @@ msgstr "Procéder"
 msgid "Profile"
 msgstr "Profil"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Profile is currently <0>hidden</0>."
 msgstr "Le profil est actuellement <0>caché</0>."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Profile is currently <0>visible</0>."
 msgstr "Le profil est actuellement <0>visible</0>."
 
@@ -4392,12 +4985,16 @@ msgstr "Le profil est actuellement <0>visible</0>."
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Progress"
+msgstr ""
+
 #: apps/remix/app/components/tables/templates-table.tsx
 #: apps/remix/app/components/general/template/template-type.tsx
 msgid "Public"
 msgstr "Public"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -4409,10 +5006,6 @@ msgstr "Profil public"
 msgid "Public profile URL"
 msgstr "URL du profil public"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Public profile username"
-msgstr "Nom d'utilisateur du profil public"
-
 #: apps/remix/app/components/tables/templates-table.tsx
 msgid "Public templates are connected to your public profile. Any modifications to public templates will also appear in your public profile."
 msgstr "Les modèles publics sont connectés à votre profil public. Toute modification apportée aux modèles publics apparaîtra également dans votre profil public."
@@ -4482,6 +5075,7 @@ msgstr "Activité récente"
 msgid "Recent documents"
 msgstr "Documents récents"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
@@ -4562,6 +5156,7 @@ msgstr "Rejeter le Document"
 #: apps/remix/app/components/general/stack-avatars-with-tooltip.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/document.ts
 msgid "Rejected"
 msgstr "Rejeté"
@@ -4596,43 +5191,47 @@ msgstr "Rappel : Veuillez {recipientActionVerb} ce document"
 msgid "Reminder: Please {recipientActionVerb} your document"
 msgstr "Rappel : Veuillez {recipientActionVerb} votre document"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-field-container.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: packages/ui/primitives/document-flow/field-item.tsx
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "Remove"
 msgstr "Retirer"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+msgid "Remove organisation group"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+msgid "Remove organisation member"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 msgid "Remove team email"
 msgstr "Supprimer l'adresse e-mail de l'équipe"
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "Remove team member"
 msgstr "Supprimer le membre de l'équipe"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Renews: {formattedDate}"
-msgstr "Renouvelle : {formattedDate}"
-
 #: apps/remix/app/components/forms/reset-password.tsx
 #: apps/remix/app/components/forms/password.tsx
 msgid "Repeat Password"
 msgstr "Répéter le mot de passe"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Request transfer"
-msgstr "Demander le transfert"
-
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx
@@ -4645,7 +5244,7 @@ msgstr "Champ requis"
 msgid "Reseal document"
 msgstr "Rescellage du document"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Resend"
@@ -4661,6 +5260,7 @@ msgstr "Renvoyer la vérification"
 
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -4679,11 +5279,11 @@ msgstr "Réinitialiser le mot de passe"
 msgid "Resetting Password..."
 msgstr "Réinitialisation du mot de passe..."
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Resolve"
 msgstr "Résoudre"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Resolve payment"
 msgstr "Résoudre le paiement"
 
@@ -4691,6 +5291,10 @@ msgstr "Résoudre le paiement"
 msgid "Rest assured, your document is strictly confidential and will never be shared. Only your signing experience will be highlighted. Share your personalized signing card to showcase your signature!"
 msgstr "Soyez assuré, votre document eststrictement confidentiel et ne sera jamais partagé. Seule votre expérience de signature sera mise en avant. Partagez votre carte de signature personnalisée pour mettre en valeur votre signature !"
 
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
+msgid "Restricted Access"
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Retention of Documents"
 msgstr "Conservation des documents"
@@ -4701,16 +5305,12 @@ msgstr "Réessayer"
 
 #: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Return"
 msgstr "Retour"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "Return to Dashboard"
-msgstr "Retour au tableau de bord"
-
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Return to Home"
 msgstr "Retour à l'accueil"
 
@@ -4727,13 +5327,17 @@ msgstr "Révoquer"
 msgid "Revoke access"
 msgstr "Révoquer l'accès"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
 msgid "Role"
 msgstr "Rôle"
 
@@ -4764,13 +5368,23 @@ msgstr "Sauvegarder"
 msgid "Save Template"
 msgstr "Sauvegarder le modèle"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
 #: apps/remix/app/components/tables/documents-table-sender-filter.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 msgid "Search"
 msgstr "Recherche"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Search and manage all organisations"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Search by claim ID or name"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 msgid "Search by document title"
 msgstr "Recherche par titre de document"
@@ -4780,6 +5394,10 @@ msgstr "Recherche par titre de document"
 msgid "Search by name or email"
 msgstr "Recherche par nom ou e-mail"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Search by organisation ID, name, customer ID or owner email"
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-search.tsx
 msgid "Search documents..."
 msgstr "Rechercher des documents..."
@@ -4788,7 +5406,6 @@ msgstr "Rechercher des documents..."
 msgid "Search languages..."
 msgstr "Rechercher des langues..."
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Secret"
 msgstr "Secret"
@@ -4813,18 +5430,17 @@ msgstr "Sélectionner"
 msgid "Select a folder to move this document to."
 msgstr "Sélectionnez un dossier pour déplacer ce document."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Select a team"
-msgstr "Sélectionner une équipe"
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Select a plan"
+msgstr ""
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Select a team to move this document to. This action cannot be undone."
-msgstr "Sélectionnez une équipe pour déplacer ce document. Cette action ne peut pas être annulée."
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Select a plan to continue"
+msgstr ""
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Select a team to move this template to. This action cannot be undone."
-msgstr "Sélectionnez une équipe pour déplacer ce modèle. Cette action ne peut pas être annulée."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Select a team to view its dashboard"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Select a template you'd like to display on your public profile"
@@ -4834,22 +5450,70 @@ msgstr "Sélectionnez un modèle que vous souhaitez afficher sur votre profil pu
 msgid "Select a template you'd like to display on your team's public profile"
 msgstr "Sélectionnez un modèle que vous souhaitez afficher sur le profil public de votre équipe"
 
+#: packages/ui/components/document/document-global-auth-access-select.tsx
+msgid "Select access methods"
+msgstr ""
+
 #: packages/ui/primitives/combobox.tsx
 msgid "Select an option"
 msgstr "Sélectionner une option"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Select an organisation to view teams"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
 msgid "Select at least"
 msgstr "Sélectionnez au moins"
 
+#: packages/ui/components/recipient/recipient-action-auth-select.tsx
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "Select authentication methods"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/dropdown-field.tsx
 msgid "Select default option"
 msgstr "Sélectionner l'option par défaut"
 
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select groups"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select groups to add to this team"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Select members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select members or groups of members to add to the team."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Select members to add to this team"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 msgid "Select passkey"
 msgstr "Sélectionner la clé d'authentification"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Select signature types"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Select the members to add to this group"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Select the members to include in this group"
+msgstr ""
+
 #: apps/remix/app/components/general/webhook-multiselect-combobox.tsx
 #: apps/remix/app/components/general/webhook-multiselect-combobox.tsx
 msgid "Select triggers"
@@ -4898,7 +5562,7 @@ msgstr "Envoyer des documents au nom de l'équipe en utilisant l'adresse e-mail"
 msgid "Send documents to recipients immediately"
 msgstr "Envoyer les documents aux destinataires immédiatement"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Send on Behalf of Team"
 msgstr "Envoyer au nom de l'équipe"
 
@@ -4918,6 +5582,7 @@ msgstr "Envoyer l'e-mail de demande de signature de destinataire"
 msgid "Send reminder"
 msgstr "Envoyer un rappel"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 msgid "Sender"
 msgstr "Expéditeur"
@@ -4947,7 +5612,10 @@ msgstr "Configurez les propriétés de votre document et les informations du des
 msgid "Set up your template properties and recipient information"
 msgstr "Configurez les propriétés de votre modèle et les informations du destinataire"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/routes/_authenticated+/settings+/_layout.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -4980,7 +5648,7 @@ msgstr "Partager le lien"
 msgid "Share your signing experience!"
 msgstr "Partagez votre expérience de signature !"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Show"
 msgstr "Afficher"
 
@@ -4993,15 +5661,12 @@ msgstr "Afficher des informations supplémentaires"
 msgid "Show advanced settings"
 msgstr "Afficher les paramètres avancés"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Show templates in your public profile for your audience to sign and get started quickly"
 msgstr "Afficher des modèles dans votre profil public pour que votre audience puisse signer et commencer rapidement"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Show templates in your team public profile for your audience to sign and get started quickly"
-msgstr "Afficher des modèles dans le profil public de votre équipe pour que votre audience puisse signer et commencer rapidement"
-
 #: apps/remix/app/routes/_profile+/p.$url.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/user-profile-timur.tsx
@@ -5010,6 +5675,7 @@ msgstr "Afficher des modèles dans le profil public de votre équipe pour que vo
 #: apps/remix/app/components/general/document-signing/document-signing-name-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 #: apps/remix/app/components/general/document/document-page-view-button.tsx
 #: packages/lib/constants/recipient-roles.ts
@@ -5030,6 +5696,7 @@ msgstr "Signer comme<0>{0} <1>({1})</1></0>"
 
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Sign document"
 msgstr "Signer le document"
 
@@ -5038,6 +5705,11 @@ msgstr "Signer le document"
 msgid "Sign Document"
 msgstr "Signer le document"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Sign Documents"
+msgstr ""
+
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 msgid "Sign field"
 msgstr "Champ de signature"
@@ -5053,9 +5725,11 @@ msgid "Sign In"
 msgstr "Se connecter"
 
 #: apps/remix/app/routes/_unauthenticated+/signin.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 msgid "Sign in to your account"
 msgstr "Connectez-vous à votre compte"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 msgid "Sign Out"
@@ -5063,6 +5737,7 @@ msgstr "Déconnexion"
 
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Sign the document to complete the process."
 msgstr "Signez le document pour terminer le processus."
 
@@ -5086,6 +5761,7 @@ msgstr "S'inscrire avec OIDC"
 #: apps/remix/app/components/forms/profile.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
 #: packages/ui/primitives/document-flow/types.ts
 #: packages/ui/primitives/document-flow/add-fields.tsx
@@ -5208,24 +5884,25 @@ msgstr "Certains signataires n'ont pas été assignés à un champ de signature.
 
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/share-document-download-button.tsx
-#: apps/remix/app/components/general/billing-portal-button.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-page.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-account.tsx
 #: apps/remix/app/components/general/document/document-page-view-dropdown.tsx
@@ -5235,7 +5912,6 @@ msgstr "Certains signataires n'ont pas été assignés à un champ de signature.
 #: apps/remix/app/components/general/document/document-audit-log-download-button.tsx
 #: apps/remix/app/components/general/direct-template/direct-template-signing-auth-page.tsx
 #: apps/remix/app/components/general/direct-template/direct-template-page.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
@@ -5243,11 +5919,11 @@ msgstr "Certains signataires n'ont pas été assignés à un champ de signature.
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
@@ -5255,11 +5931,6 @@ msgstr "Certains signataires n'ont pas été assignés à un champ de signature.
 msgid "Something went wrong"
 msgstr "Quelque chose a mal tourné"
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Something went wrong while attempting to transfer the ownership of team <0>{0}</0> to your. Please try again later or contact support."
-msgstr "Quelque chose a mal tourné lors de la tentative de transfert de la propriété de l'équipe <0>{0}</0> à vous. Veuillez réessayer plus tard ou contacter le support."
-
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "Something went wrong while attempting to verify your email address for <0>{0}</0>. Please try again later."
@@ -5282,7 +5953,8 @@ msgstr "Quelque chose a mal tourné lors de l'envoi de l'e-mail de confirmation.
 msgid "Something went wrong while updating the team billing subscription, please contact support."
 msgstr "Quelque chose a mal tourné lors de la mise à jour de l'abonnement de l'équipe, veuillez contacter le support."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Something went wrong!"
 msgstr "Quelque chose a mal tourné !"
 
@@ -5307,6 +5979,7 @@ msgstr "Désolé, nous n'avons pas pu télécharger les journaux d'audit. Veuill
 msgid "Sorry, we were unable to download the certificate. Please try again later."
 msgstr "Désolé, nous n'avons pas pu télécharger le certificat. Veuillez réessayer plus tard."
 
+#: apps/remix/app/components/tables/team-members-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Source"
 msgstr "Source"
@@ -5316,10 +5989,11 @@ msgid "Stats"
 msgstr "Statistiques"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Status"
 msgstr "Statut"
@@ -5328,48 +6002,78 @@ msgstr "Statut"
 msgid "Step <0>{step} of {maxStep}</0>"
 msgstr "Étape <0>{step} sur {maxStep}</0>"
 
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "Stripe"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Stripe customer created successfully"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Stripe Customer ID"
+msgstr ""
+
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Subject <0>(Optional)</0>"
 msgstr "Objet <0>(Optionnel)</0>"
 
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
 msgid "Subscribe"
 msgstr "S'abonner"
 
-#: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
-msgid "Subscriptions"
-msgstr "Abonnements"
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Subscription claim created successfully."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Subscription claim deleted successfully."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Subscription claim updated successfully."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Subscription Claims"
+msgstr ""
 
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/general/verify-email-banner.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
@@ -5378,6 +6082,15 @@ msgstr "Abonnements"
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 msgid "Success"
 msgstr "Succès"
 
@@ -5401,8 +6114,9 @@ msgstr "Exigences du système"
 msgid "System Theme"
 msgstr "Thème système"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table.tsx
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
 msgid "Team"
 msgstr "Équipe"
 
@@ -5411,9 +6125,18 @@ msgstr "Équipe"
 msgid "Team \"{0}\" has been deleted on Documenso"
 msgstr "L'équipe \"{0}\" a été supprimée sur Documenso"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Team checkout"
-msgstr "Vérification de l'équipe"
+#: packages/lib/constants/teams-translations.ts
+msgid "Team Admin"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Team Assignments"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Team Count"
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
@@ -5457,25 +6180,34 @@ msgstr "E-mail de l'équipe vérifié !"
 msgid "Team email was updated."
 msgstr "L'e-mail de l'équipe a été mis à jour."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "Team invitation"
-msgstr "Invitation d'équipe"
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
+msgid "Team Groups"
+msgstr ""
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "Team invitations have been sent."
-msgstr "Les invitations d'équipe ont été envoyées."
+#: packages/lib/constants/teams-translations.ts
+msgid "Team Manager"
+msgstr ""
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: packages/lib/constants/teams-translations.ts
 msgid "Team Member"
 msgstr "Membre de l'équipe"
 
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+msgid "Team Members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Team members have been added."
+msgstr ""
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Team Name"
 msgstr "Nom de l'équipe"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "Team not found"
 msgstr "Équipe introuvable"
@@ -5488,27 +6220,17 @@ msgstr "Équipe uniquement"
 msgid "Team only templates are not linked anywhere and are visible only to your team."
 msgstr "Les modèles uniquement pour l'équipe ne sont liés nulle part et ne sont visibles que pour votre équipe."
 
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transfer"
-msgstr "Transfert de propriété d'équipe"
-
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transfer already completed!"
-msgstr "Le transfert de propriété de l'équipe a déjà été effectué !"
-
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transferred!"
-msgstr "Propriété de l'équipe transférée !"
-
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Team Preferences"
 msgstr "Préférences de l'équipe"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Team Public Profile"
-msgstr "Profil public de l'équipe"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Team Role"
+msgstr ""
 
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 msgid "Team settings"
 msgstr "Paramètres de l'équipe"
 
@@ -5516,44 +6238,37 @@ msgstr "Paramètres de l'équipe"
 msgid "Team Settings"
 msgstr "Paramètres de l'équipe"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Team templates"
-msgstr "Modèles d'équipe"
-
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "Team transfer in progress"
-msgstr "Transfert d'équipe en cours"
-
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "Team transfer request expired"
-msgstr "Demande de transfert d'équipe expirée"
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Team url"
+msgstr ""
 
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Team URL"
 msgstr "URL de l'équipe"
 
-#: apps/remix/app/routes/_authenticated+/settings+/teams.tsx
-#: apps/remix/app/components/general/settings-nav-mobile.tsx
-#: apps/remix/app/components/general/settings-nav-desktop.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
-#: apps/remix/app/components/general/app-nav-mobile.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 msgid "Teams"
 msgstr "Équipes"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-msgid "Teams restricted"
-msgstr "Équipes restreintes"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Teams help you organise your work and collaborate with others. Create your first team to get started."
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Teams that this organisation group is currently assigned to"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Template"
 msgstr "Modèle"
 
@@ -5586,14 +6301,9 @@ msgid "Template is using legacy field insertion"
 msgstr "Le modèle utilise l'insertion de champ héritée"
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 msgid "Template moved"
 msgstr "Modèle déplacé"
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Template not found or already associated with a team."
-msgstr "Modèle introuvable ou déjà associé à une équipe."
-
 #: apps/remix/app/components/general/template/template-edit-form.tsx
 msgid "Template saved"
 msgstr "Modèle enregistré"
@@ -5606,10 +6316,10 @@ msgstr "Titre du modèle"
 msgid "Template updated successfully"
 msgstr "Modèle mis à jour avec succès"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -5641,6 +6351,10 @@ msgstr "Alignement du texte"
 msgid "Text Color"
 msgstr "Couleur du texte"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Thank you for completing the signing process."
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Thank you for using Documenso to perform your electronic document signing. The purpose of this disclosure is to inform you about the process, legality, and your rights regarding the use of electronic signatures on our platform. By opting to use an electronic signature, you are agreeing to the terms and conditions outlined below."
 msgstr "Merci d'utiliser Documenso pour signer vos documents électroniquement. L'objectif de cette clause est de vous informer sur le processus, la légalité et vos droits concernant l'utilisation de la signature électronique sur notre plateforme. En choisissant d'utiliser un sytème de signature électronique, vous acceptez les termes et conditions exposés ci-dessous."
@@ -5662,16 +6376,16 @@ msgid "The account has been enabled successfully."
 msgstr "Le compte a été activé avec succès."
 
 #: packages/ui/components/recipient/recipient-action-auth-select.tsx
-msgid "The authentication required for recipients to sign fields"
-msgstr "L'authentification requise pour que les destinataires signent des champs"
+msgid "The authentication methods required for recipients to sign fields"
+msgstr ""
 
 #: packages/ui/components/document/document-global-auth-action-select.tsx
-msgid "The authentication required for recipients to sign the signature field."
-msgstr "L'authentification requise pour que les destinataires signent le champ de signature."
+msgid "The authentication methods required for recipients to sign the signature field."
+msgstr ""
 
 #: packages/ui/components/document/document-global-auth-access-select.tsx
-msgid "The authentication required for recipients to view the document."
-msgstr "L'authentification requise pour que les destinataires visualisent le document."
+msgid "The authentication methods required for recipients to view the document."
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "The content to show in the banner, HTML is allowed"
@@ -5687,10 +6401,6 @@ msgstr "Le lien direct a été copié dans votre presse-papiers"
 msgid "The document has been moved successfully."
 msgstr "Le document a été déplacé avec succès."
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "The document has been successfully moved to the selected team."
-msgstr "Le document a été déplacé avec succès vers l'équipe sélectionnée."
-
 #: apps/remix/app/components/embed/authoring/configure-document-upload.tsx
 msgid "The document is already saved and cannot be changed."
 msgstr "Le document est déjà enregistré et ne peut pas être modifié."
@@ -5760,17 +6470,30 @@ msgid "The following errors occurred:"
 msgstr "Les erreurs suivantes se sont produites :"
 
 #: packages/email/templates/team-delete.tsx
-msgid "The following team has been deleted by its owner. You will no longer be able to access this team and its documents"
-msgstr "L'équipe suivante a été supprimée par son propriétaire. Vous ne pourrez plus accéder à cette équipe et à ses documents"
+msgid "The following team has been deleted. You will no longer be able to access this team and its documents"
+msgstr ""
 
-#: packages/email/templates/team-delete.tsx
-msgid "The following team has been deleted by you"
-msgstr "L'équipe suivante a été supprimée par vous"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid ""
+"The organisation group you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "The ownership of team <0>{0}</0> has been successfully transferred to you."
-msgstr "La propriété de l'équipe <0>{0}</0> a été transférée avec succès à vous."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "The organisation role that will be applied to all members in this group."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid ""
+"The organisation you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid ""
+"The organisation you are looking for may have been removed, renamed or may have never\n"
+"                  existed."
+msgstr ""
 
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "The page you are looking for was moved, removed, renamed or might never have existed."
@@ -5820,10 +6543,6 @@ msgstr "Le destinataire doit signer le document pour qu'il soit complété."
 msgid "The recipient is required to view the document for it to be completed."
 msgstr "Le destinataire doit visualiser le document pour qu'il soit complété."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "The selected team member will receive an email which they must accept before the team is transferred"
-msgstr "Le membre d'équipe sélectionné recevra un e-mail qu'il devra accepter avant que l'équipe soit transférée"
-
 #: packages/ui/components/document/document-share-button.tsx
 msgid "The sharing link could not be created at this time. Please try again."
 msgstr "Le lien de partage n'a pas pu être créé pour le moment. Veuillez réessayer."
@@ -5855,14 +6574,11 @@ msgstr "La bannière du site est un message affiché en haut du site. Elle peut
 msgid "The team email <0>{teamEmail}</0> has been removed from the following team"
 msgstr "L'email d'équipe <0>{teamEmail}</0> a été supprimé de l'équipe suivante"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "The team transfer invitation has been successfully deleted."
-msgstr "L'invitation au transfert d'équipe a été supprimée avec succès."
-
-#. placeholder {0}: transferVerification.name
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "The team transfer request to <0>{0}</0> has expired."
-msgstr "La demande de transfert d'équipe à <0>{0}</0> a expiré."
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid ""
+"The team you are looking for may have been removed, renamed or may have never\n"
+"                  existed."
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "The team you are looking for may have been removed, renamed or may have never\n"
@@ -5873,10 +6589,6 @@ msgstr "L'équipe que vous cherchez a peut-être été supprimée, renommée ou
 msgid "The template has been moved successfully."
 msgstr "Le modèle a été déplacé avec succès."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "The template has been successfully moved to the selected team."
-msgstr "Le modèle a été déplacé avec succès vers l'équipe sélectionnée."
-
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "The template will be removed from your profile"
 msgstr "Le modèle sera retiré de votre profil"
@@ -5902,17 +6614,21 @@ msgid "The types of signatures that recipients are allowed to use when signing t
 msgstr "Les types de signatures que les destinataires peuvent utiliser lors de la signature du document."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "The URL for Documenso to send webhook events to."
 msgstr "L'URL pour Documenso pour envoyer des événements webhook."
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid ""
+"The user you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 msgid "The webhook has been successfully deleted."
 msgstr "Le webhook a été supprimé avec succès."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "The webhook has been updated successfully."
 msgstr "Le webhook a été mis à jour avec succès."
 
@@ -5932,6 +6648,14 @@ msgstr "Il n'y a pas encore de documents complétés. Les documents que vous ave
 msgid "There was an error uploading your file. Please try again."
 msgstr "Il y a eu une erreur lors de l'importation de votre fichier. Veuillez réessayer."
 
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "These can be overriden by setting the authentication requirements directly on each recipient in the next step. Multiple methods can be selected."
+msgstr ""
+
+#: packages/ui/components/recipient/recipient-action-auth-select.tsx
+msgid "These will override any global settings. Multiple methods can be selected."
+msgstr ""
+
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 msgid "They have permission on your behalf to:"
 msgstr "Ils ont la permission en votre nom de:"
@@ -5954,9 +6678,9 @@ msgstr "Cette action n'est pas réversible. Veuillez être sûr."
 msgid "This action is reversible, but please be careful as the account may be affected permanently (e.g. their settings and contents not being restored properly)."
 msgstr "Cette action est réversible, mais veuillez faire attention car le compte peut être affecté de façon permanente <b>(</b>par exemple, leurs paramètres et contenus ne pourraient pas être restaurés correctement)."
 
-#: packages/ui/components/document/document-global-auth-action-select.tsx
-msgid "This can be overriden by setting the authentication requirements directly on each recipient in the next step."
-msgstr "Cela peut être remplacé par le paramétrage direct des exigences d'authentification pour chaque destinataire à l'étape suivante."
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "This claim is locked and cannot be deleted."
+msgstr ""
 
 #: packages/email/template-components/template-document-super-delete.tsx
 msgid "This document can not be recovered, if you would like to dispute the reason for future documents please contact support."
@@ -5990,13 +6714,11 @@ msgstr "Ce document a été annulé par le propriétaire et n'est plus disponibl
 msgid "This document has been cancelled by the owner."
 msgstr "Ce document a été annulé par le propriétaire."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document has been rejected by a recipient"
 msgstr "Ce document a été rejeté par un destinataire"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document has been signed by all recipients"
 msgstr "Ce document a été signé par tous les destinataires"
 
@@ -6004,8 +6726,7 @@ msgstr "Ce document a été signé par tous les destinataires"
 msgid "This document is available in your Documenso account. You can view more details, recipients, and audit logs there."
 msgstr "Ce document est disponible dans votre compte Documenso. Vous pouvez y voir plus de détails, destinataires, et journaux d'audit."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document is currently a draft and has not been sent"
 msgstr "Ce document est actuellement un brouillon et n'a pas été envoyé"
 
@@ -6062,14 +6783,22 @@ msgstr "Ce nom de dossier est déjà pris."
 msgid "This is how the document will reach the recipients once the document is ready for signing."
 msgstr "Voici comment le document atteindra les destinataires une fois qu'il sera prêt à être signé."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "This is the claim that this organisation was initially created with. Any feature flag changes to this claim will be backported into this organisation."
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "This link is invalid or has expired. Please contact your team to resend a transfer request."
-msgstr "Ce lien est invalide ou a expiré. Veuillez contacter votre équipe pour renvoyer une demande de transfert."
+msgid "This link is invalid or has expired."
+msgstr ""
 
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "This link is invalid or has expired. Please contact your team to resend a verification."
 msgstr "Ce lien est invalide ou a expiré. Veuillez contacter votre équipe pour renvoyer une vérification."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "This organisation, and any associated data will be permanently deleted."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "This passkey has already been registered."
 msgstr "Cette clé d'accès a déjà été enregistrée."
@@ -6078,10 +6807,6 @@ msgstr "Cette clé d'accès a déjà été enregistrée."
 msgid "This passkey is not configured for this application. Please login and add one in the user settings."
 msgstr "Cette clé d'accès n'est pas configurée pour cette application. Veuillez vous connecter et en ajouter une dans les paramètres de l'utilisateur."
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "This price includes minimum 5 seats."
-msgstr "Ce prix inclut un minimum de 5 sièges."
-
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "This recipient can no longer be modified as they have signed a field, or completed the document."
 msgstr "Ce destinataire ne peut plus être modifié car il a signé un champ ou complété le document."
@@ -6106,23 +6831,20 @@ msgstr "Ce modèle n'a pas pu être supprimé pour le moment. Veuillez réessaye
 msgid "This template is using legacy field insertion, we recommend using the new field insertion method for more accurate results."
 msgstr "Ce modèle utilise l'insertion de champ héritée, il est recommandé d'utiliser la nouvelle méthode d'insertion pour des résultats plus précis."
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "This token is invalid or has expired. No action is needed."
 msgstr "Ce token est invalide ou a expiré. Aucune action n'est nécessaire."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "This token is invalid or has expired. Please contact your team for a new invitation."
 msgstr "Ce token est invalide ou a expiré. Veuillez contacter votre équipe pour une nouvelle invitation."
 
 #: apps/remix/app/components/forms/team-update-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "This URL is already in use."
 msgstr "Cette URL est déjà utilisée."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "This username has already been taken"
-msgstr "Ce nom d'utilisateur a déjà été pris"
-
 #: packages/ui/components/document/document-email-checkboxes.tsx
 msgid "This will be sent to all recipients if a pending document has been deleted."
 msgstr "Cela sera envoyé à tous les destinataires si un document en attente a été supprimé."
@@ -6135,17 +6857,16 @@ msgstr "Cela sera envoyé à tous les destinataires une fois que le document aur
 msgid "This will be sent to the document owner once the document has been fully completed."
 msgstr "Cela sera envoyé au propriétaire du document une fois que le document aura été entièrement complété."
 
-#: packages/ui/components/recipient/recipient-action-auth-select.tsx
-msgid "This will override any global settings."
-msgstr "Cela remplacera tous les paramètres globaux."
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "This will ONLY backport feature flags which are set to true, anything disabled in the initial claim will not be backported"
+msgstr ""
 
 #: apps/remix/app/components/tables/internal-audit-log-table.tsx
 #: apps/remix/app/components/tables/document-logs-table.tsx
 msgid "Time"
 msgstr "Temps"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Time zone"
 msgstr "Fuseau horaire"
 
@@ -6158,6 +6879,7 @@ msgstr "Fuseau horaire"
 
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 #: apps/remix/app/components/tables/templates-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-view.tsx
@@ -6169,7 +6891,7 @@ msgstr "Titre"
 msgid "Title cannot be empty"
 msgstr "Le titre ne peut pas être vide"
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "To accept this invitation you must create an account."
 msgstr "Pour accepter cette invitation, vous devez créer un compte."
 
@@ -6190,10 +6912,6 @@ msgstr "Pour confirmer, veuillez entrer l'adresse e-mail du compte <0/>({0})."
 msgid "To confirm, please enter the reason"
 msgstr "Pour confirmer, veuillez entrer la raison"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "To decline this invitation you must create an account."
-msgstr "Pour décliner cette invitation, vous devez créer un compte."
-
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "To enable two-factor authentication, scan the following QR code using your authenticator app."
 msgstr "Pour activer l'authentification à deux facteurs, scannez le code QR suivant à l'aide de votre application d'authentification."
@@ -6222,11 +6940,11 @@ msgstr "Pour utiliser notre service de signature électronique, vous devez avoir
 msgid "To view this document you need to be signed into your account, please sign in to continue."
 msgstr "Pour afficher ce document, vous devez être connecté à votre compte, veuillez vous connecter pour continuer."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Toggle the switch to hide your profile from the public."
 msgstr "Basculer l'interrupteur pour cacher votre profil du public."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Toggle the switch to show your profile to the public."
 msgstr "Basculer l'interrupteur pour afficher votre profil au public."
 
@@ -6246,7 +6964,7 @@ msgstr "Token créé"
 msgid "Token deleted"
 msgstr "Token supprimé"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Token doesn't have an expiration date"
 msgstr "Le token n'a pas de date d'expiration"
 
@@ -6282,26 +7000,7 @@ msgstr "Total des signataires qui se sont inscrits"
 msgid "Total Users"
 msgstr "Total des utilisateurs"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "transfer {teamName}"
-msgstr "transférer {teamName}"
-
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Transfer ownership of this team to a selected team member."
-msgstr "Transférer la propriété de cette équipe à un membre d'équipe sélectionné."
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Transfer team"
-msgstr "Transférer l'équipe"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-msgid "Transfer the ownership of the team to another team member."
-msgstr "Transférer la propriété de l'équipe à un autre membre de l'équipe."
-
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Triggers"
 msgstr "Déclencheurs"
@@ -6368,11 +7067,11 @@ msgstr "Impossible de copier le token"
 msgid "Unable to create direct template access. Please try again later."
 msgstr "Impossible de créer un accès direct au modèle. Veuillez réessayer plus tard."
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Unable to decline this team invitation at this time."
-msgstr "Impossible de refuser cette invitation d'équipe pour le moment."
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Unable to decline this invitation at this time."
+msgstr ""
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Unable to delete invitation. Please try again."
 msgstr "Impossible de supprimer l'invitation. Veuillez réessayer."
 
@@ -6384,9 +7083,9 @@ msgstr "Impossible de supprimer l'équipe"
 msgid "Unable to disable two-factor authentication"
 msgstr "Impossible de désactiver l'authentification à deux facteurs"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Unable to join this team at this time."
-msgstr "Impossible de rejoindre cette équipe pour le moment."
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Unable to join this organisation at this time."
+msgstr ""
 
 #: apps/remix/app/components/general/document/document-page-view-recent-activity.tsx
 #: apps/remix/app/components/general/document/document-history-sheet.tsx
@@ -6409,7 +7108,7 @@ msgstr "Impossible de retirer la vérification par e-mail pour le moment. Veuill
 msgid "Unable to remove team email at this time. Please try again."
 msgstr "Impossible de retirer l'e-mail de l'équipe pour le moment. Veuillez réessayer."
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Unable to resend invitation. Please try again."
 msgstr "Impossible de renvoyer l'invitation. Veuillez réessayer."
 
@@ -6431,7 +7130,10 @@ msgstr "Impossible de configurer l'authentification à deux facteurs"
 msgid "Unable to sign in"
 msgstr "Impossible de se connecter"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 msgid "Unauthorized"
 msgstr "Non autorisé"
@@ -6445,22 +7147,35 @@ msgstr "Non complet"
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "Unpaid"
-msgstr "Non payé"
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "Unlimited"
+msgstr ""
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Unlimited documents, API and more"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Untitled Group"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Update"
@@ -6470,10 +7185,31 @@ msgstr "Mettre à jour"
 msgid "Update Banner"
 msgstr "Mettre à jour la bannière"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Update Billing"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Update Claim"
+msgstr ""
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Update current organisation"
+msgstr ""
+
 #: apps/remix/app/components/general/legacy-field-warning-popover.tsx
 msgid "Update Fields"
 msgstr "Mettre à jour les champs"
 
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Update organisation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "Update organisation member"
+msgstr ""
+
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "Update passkey"
 msgstr "Mettre à jour la clé d'accès"
@@ -6492,10 +7228,16 @@ msgstr "Mettre à jour le profil"
 msgid "Update Recipient"
 msgstr "Mettre à jour le destinataire"
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
 msgid "Update role"
 msgstr "Mettre à jour le rôle"
 
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Update Subscription Claim"
+msgstr ""
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 msgid "Update team"
 msgstr "Mettre à jour l'équipe"
@@ -6505,6 +7247,11 @@ msgstr "Mettre à jour l'équipe"
 msgid "Update team email"
 msgstr "Mettre à jour l'e-mail de l'équipe"
 
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "Update team group"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 msgid "Update team member"
@@ -6519,7 +7266,6 @@ msgid "Update user"
 msgstr "Mettre à jour l'utilisateur"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Update webhook"
 msgstr "Mettre à jour le webhook"
 
@@ -6536,6 +7282,11 @@ msgstr "Mise à jour de vos informations"
 msgid "Upgrade"
 msgstr "Améliorer"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Upgrade <0>{0}</0> to {planName}"
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
 msgid "Upgrade your plan to upload more documents"
 msgstr "Mettez à niveau votre plan pour importer plus de documents"
@@ -6583,7 +7334,7 @@ msgstr "Importer une signature"
 msgid "Upload Template Document"
 msgstr "Importer le document modèle"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Upload your brand logo (max 5MB, JPG, PNG, or WebP)"
 msgstr "Téléchargez votre logo de marque (max 5 Mo, JPG, PNG ou WebP)"
 
@@ -6608,8 +7359,7 @@ msgstr "Le fichier importé n'est pas un type de fichier autorisé"
 msgid "Uploading document..."
 msgstr "Importation du document..."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Use"
 msgstr "Utiliser"
 
@@ -6627,6 +7377,10 @@ msgstr "Utiliser le code de secours"
 msgid "Use Template"
 msgstr "Utiliser le modèle"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Use your passkey for authentication"
+msgstr ""
+
 #: apps/remix/app/components/tables/internal-audit-log-table.tsx
 #: apps/remix/app/components/tables/document-logs-table.tsx
 msgid "User"
@@ -6636,9 +7390,9 @@ msgstr "Utilisateur"
 msgid "User has no password."
 msgstr "L'utilisateur n'a pas de mot de passe."
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "User ID"
-msgstr "ID utilisateur"
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "User not found"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
@@ -6646,6 +7400,10 @@ msgstr "ID utilisateur"
 msgid "User not found."
 msgstr "Utilisateur non trouvé."
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "User Organisations"
+msgstr ""
+
 #: apps/remix/app/components/forms/signup.tsx
 msgid "User profiles are here!"
 msgstr "Les profils des utilisateurs sont ici !"
@@ -6658,10 +7416,6 @@ msgstr "Paramètres de l'utilisateur"
 msgid "User with this email already exists. Please use a different email address."
 msgstr "Un utilisateur avec cet e-mail existe déjà. Veuillez utiliser une adresse e-mail différente."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Username can only container alphanumeric characters and dashes."
-msgstr "Le nom d'utilisateur ne peut contenir que des caractères alphanumériques et des tirets."
-
 #: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
 msgid "Users"
 msgstr "Utilisateurs"
@@ -6709,12 +7463,15 @@ msgstr "Vérifiez votre adresse e-mail d'équipe"
 msgid "Version History"
 msgstr "Historique des versions"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/document/document-page-view-button.tsx
 #: apps/remix/app/components/forms/2fa/view-recovery-codes-dialog.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "View"
 msgstr "Voir"
@@ -6764,7 +7521,7 @@ msgstr "Voir le document"
 msgid "View documents associated with this email"
 msgstr "Voir les documents associés à cet e-mail"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "View invites"
 msgstr "Voir les invitations"
 
@@ -6772,10 +7529,18 @@ msgstr "Voir les invitations"
 msgid "View more"
 msgstr "Voir plus"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "View next document"
+msgstr ""
+
 #: apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
 msgid "View Original Document"
 msgstr "Voir le document original"
 
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "View owner"
+msgstr ""
+
 #: packages/email/template-components/template-document-self-signed.tsx
 msgid "View plans"
 msgstr "Voir les forfaits"
@@ -6791,6 +7556,7 @@ msgstr "Voir les équipes"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "Viewed"
 msgstr "Vu"
@@ -6845,9 +7611,8 @@ msgstr "Vous voulez votre propre profil public ?"
 msgid "Warning: Assistant as last signer"
 msgstr "Avertissement : Assistant comme dernier signataire"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "We are unable to proceed to the billing portal at this time. Please try again, or contact support."
 msgstr "Nous ne pouvons pas accéder au portail de facturation pour le moment. Veuillez réessayer ou contacter le support."
 
@@ -6859,19 +7624,45 @@ msgstr "Nous ne pouvons pas supprimer cette clé de passkey pour le moment. Veui
 msgid "We are unable to update this passkey at the moment. Please try again later."
 msgstr "Nous ne pouvons pas mettre à jour cette clé de passkey pour le moment. Veuillez réessayer plus tard."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "We couldn't create a Stripe customer. Please try again."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "We couldn't update the group. Please try again."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "We couldn't update the organisation. Please try again."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "We encountered an error while removing the direct template link. Please try again later."
 msgstr "Une erreur s'est produite lors de la suppression du lien direct vers le modèle. Veuillez réessayer plus tard."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "We encountered an error while updating the webhook. Please try again later."
 msgstr "Une erreur s'est produite lors de la mise à jour du webhook. Veuillez réessayer plus tard."
 
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to add team members. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 msgid "We encountered an unknown error while attempting to add this email. Please try again later."
 msgstr "Une erreur inconnue s'est produite lors de l'ajout de cet e-mail. Veuillez réessayer plus tard."
 
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to create a group. Please try again later."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to create a organisation. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "We encountered an unknown error while attempting to create a team. Please try again later."
 msgstr "Une erreur inconnue s'est produite lors de la création d'une équipe. Veuillez réessayer plus tard."
@@ -6880,9 +7671,9 @@ msgstr "Une erreur inconnue s'est produite lors de la création d'une équipe. V
 msgid "We encountered an unknown error while attempting to delete it. Please try again later."
 msgstr "Une erreur inconnue s'est produite lors de la suppression. Veuillez réessayer plus tard."
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "We encountered an unknown error while attempting to delete the pending team. Please try again later."
-msgstr "Une erreur inconnue s'est produite lors de la suppression de l'équipe en attente. Veuillez réessayer plus tard."
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "We encountered an unknown error while attempting to delete this organisation. Please try again later."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "We encountered an unknown error while attempting to delete this team. Please try again later."
@@ -6896,30 +7687,36 @@ msgstr "Une erreur inconnue s'est produite lors de la suppression de ce token. V
 msgid "We encountered an unknown error while attempting to delete your account. Please try again later."
 msgstr "Une erreur inconnue s'est produite lors de la suppression de votre compte. Veuillez réessayer plus tard."
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "We encountered an unknown error while attempting to invite team members. Please try again later."
-msgstr "Une erreur inconnue s'est produite lors de l'invitation de membres de l'équipe. Veuillez réessayer plus tard."
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "We encountered an unknown error while attempting to disable access."
+msgstr ""
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "We encountered an unknown error while attempting to leave this team. Please try again later."
-msgstr "Une erreur inconnue s'est produite lors de votre départ de cette équipe. Veuillez réessayer plus tard."
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "We encountered an unknown error while attempting to enable access."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "We encountered an unknown error while attempting to invite organisation members. Please try again later."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "We encountered an unknown error while attempting to leave this organisation. Please try again later."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "We encountered an unknown error while attempting to remove this group. Please try again later."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "We encountered an unknown error while attempting to remove this template from your profile. Please try again later."
 msgstr "Une erreur inconnue s'est produite lors de la suppression de ce modèle de votre profil. Veuillez réessayer plus tard."
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "We encountered an unknown error while attempting to remove this transfer. Please try again or contact support."
-msgstr "Une erreur inconnue s'est produite lors de la suppression de ce transfert. Veuillez réessayer ou contacter le support."
-
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
 msgid "We encountered an unknown error while attempting to remove this user. Please try again later."
 msgstr "Une erreur inconnue s'est produite lors de la suppression de cet utilisateur. Veuillez réessayer plus tard."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "We encountered an unknown error while attempting to request a transfer of this team. Please try again later."
-msgstr "Une erreur inconnue s'est produite lors de la demande de transfert de cette équipe. Veuillez réessayer plus tard."
-
 #: apps/remix/app/components/forms/reset-password.tsx
 msgid "We encountered an unknown error while attempting to reset your password. Please try again later."
 msgstr "Une erreur inconnue s'est produite lors de la réinitialisation de votre mot de passe. Veuillez réessayer plus tard."
@@ -6946,10 +7743,19 @@ msgstr "Une erreur inconnue s'est produite lors de la mise à jour de la banniè
 msgid "We encountered an unknown error while attempting to update the template. Please try again later."
 msgstr "Une erreur inconnue s'est produite lors de la mise à jour du modèle. Veuillez réessayer plus tard."
 
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "We encountered an unknown error while attempting to update this organisation member. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
 msgid "We encountered an unknown error while attempting to update this team member. Please try again later."
 msgstr "Une erreur inconnue s'est produite lors de la mise à jour de ce membre de l'équipe. Veuillez réessayer plus tard."
 
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "We encountered an unknown error while attempting to update your organisation. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/forms/password.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 msgid "We encountered an unknown error while attempting to update your password. Please try again later."
@@ -6975,10 +7781,6 @@ msgstr "Nous avons rencontré une erreur inconnue lors de la tentative de mise 
 msgid "We have sent a confirmation email for verification."
 msgstr "Nous avons envoyé un e-mail de confirmation pour vérification."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "We need a username to create your profile"
-msgstr "Nous avons besoin d'un nom d'utilisateur pour créer votre profil"
-
 #: apps/remix/app/components/forms/signup.tsx
 msgid "We need your signature to sign documents"
 msgstr "Nous avons besoin de votre signature pour signer des documents"
@@ -6991,10 +7793,6 @@ msgstr "Nous n'avons pas pu copier le token dans votre presse-papiers. Veuillez
 msgid "We were unable to copy your recovery code to your clipboard. Please try again."
 msgstr "Nous n'avons pas pu copier votre code de récupération dans votre presse-papiers. Veuillez réessayer."
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "We were unable to create a checkout session. Please try again, or contact support"
-msgstr "Nous n'avons pas pu créer de session de paiement. Veuillez réessayer ou contacter le support"
-
 #: apps/remix/app/components/forms/signup.tsx
 msgid "We were unable to create your account. Please review the information you provided and try again."
 msgstr "Nous n'avons pas pu créer votre compte. Veuillez vérifier les informations que vous avez fournies et réessayer."
@@ -7009,7 +7807,7 @@ msgstr "Nous n'avons pas pu désactiver l'authentification à deux facteurs pour
 msgid "We were unable to log you out at this time."
 msgstr "Nous n'avons pas pu vous déconnecter pour le moment."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "We were unable to set your public profile to public. Please try again."
 msgstr "Nous n'avons pas pu définir votre profil public comme public. Veuillez réessayer."
 
@@ -7024,14 +7822,17 @@ msgstr "Nous n'avons pas pu configurer l'authentification à deux facteurs pour
 msgid "We were unable to submit this document at this time. Please try again later."
 msgstr "Nous n'avons pas pu soumettre ce document pour le moment. Veuillez réessayer plus tard."
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "We were unable to update your branding preferences at this time, please try again later"
 msgstr "Nous n'avons pas pu mettre à jour vos préférences de branding pour le moment, veuillez réessayer plus tard"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "We were unable to update your document preferences at this time, please try again later"
 msgstr "Nous n'avons pas pu mettre à jour vos préférences de document pour le moment, veuillez réessayer plus tard"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 msgid "We were unable to verify your details. Please try again or contact support"
 msgstr "Nous n'avons pas pu vérifier vos détails. Veuillez réessayer ou contacter le support"
@@ -7057,8 +7858,8 @@ msgstr "Nous allons générer des liens de signature pour vous, que vous pouvez
 msgid "We won't send anything to notify recipients."
 msgstr "Nous n'enverrons rien pour notifier les destinataires."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "We're all empty"
 msgstr "Nous sommes tous vides"
@@ -7084,17 +7885,14 @@ msgid "Webhook deleted"
 msgstr "Webhook supprimé"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Webhook updated"
 msgstr "Webhook mis à jour"
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Webhook URL"
 msgstr "URL du webhook"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -7102,10 +7900,6 @@ msgstr "URL du webhook"
 msgid "Webhooks"
 msgstr "Webhooks"
 
-#: apps/remix/app/components/general/billing-plans.tsx
-msgid "Weekly"
-msgstr "Hebdomadaire"
-
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Welcome"
 msgstr "Bienvenue"
@@ -7114,6 +7908,10 @@ msgstr "Bienvenue"
 msgid "Welcome back, we are lucky to have you."
 msgstr "Contentieux, nous avons de la chance de vous avoir."
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Welcome back! Here's an overview of your account."
+msgstr ""
+
 #: packages/email/template-components/template-confirmation-email.tsx
 msgid "Welcome to Documenso!"
 msgstr "Bienvenue sur Documenso !"
@@ -7122,6 +7920,10 @@ msgstr "Bienvenue sur Documenso !"
 msgid "Were you trying to edit this document instead?"
 msgstr "Essayiez-vous d'éditer ce document à la place ?"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "What you can do with teams:"
+msgstr ""
+
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
 #: packages/ui/primitives/document-flow/add-signers.tsx
@@ -7144,6 +7946,10 @@ msgstr "Lorsque vous utilisez notre plateforme pour apposer votre signature éle
 msgid "While waiting for them to do so you can create your own Documenso account and get started with document signing right away."
 msgstr "En attendant qu'ils le fassent, vous pouvez créer votre propre compte Documenso et commencer à signer des documents dès maintenant."
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Whitelabeling, unlimited members and more"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 msgid "Who do you want to remind?"
 msgstr "Qui voulez-vous rappeler ?"
@@ -7153,18 +7959,19 @@ msgid "Withdrawing Consent"
 msgstr "Retrait du consentement"
 
 #: apps/remix/app/components/forms/public-profile-form.tsx
-msgid "Write about the team"
-msgstr "Écrivez sur l'équipe"
+msgid "Write a description to display on your public profile"
+msgstr ""
 
-#: apps/remix/app/components/forms/public-profile-form.tsx
-msgid "Write about yourself"
-msgstr "Écrivez sur vous-même"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Yearly"
 msgstr "Annuel"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Yes"
+msgstr ""
+
 #: apps/remix/app/components/general/template/template-page-view-information.tsx
 #: apps/remix/app/components/general/document/document-page-view-information.tsx
 #: packages/lib/utils/document-audit-logs.ts
@@ -7175,17 +7982,42 @@ msgstr "Vous"
 msgid "You are about to delete <0>\"{documentTitle}\"</0>"
 msgstr "Vous êtes sur le point de supprimer <0>\"{documentTitle}\"</0>"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "You are about to delete <0>{0}</0>. All data related to this organisation such as teams, documents, and all other resources will be deleted. This action is irreversible."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 msgid "You are about to delete the following team email from <0>{teamName}</0>."
 msgstr "Vous êtes sur le point de supprimer l'e-mail d'équipe suivant de <0>{teamName}</0>."
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "You are about to give all organisation members access to this team under their organisation role."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "You are about to hide <0>\"{documentTitle}\"</0>"
 msgstr "Vous êtes sur le point de cacher <0>\"{documentTitle}\"</0>"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "You are about to leave the following team."
-msgstr "Vous êtes sur le point de quitter l'équipe suivante."
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "You are about to leave the following organisation."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "You are about to remove default access to this team for all organisation members. Any members not explicitly added to this team will no longer have access."
+msgstr ""
+
+#. placeholder {0}: team.name
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "You are about to remove the following group from <0>{0}</0>."
+msgstr ""
+
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "You are about to remove the following user from <0>{0}</0>."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "You are about to remove the following user from <0>{teamName}</0>."
@@ -7201,21 +8033,38 @@ msgstr "Vous êtes sur le point de révoquer l'accès de l'équipe <0>{0}</0> ({
 msgid "You are about to send this document to the recipients. Are you sure you want to continue?"
 msgstr "Vous êtes sur le point d'envoyer ce document aux destinataires. Êtes-vous sûr de vouloir continuer ?"
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "You are about to subscribe to the {planName}"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
 msgid "You are currently on the <0>Free Plan</0>."
 msgstr "Vous êtes actuellement sur l'<0>Abonnement Gratuit</0>."
 
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-msgid "You are currently updating <0>{teamMemberName}.</0>"
-msgstr "Vous mettez à jour actuellement <0>{teamMemberName}.</0>"
+msgid "You are currently updating <0>{memberName}.</0>"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You are currently updating <0>{organisationMemberName}.</0>"
+msgstr ""
 
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "You are currently updating the <0>{passkeyName}</0> passkey."
 msgstr "Vous mettez à jour actuellement la clé de passkey <0>{passkeyName}</0>."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "You are not a member of this team."
-msgstr "Vous n'êtes pas membre de cette équipe."
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You are currently updating the <0>{teamGroupName}</0> team group."
+msgstr ""
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "You are currently updating your \"Personal\" organisation to a plan where you can add multiple members. These members may have access to the documents, templates and other data in this organisation, including documents sent to you."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+msgid "You are not authorized to access this page."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx
 msgid "You are not authorized to delete this user."
@@ -7233,18 +8082,18 @@ msgstr "Vous n'êtes pas autorisé à activer cet utilisateur."
 msgid "You can also copy and paste this link into your browser: {confirmationLink} (link expires in 1 hour)"
 msgstr "Vous pouvez également copier et coller ce lien dans votre navigateur : {confirmationLink} (le lien expire dans 1 heure)"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You can choose to enable or disable your profile for public view."
-msgstr "Vous pouvez choisir d'activer ou de désactiver votre profil pour la vue publique."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You can choose to enable or disable your team profile for public view."
-msgstr "Vous pouvez choisir d'activer ou de désactiver le profil de votre équipe pour la vue publique."
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
+msgid "You can choose to enable or disable the profile for public view."
+msgstr ""
 
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 msgid "You can copy and share these links to recipients so they can action the document."
 msgstr "Vous pouvez copier et partager ces liens avec les destinataires afin qu'ils puissent agir sur le document."
 
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "You can enable access to allow all organisation members to access this team by default."
+msgstr ""
+
 #: packages/email/templates/confirm-team-email.tsx
 msgid "You can revoke access at any time in your team settings on Documenso <0>here.</0>"
 msgstr "Vous pouvez révoquer l'accès à tout moment dans les paramètres de votre équipe sur Documenso <0>ici.</0>"
@@ -7274,14 +8123,30 @@ msgstr "Vous pouvez voir le document et son statut en cliquant sur le bouton ci-
 msgid "You cannot add assistants when signing order is disabled."
 msgstr "Vous ne pouvez pas ajouter d'assistants lorsque l'ordre de signature est désactivé."
 
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "You cannot delete a group which has a higher role than you."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "You cannot have more than {MAXIMUM_PASSKEYS} passkeys."
 msgstr "Vous ne pouvez pas avoir plus de {MAXIMUM_PASSKEYS} clés de passkey."
 
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You cannot modify a group which has a higher role than you."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You cannot modify a organisation member who has a higher role than you."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 msgid "You cannot modify a team member who has a higher role than you."
 msgstr "Vous ne pouvez pas modifier un membre de l'équipe qui a un rôle plus élevé que vous."
 
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+msgid "You cannot remove members from this team if the inherit member feature is enabled."
+msgstr ""
+
 #: packages/ui/primitives/document-upload.tsx
 #: packages/ui/primitives/document-dropzone.tsx
 msgid "You cannot upload documents at this time."
@@ -7292,9 +8157,13 @@ msgstr "Vous ne pouvez pas importer de documents pour le moment."
 msgid "You cannot upload encrypted PDFs"
 msgstr "Vous ne pouvez pas importer de PDF cryptés"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-msgid "You do not currently have a customer record, this should not happen. Please contact support for assistance."
-msgstr "Vous n'avez actuellement pas de dossier client, cela ne devrait pas se produire. Veuillez contacter le support pour obtenir de l'aide."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "You currently have an inactive <0>{currentProductName}</0> subscription"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "You currently have no access to any teams within this organisation. Please contact your organisation to request access."
+msgstr ""
 
 #: apps/remix/app/components/forms/token.tsx
 msgid "You do not have permission to create a token for this team"
@@ -7304,50 +8173,43 @@ msgstr "Vous n'avez pas la permission de créer un jeton pour cette équipe"
 msgid "You don't need to sign it anymore."
 msgstr "Vous n'avez plus besoin de le signer."
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-msgid "You have accepted an invitation from <0>{0}</0> to join their team."
-msgstr "Vous avez accepté une invitation de <0>{0}</0> pour rejoindre leur équipe."
-
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "You have already completed the ownership transfer for <0>{0}</0>."
-msgstr "Vous avez déjà terminé le transfert de propriété pour <0>{0}</0>."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "You have accepted an invitation from <0>{0}</0> to join their organisation."
+msgstr ""
 
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "You have already verified your email address for <0>{0}</0>."
 msgstr "Vous avez déjà vérifié votre adresse e-mail pour <0>{0}</0>."
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "You have been invited by <0>{0}</0> to join their team."
-msgstr "Vous avez été invité par <0>{0}</0> à rejoindre leur équipe."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "You have been invited by <0>{0}</0> to join their organisation."
+msgstr ""
 
-#. placeholder {0}: team.name
-#: packages/lib/server-only/team/create-team-member-invites.ts
+#. placeholder {0}: organisation.name
+#: packages/lib/server-only/organisation/create-organisation-member-invites.ts
 msgid "You have been invited to join {0} on Documenso"
 msgstr "Vous avez été invité à rejoindre {0} sur Documenso"
 
-#: packages/email/templates/team-invite.tsx
-msgid "You have been invited to join the following team"
-msgstr "Vous avez été invité à rejoindre l'équipe suivante"
+#: packages/email/templates/organisation-invite.tsx
+msgid "You have been invited to join the following organisation"
+msgstr ""
 
 #: packages/lib/server-only/recipient/set-document-recipients.ts
 #: packages/lib/server-only/recipient/delete-document-recipient.ts
 msgid "You have been removed from a document"
 msgstr "Vous avez été supprimé d'un document"
 
-#. placeholder {0}: team.name
-#: packages/lib/server-only/team/request-team-ownership-transfer.ts
-msgid "You have been requested to take ownership of team {0} on Documenso"
-msgstr "On vous a demandé de prendre possession de l'équipe {0} sur Documenso"
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "You have been requested to sign the following documents. Review each document carefully and complete the signing process."
+msgstr ""
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "You have declined the invitation from <0>{0}</0> to join their team."
-msgstr "Vous avez décliné l'invitation de <0>{0}</0> pour rejoindre leur équipe."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
+msgid "You have declined the invitation from <0>{0}</0> to join their organisation."
+msgstr ""
 
 #. placeholder {0}: `"${document.title}"`
 #: packages/lib/server-only/document/resend-document.tsx
@@ -7356,12 +8218,11 @@ msgid "You have initiated the document {0} that requires you to {recipientAction
 msgstr "Vous avez initié le document {0} qui nécessite que vous {recipientActionVerb} celui-ci."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "You have no webhooks yet. Your webhooks will be shown here once you create them."
 msgstr "Vous n'avez pas encore de webhooks. Vos webhooks seront affichés ici une fois que vous les aurez créés."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
 msgid "You have not yet created any templates. To create a template please upload one."
 msgstr "Vous n'avez pas encore créé de modèles. Pour créer un modèle, veuillez en importer un."
 
@@ -7374,6 +8235,10 @@ msgstr "Vous n'avez pas encore créé ou reçu de documents. Pour créer un docu
 msgid "You have reached the maximum limit of {0} direct templates. <0>Upgrade your account to continue!</0>"
 msgstr "Vous avez atteint la limite maximale de {0} modèles directs. <0>Mettez à niveau votre compte pour continuer !</0>"
 
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
+msgid "You have reached the maximum number of teams for your plan. Please contact sales at <0>support@documenso.com</0> if you would like to adjust your plan."
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-upload.tsx
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
 msgid "You have reached your document limit for this month. Please upgrade your plan."
@@ -7401,15 +8266,27 @@ msgstr "Vous avez rejeté ce document"
 msgid "You have signed “{documentName}”"
 msgstr "Vous avez signé “{documentName}”"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "You have successfully left this team."
-msgstr "Vous avez quitté cette équipe avec succès."
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "You have successfully left this organisation."
+msgstr ""
 
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/signup.tsx
 msgid "You have successfully registered. Please verify your account by clicking on the link you received in the email."
 msgstr "Vous vous êtes inscrit avec succès. Veuillez vérifier votre compte en cliquant sur le lien que vous avez reçu dans l'e-mail."
 
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "You have successfully removed this group from the organisation."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "You have successfully removed this group from the team."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "You have successfully removed this user from the organisation."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "You have successfully removed this user from the team."
 msgstr "Vous avez retiré cet utilisateur de l'équipe avec succès."
@@ -7423,38 +8300,35 @@ msgid "You have the right to withdraw your consent to use electronic signatures
 msgstr "Vous avez le droit de retirer votre consentement à l'utilisation des signatures électroniques à tout moment avant de terminer le processus de signature. Pour retirer votre consentement, veuillez contacter l'expéditeur du document. Si vous ne contactez pas l'expéditeur, vous pouvez contacter <0>{SUPPORT_EMAIL}</0> pour obtenir de l'aide. Sachez que le retrait de consentement peut retarder ou arrêter l'achèvement de la transaction ou du service associé."
 
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-msgid "You have updated {teamMemberName}."
-msgstr "Vous avez mis à jour {teamMemberName}."
+msgid "You have updated {memberName}."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You have updated {organisationMemberName}."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You have updated the team group."
+msgstr ""
 
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "You have verified your email address for <0>{0}</0>."
 msgstr "Vous avez vérifié votre adresse e-mail pour <0>{0}</0>."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "You must be an admin of this team to manage billing."
-msgstr "Vous devez être un administrateur de cette équipe pour gérer la facturation."
-
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 msgid "You must enter '{deleteMessage}' to proceed"
 msgstr "Vous devez entrer '{deleteMessage}' pour continuer"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "You must have at least one other team member to transfer ownership."
-msgstr "Vous devez avoir au moins un autre membre de l'équipe pour transférer la propriété."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You must set a profile URL before enabling your public profile."
-msgstr "Vous devez définir une URL de profil avant d'activer votre profil public."
-
 #: apps/remix/app/components/dialogs/template-folder-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/folder-delete-dialog.tsx
 msgid "You must type '{deleteMessage}' to confirm"
 msgstr "Vous devez taper '{deleteMessage}' pour confirmer"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "You need to be an admin to manage API tokens."
 msgstr "Vous devez être administrateur pour gérer les tokens API."
 
@@ -7470,9 +8344,9 @@ msgstr "Vous devez être connecté pour voir cette page."
 msgid "You need to setup 2FA to mark this document as viewed."
 msgstr "Vous devez configurer 2FA pour marquer ce document comme vu."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "You will get notified & be able to set up your documenso public profile when we launch the feature."
-msgstr "Vous serez notifié et pourrez configurer votre profil public Documenso lorsque nous lancerons la fonctionnalité."
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "You will need to configure any claims or subscription after creating this organisation"
+msgstr ""
 
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "You will now be required to enter a code from your authenticator app when signing in."
@@ -7494,11 +8368,12 @@ msgstr "Votre avatar a été mis à jour avec succès."
 msgid "Your banner has been updated successfully."
 msgstr "Votre bannière a été mise à jour avec succès."
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Your brand website URL"
 msgstr "L'URL de votre site web de marque"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Your branding preferences have been updated"
 msgstr "Vos préférences de branding ont été mises à jour"
 
@@ -7510,9 +8385,17 @@ msgstr "Votre envoi groupé a été initié. Vous recevrez une notification par
 msgid "Your bulk send operation for template \"{templateName}\" has completed."
 msgstr "Votre envoi groupé pour le modèle \"{templateName}\" est terminé."
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
-msgid "Your current plan is past due. Please update your payment information."
-msgstr "Votre abonnement actuel est arrivé à échéance. Veuillez mettre à jour vos informations de paiement."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current {currentProductName} plan is past due. Please update your payment information."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current plan is inactive."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current plan is past due."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Your direct signing templates"
@@ -7557,7 +8440,8 @@ msgstr "Votre document a été importé avec succès."
 msgid "Your document has been uploaded successfully. You will be redirected to the template page."
 msgstr "Votre document a été importé avec succès. Vous serez redirigé vers la page de modèle."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Your document preferences have been updated"
 msgstr "Vos préférences de document ont été mises à jour"
 
@@ -7579,7 +8463,7 @@ msgstr "Votre e-mail a été confirmé avec succès ! Vous pouvez maintenant uti
 msgid "Your email is currently being used by team <0>{0}</0> ({1})."
 msgstr "Votre e-mail est actuellement utilisé par l'équipe <0>{0}</0> ({1})."
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Your existing tokens"
 msgstr "Vos tokens existants"
 
@@ -7588,6 +8472,18 @@ msgstr "Vos tokens existants"
 msgid "Your new password cannot be the same as your old password."
 msgstr "Ton nouveau mot de passe ne peut pas être le même que l'ancien."
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Your organisation has been created."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "Your organisation has been successfully deleted."
+msgstr ""
+
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Your organisation has been successfully updated."
+msgstr ""
+
 #: apps/remix/app/components/forms/reset-password.tsx
 #: apps/remix/app/components/forms/password.tsx
 msgid "Your password has been updated successfully."
@@ -7597,10 +8493,18 @@ msgstr "Votre mot de passe a été mis à jour avec succès."
 msgid "Your password has been updated."
 msgstr "Votre mot de passe a été mis à jour."
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Your payment for teams is overdue. Please settle the payment to avoid any service disruptions."
 msgstr "Votre paiement pour les équipes est en retard. Veuillez régler le paiement pour éviter toute interruption de service."
 
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+msgid "Your personal organisation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Your plan does not support inviting members. Please upgrade or your plan or contact sales at <0>support@documenso.com</0> if you would like to discuss your options."
+msgstr ""
+
 #: apps/remix/app/components/forms/profile.tsx
 msgid "Your profile has been updated successfully."
 msgstr "Votre profil a été mis à jour avec succès."
@@ -7622,19 +8526,10 @@ msgstr "Votre code de récupération a été copié dans votre presse-papiers."
 msgid "Your recovery codes are listed below. Please store them in a safe place."
 msgstr "Vos codes de récupération sont listés ci-dessous. Veuillez les conserver dans un endroit sûr."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Your subscription is currently active."
-msgstr "Votre abonnement est actuellement actif."
-
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Your team has been created."
 msgstr "Votre équipe a été créée."
 
-#: packages/email/templates/team-delete.tsx
-#: packages/email/templates/team-delete.tsx
-msgid "Your team has been deleted"
-msgstr "Votre équipe a été supprimée"
-
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Your team has been successfully deleted."
 msgstr "Votre équipe a été supprimée avec succès."
@@ -7671,7 +8566,7 @@ msgstr "Votre token a expiré !"
 msgid "Your token was created successfully! Make sure to copy it because you won't be able to see it again!"
 msgstr "Votre token a été créé avec succès ! Assurez-vous de le copier car vous ne pourrez plus le voir !"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Your tokens will be shown here once you create them."
 msgstr "Vos tokens seront affichés ici une fois que vous les aurez créés."
 
diff --git a/packages/lib/translations/it/web.po b/packages/lib/translations/it/web.po
index 3242c07a5..69cd00480 100644
--- a/packages/lib/translations/it/web.po
+++ b/packages/lib/translations/it/web.po
@@ -22,19 +22,10 @@ msgstr ""
 msgid " Enable direct link signing"
 msgstr " Abilita la firma tramite link diretto"
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
-msgid " The events that will trigger a webhook to be sent to your URL."
-msgstr " Gli eventi che attiveranno un webhook da inviare al tuo URL."
-
 #: apps/remix/app/components/embed/authoring/configure-document-upload.tsx
 msgid ".PDF documents accepted (max {APP_DOCUMENT_UPLOAD_SIZE_LIMIT}MB)"
 msgstr ".I documenti PDF accettati (max {APP_DOCUMENT_UPLOAD_SIZE_LIMIT}MB)"
 
-#. placeholder {0}: team.name
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-msgid "\"{0}\" has invited you to sign \"example document\"."
-msgstr "\"{0}\" ti ha invitato a firmare \"documento di esempio\"."
-
 #. placeholder {0}: field.customText
 #. placeholder {1}: timezone || ''
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
@@ -57,10 +48,13 @@ msgstr "“{documentName}” è stato firmato da tutti i firmatari"
 msgid "\"{documentTitle}\" has been successfully deleted"
 msgstr "\"{documentTitle}\" è stato eliminato con successo"
 
-#. placeholder {0}: team.name
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-msgid "\"{placeholderEmail}\" on behalf of \"{0}\" has invited you to sign \"example document\"."
-msgstr "\"{placeholderEmail}\" per conto di \"{0}\" ti ha invitato a firmare \"documento di esempio\"."
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "\"{placeholderEmail}\" on behalf of \"Team Name\" has invited you to sign \"example document\"."
+msgstr ""
+
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "\"Team Name\" has invited you to sign \"example document\"."
+msgstr ""
 
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
@@ -83,16 +77,16 @@ msgstr "{0, plural, one {# carattere oltre il limite} other {# caratteri oltre i
 msgid "{0, plural, one {# recipient} other {# recipients}}"
 msgstr "{0, plural, one {# destinatario} other {# destinatari}}"
 
-#. placeholder {0}: row.original.quantity
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "{0, plural, one {# Seat} other {# Seats}}"
-msgstr "{0, plural, one {# posto} other {# posti}}"
+#. placeholder {0}: org.teams.length
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "{0, plural, one {# team} other {# teams}}"
+msgstr ""
 
 #. placeholder {0}: data.length
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "{0, plural, one {<0>You have <1>1</1> pending team invitation</0>} other {<2>You have <3>#</3> pending team invitations</2>}}"
-msgstr "{0, plural, one {<0>Hai <1>1</1> invito in sospeso alla squadra</0>} other {<2>Hai <3>#</3> inviti in sospeso alla squadra</2>}}"
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "{0, plural, one {<0>You have <1>1</1> pending invitation</0>} other {<2>You have <3>#</3> pending invitations</2>}}"
+msgstr ""
 
 #. placeholder {0}: autoSignableFields.filter((f) => f.type === fieldType).length
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
@@ -100,18 +94,18 @@ msgid "{0, plural, one {1 matching field} other {# matching fields}}"
 msgstr "{0, plural, one {1 campo corrispondente} other {# campi corrispondenti}}"
 
 #. placeholder {0}: recipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
 msgid "{0, plural, one {1 Recipient} other {# Recipients}}"
 msgstr "{0, plural, one {1 destinatario} other {# destinatari}}"
 
 #. placeholder {0}: pendingRecipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "{0, plural, one {Waiting on 1 recipient} other {Waiting on # recipients}}"
 msgstr "{0, plural, one {In attesa di 1 destinatario} other {In attesa di # destinatari}}"
 
+#. placeholder {0}: route.label
 #. placeholder {0}: _(FRIENDLY_FIELD_TYPE[fieldType as FieldType])
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
 msgid "{0}"
 msgstr ""
@@ -132,16 +126,6 @@ msgstr "{0} ti ha invitato a {recipientActionVerb} il documento \"{1}\"."
 msgid "{0} invited you to {recipientActionVerb} a document"
 msgstr "{0} ti ha invitato a {recipientActionVerb} un documento"
 
-#. placeholder {0}: memberName || memberEmail
-#: packages/email/templates/team-join.tsx
-msgid "{0} joined the team {teamName} on Documenso"
-msgstr "{0} si è unito al team {teamName} su Documenso"
-
-#. placeholder {0}: memberName || memberEmail
-#: packages/email/templates/team-leave.tsx
-msgid "{0} left the team {teamName} on Documenso"
-msgstr "{0} ha lasciato il team {teamName} su Documenso"
-
 #. placeholder {0}: remaining.documents
 #. placeholder {1}: quota.documents
 #: apps/remix/app/components/general/document/document-upload.tsx
@@ -163,11 +147,15 @@ msgid "{0} on behalf of \"{1}\" has invited you to {recipientActionVerb} the doc
 msgstr "{0} per conto di \"{1}\" ti ha invitato a {recipientActionVerb} il documento \"{2}\"."
 
 #. placeholder {0}: recipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "{0} Recipient(s)"
 msgstr "{0} Destinatario(i)"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "{0} Teams"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 msgid "{charactersRemaining, plural, one {1 character remaining} other {{charactersRemaining} characters remaining}}"
 msgstr "{charactersRemaining, plural, one {1 carattere rimanente} other {{charactersRemaining} caratteri rimanenti}}"
@@ -220,18 +208,6 @@ msgstr "{inviterName} per conto di \"{teamName}\" ti ha invitato a {0}<0/>\"{doc
 msgid "{inviterName} on behalf of \"{teamName}\" has invited you to {action} {documentName}"
 msgstr "{inviterName} per conto di \"{teamName}\" ti ha invitato a {action} {documentName}"
 
-#: packages/email/templates/team-join.tsx
-msgid "{memberEmail} joined the following team"
-msgstr "{memberEmail} si è unito al seguente team"
-
-#: packages/email/templates/team-leave.tsx
-msgid "{memberEmail} left the following team"
-msgstr "{memberEmail} ha lasciato il seguente team"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "{numberOfSeats, plural, one {# member} other {# members}}"
-msgstr "{numberOfSeats, plural, one {# membro} other {# membri}}"
-
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} added a field"
 msgstr "{prefix} ha aggiunto un campo"
@@ -377,10 +353,6 @@ msgstr "{teamName} ti ha invitato a {0}<0/>\"{documentName}\""
 msgid "{teamName} has invited you to {action} {documentName}"
 msgstr "{teamName} ti ha invitato a {action} {documentName}"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "{teamName} ownership transfer request"
-msgstr "richiesta di trasferimento di proprietà di {teamName}"
-
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{userName} approved the document"
 msgstr "{userName} ha approvato il documento"
@@ -414,10 +386,6 @@ msgstr "{visibleRows, plural, one {Visualizzazione di # risultato.} other {Visua
 msgid "<0>\"{0}\"</0>is no longer available to sign"
 msgstr "<0>\"{0}\"</0>non è più disponibile per la firma"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "<0>{senderName}</0> has requested that you take ownership of the following team"
-msgstr "<0>{senderName}</0> ha richiesto di prendere in carico il seguente team"
-
 #: packages/email/templates/confirm-team-email.tsx
 msgid "<0>{teamName}</0> has requested to use your email address for their team on Documenso."
 msgstr "<0>{teamName}</0> ha richiesto di utilizzare il tuo indirizzo email per il loro team su Documenso."
@@ -472,6 +440,10 @@ msgstr "<0>Richiede account</0> - Il destinatario deve essere connesso per visua
 msgid "<0>Require passkey</0> - The recipient must have an account and passkey configured via their settings"
 msgstr "<0>Richiede passkey</0> - Il destinatario deve avere un account e una passkey configurati tramite le sue impostazioni"
 
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "<0>Require password</0> - The recipient must have an account and password configured via their settings, the password will be verified during signing"
+msgstr ""
+
 #: apps/remix/app/components/tables/documents-table-sender-filter.tsx
 msgid "<0>Sender:</0> All"
 msgstr "<0>Mittente:</0> Tutti"
@@ -497,6 +469,14 @@ msgstr "<0>Stai per completare la firma di \"<1>{documentTitle}</1>\".</0><2/> S
 msgid "<0>You are about to complete viewing \"<1>{documentTitle}</1>\".</0><2/> Are you sure?"
 msgstr "<0>Stai per completare la visualizzazione di \"<1>{documentTitle}</1>\".</0><2/> Sei sicuro?"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "0 Free organisations left"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "1 Free organisations left"
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "1 month"
 msgstr "{VAR_PLURAL, select, one {1 mese} other {# mesi}}"
@@ -505,22 +485,53 @@ msgstr "{VAR_PLURAL, select, one {1 mese} other {# mesi}}"
 msgid "12 months"
 msgstr "{VAR_PLURAL, select, one {1 mese} other {12 mesi}}"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "2FA"
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "3 months"
 msgstr "{VAR_PLURAL, select, one {1 mese} other {3 mesi}}"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+msgid "401 Unauthorized"
+msgstr ""
+
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "404 not found"
 msgstr "404 non trovato"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "404 Organisation group not found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "404 Organisation not found"
+msgstr ""
+
 #: apps/remix/app/routes/_profile+/_layout.tsx
 msgid "404 Profile not found"
 msgstr "404 Profilo non trovato"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "404 Team not found"
 msgstr "404 Squadra non trovata"
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "404 User not found"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "5 documents a month"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "5 Documents a month"
+msgstr ""
+
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "500 Internal Server Error"
 msgstr "500 Errore Interno del Server"
@@ -565,9 +576,29 @@ msgstr "Un campo è stato aggiornato"
 msgid "A means to print or download documents for your records"
 msgstr "Un mezzo per stampare o scaricare documenti per i tuoi archivi"
 
-#: packages/lib/jobs/definitions/emails/send-team-member-joined-email.handler.ts
-msgid "A new member has joined your team"
-msgstr "Un nuovo membro si è unito al tuo team"
+#: packages/email/templates/organisation-join.tsx
+msgid "A member has joined your organisation on Documenso"
+msgstr ""
+
+#: packages/lib/jobs/definitions/emails/send-organisation-member-left-email.handler.ts
+msgid "A member has left your organisation"
+msgstr ""
+
+#: packages/email/templates/organisation-leave.tsx
+msgid "A member has left your organisation {organisationName}"
+msgstr ""
+
+#: packages/email/templates/organisation-leave.tsx
+msgid "A member has left your organisation on Documenso"
+msgstr ""
+
+#: packages/lib/jobs/definitions/emails/send-organisation-member-joined-email.handler.ts
+msgid "A new member has joined your organisation"
+msgstr ""
+
+#: packages/email/templates/organisation-join.tsx
+msgid "A new member has joined your organisation {organisationName}"
+msgstr ""
 
 #: apps/remix/app/components/forms/token.tsx
 msgid "A new token was created successfully."
@@ -590,12 +621,6 @@ msgstr "Un destinatario è stato rimosso"
 msgid "A recipient was updated"
 msgstr "Un destinatario è stato aggiornato"
 
-#. placeholder {0}: transferVerification.name
-#. placeholder {1}: transferVerification.email
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "A request to transfer the ownership of this team has been sent to <0>{0} ({1})</0>"
-msgstr "Una richiesta per trasferire la proprietà di questa squadra è stata inviata a <0>{0} ({1})</0>"
-
 #. placeholder {0}: team.name
 #: packages/lib/server-only/team/create-team-email-verification.ts
 msgid "A request to use your email has been initiated by {0} on Documenso"
@@ -606,7 +631,6 @@ msgid "A secret that will be sent to your URL so you can verify that the request
 msgstr "Un codice segreto che verrà inviato al tuo URL in modo che tu possa verificare che la richiesta sia stata inviata da Documenso"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "A secret that will be sent to your URL so you can verify that the request has been sent by Documenso."
 msgstr "Un codice segreto che verrà inviato al tuo URL in modo che tu possa verificare che la richiesta sia stata inviata da Documenso."
 
@@ -614,19 +638,6 @@ msgstr "Un codice segreto che verrà inviato al tuo URL in modo che tu possa ver
 msgid "A stable internet connection"
 msgstr "Una connessione Internet stabile"
 
-#: packages/email/templates/team-join.tsx
-msgid "A team member has joined a team on Documenso"
-msgstr "Un membro del team si è unito a un team su Documenso"
-
-#. placeholder {0}: team.name
-#: packages/lib/jobs/definitions/emails/send-team-member-left-email.handler.ts
-msgid "A team member has left {0}"
-msgstr "Un membro del team ha lasciato {0}"
-
-#: packages/email/templates/team-leave.tsx
-msgid "A team member has left a team on Documenso"
-msgstr "Un membro del team ha lasciato un team su Documenso"
-
 #: packages/email/templates/team-delete.tsx
 #: packages/email/templates/team-delete.tsx
 msgid "A team you were a part of has been deleted"
@@ -636,6 +647,14 @@ msgstr "Un team di cui facevi parte è stato eliminato"
 msgid "A unique URL to access your profile"
 msgstr "Un URL univoco per accedere al tuo profilo"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "A unique URL to identify the organisation"
+msgstr ""
+
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "A unique URL to identify your organisation"
+msgstr ""
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "A unique URL to identify your team"
@@ -645,32 +664,36 @@ msgstr "Un URL univoco per identificare la tua squadra"
 msgid "A verification email will be sent to the provided email."
 msgstr "Un'email di verifica sarà inviata all'email fornita."
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: packages/email/templates/team-transfer-request.tsx
-#: packages/email/templates/team-invite.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: packages/email/templates/organisation-invite.tsx
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Accept"
 msgstr "Accetta"
 
-#: packages/email/templates/team-invite.tsx
-msgid "Accept invitation to join a team on Documenso"
-msgstr "Accetta l'invito a unirti a un team su Documenso"
+#: packages/email/templates/organisation-invite.tsx
+msgid "Accept invitation to join an organisation on Documenso"
+msgstr ""
 
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Accept team email request for {teamName} on Documenso"
 msgstr "Accetta la richiesta di email per il team {teamName} su Documenso"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "Accept team transfer request on Documenso"
-msgstr "Accetta la richiesta di trasferimento di team su Documenso"
-
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Acceptance and Consent"
 msgstr "Accettazione e Consenso"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Accepted team invitation"
-msgstr "Invito alla squadra accettato"
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "Access disabled"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Access enabled"
+msgstr ""
+
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Account"
+msgstr ""
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 msgid "Account Authentication"
@@ -707,18 +730,25 @@ msgid "Action"
 msgstr "Azione"
 
 #: apps/remix/app/components/tables/templates-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Actions"
 msgstr "Azioni"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
 msgid "Active"
 msgstr "Attivo"
 
@@ -783,7 +813,29 @@ msgstr "Aggiungi email"
 msgid "Add Fields"
 msgstr "Aggiungi campi"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add group roles"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add groups"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Add Members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Add members roles"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Add more"
 msgstr "Aggiungi altro"
 
@@ -841,15 +893,12 @@ msgstr "Aggiungi le persone che firmeranno il documento."
 msgid "Add the recipients to create the document with"
 msgstr "Aggiungi i destinatari con cui creare il documento"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Adding and removing seats will adjust your invoice accordingly."
-msgstr "Aggiungere e rimuovere posti adeguerà di conseguenza la tua fattura."
-
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Additional brand information to display at the bottom of emails"
 msgstr "Informazioni aggiuntive sul marchio da mostrare in fondo alle email"
 
-#: packages/lib/constants/teams.ts
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Admin"
 msgstr "Amministratore"
 
@@ -857,10 +906,15 @@ msgstr "Amministratore"
 msgid "Admin Actions"
 msgstr "Azioni amministrative"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 msgid "Admin panel"
 msgstr "Pannello admin"
 
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+msgid "Admin Panel"
+msgstr ""
+
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
 #: packages/ui/primitives/document-flow/add-settings.tsx
 msgid "Advanced Options"
@@ -893,6 +947,10 @@ msgstr "Tutto"
 msgid "All documents"
 msgstr "Tutti i documenti"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "All documents have been completed!"
+msgstr ""
+
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "All documents have been processed. Any new documents that are sent or received will show here."
 msgstr "Tutti i documenti sono stati elaborati. Eventuali nuovi documenti inviati o ricevuti verranno mostrati qui."
@@ -901,8 +959,8 @@ msgstr "Tutti i documenti sono stati elaborati. Eventuali nuovi documenti inviat
 msgid "All documents related to the electronic signing process will be provided to you electronically through our platform or via email. It is your responsibility to ensure that your email address is current and that you can receive and open our emails."
 msgstr "Tutti i documenti relativi al processo di firma elettronica ti saranno forniti elettronicamente tramite la nostra piattaforma o via email. È tua responsabilità assicurarti che il tuo indirizzo email sia attuale e che tu possa ricevere e aprire le nostre email."
 
-#: apps/remix/app/routes/_authenticated+/templates.folders._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.folders._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.folders._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.folders._index.tsx
 msgid "All Folders"
 msgstr "Tutte le Cartelle"
 
@@ -930,6 +988,10 @@ msgstr "Tutti i modelli"
 msgid "All Time"
 msgstr "Tutto il tempo"
 
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
+msgid "Allow all organisation members to access this team"
+msgstr ""
+
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Allow document recipients to reply directly to this email address"
 msgstr "Consenti ai destinatari del documento di rispondere direttamente a questo indirizzo email"
@@ -946,6 +1008,10 @@ msgstr "Permetti ai firmatari di scegliere il prossimo firmatario"
 msgid "Allowed Signature Types"
 msgstr "Tipi di firma consentiti"
 
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "Allowed teams"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security._index.tsx
 msgid "Allows authenticating using biometrics, password managers, hardware keys, etc."
 msgstr "Consente di autenticare utilizzando biometria, gestori di password, chiavi hardware, ecc."
@@ -954,7 +1020,7 @@ msgstr "Consente di autenticare utilizzando biometria, gestori di password, chia
 msgid "Already have an account? <0>Sign in instead</0>"
 msgstr "Hai già un account? <0>Accedi al posto</0>"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
 msgid "Amount"
 msgstr "Importo"
 
@@ -970,14 +1036,13 @@ msgstr "Una firma elettronica fornita da te sulla nostra piattaforma, ottenuta c
 msgid "An email account"
 msgstr "Un account email"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "An email containing an invitation will be sent to each member."
 msgstr "Verrà inviato un'email contenente un invito a ciascun membro."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "An email requesting the transfer of this team has been sent."
-msgstr "È stata inviata un'email per richiedere il trasferimento di questo team."
-
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/token.tsx
 #: apps/remix/app/components/forms/signup.tsx
@@ -1024,6 +1089,7 @@ msgstr "Si è verificato un errore durante la disabilitazione della firma tramit
 msgid "An error occurred while disabling the user."
 msgstr "Si è verificato un errore durante la disabilitazione dell'utente."
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
@@ -1046,21 +1112,15 @@ msgstr "Si è verificato un errore durante l'abilitazione della firma del link d
 msgid "An error occurred while enabling the user."
 msgstr "Si è verificato un errore durante l'abilitazione dell'utente."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "An error occurred while loading team members. Please try again later."
-msgstr "Si è verificato un errore durante il caricamento dei membri del team. Per favore riprova più tardi."
-
 #: packages/ui/primitives/pdf-viewer.tsx
 msgid "An error occurred while loading the document."
 msgstr "Si è verificato un errore durante il caricamento del documento."
 
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "An error occurred while moving the document."
 msgstr "Si è verificato un errore durante lo spostamento del documento."
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 msgid "An error occurred while moving the template."
 msgstr "Si è verificato un errore durante lo spostamento del modello."
 
@@ -1113,6 +1173,7 @@ msgstr "Si è verificato un errore durante la firma come assistente."
 #: apps/remix/app/components/general/document-signing/document-signing-dropdown-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-checkbox-field.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "An error occurred while signing the document."
 msgstr "Si è verificato un errore durante la firma del documento."
 
@@ -1144,7 +1205,6 @@ msgstr "Si è verificato un errore inaspettato."
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/forms/signup.tsx
@@ -1153,20 +1213,31 @@ msgstr "Si è verificato un errore inaspettato."
 #: apps/remix/app/components/forms/signin.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
 #: apps/remix/app/components/forms/profile.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/account-delete-dialog.tsx
 msgid "An unknown error occurred"
@@ -1187,9 +1258,9 @@ msgstr "Si è verificato un errore sconosciuto durante l'eliminazione della cart
 msgid "An unknown error occurred while moving the folder."
 msgstr "Si è verificato un errore sconosciuto durante lo spostamento della cartella."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Any payment methods attached to this team will remain attached to this team. Please contact us if you need to update this information."
-msgstr "Qualsiasi metodo di pagamento associato a questo team rimarrà associato a questo team. Si prega di contattarci se necessario per aggiornare queste informazioni."
+#: apps/remix/app/routes/_authenticated+/inbox.tsx
+msgid "Any documents that you have been invited to will appear here"
+msgstr ""
 
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Any Source"
@@ -1199,7 +1270,7 @@ msgstr "Qualsiasi fonte"
 msgid "Any Status"
 msgstr "Qualsiasi stato"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -1211,6 +1282,7 @@ msgstr "Token API"
 msgid "App Version"
 msgstr "Versione dell'app"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
@@ -1246,6 +1318,10 @@ msgstr "Approvazione in corso"
 msgid "Are you sure you want to complete the document? This action cannot be undone. Please ensure that you have completed prefilling all relevant fields before proceeding."
 msgstr "Sei sicuro di voler completare il documento? Questa azione non può essere annullata. Assicurati di aver completato la precompilazione di tutti i campi rilevanti prima di procedere."
 
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Are you sure you want to delete the following claim?"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 msgid "Are you sure you want to delete this token?"
 msgstr "Sei sicuro di voler eliminare questo token?"
@@ -1258,6 +1334,10 @@ msgstr "Sei sicuro di voler rifiutare questo documento? Questa azione non può e
 msgid "Are you sure you want to remove the <0>{passkeyName}</0> passkey."
 msgstr "Sei sicuro di voler rimuovere la chiave di accesso <0>{passkeyName}</0>."
 
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "Are you sure you wish to delete this organisation?"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Are you sure you wish to delete this team?"
 msgstr "Sei sicuro di voler eliminare questo team?"
@@ -1265,13 +1345,22 @@ msgstr "Sei sicuro di voler eliminare questo team?"
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "Are you sure?"
 msgstr "Sei sicuro?"
 
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+msgid "Assigned Teams"
+msgstr ""
+
 #: packages/lib/constants/recipient-roles.ts
 msgid "Assist"
 msgstr "Assisti"
@@ -1297,6 +1386,10 @@ msgstr "Il ruolo di assistente è disponibile solo quando il documento è in mod
 msgid "Assistants"
 msgstr "Assistenti"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Assistants and Copy roles are currently not compatible with the multi-sign experience."
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "Assisted"
@@ -1306,7 +1399,7 @@ msgstr "Assistenza"
 msgid "Assisting"
 msgstr "Assistenza in corso"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.types.tsx
 #: packages/ui/primitives/document-flow/add-settings.types.ts
 #: packages/lib/types/document-meta.ts
@@ -1343,15 +1436,17 @@ msgid "Awaiting email confirmation"
 msgstr "In attesa della conferma email"
 
 #: apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx
-#: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/authoring/configure-fields-view.tsx
 #: apps/remix/app/components/embed/authoring/configure-fields-view.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Back"
 msgstr "Indietro"
 
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
-msgid "Back to Documents"
-msgstr "Torna ai Documenti"
+msgid "Back home"
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "Background Color"
@@ -1370,20 +1465,14 @@ msgstr "Codici di Backup"
 msgid "Banner Updated"
 msgstr "Banner Aggiornato"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Basic details"
-msgstr "Dettagli di Base"
-
 #: packages/email/template-components/template-confirmation-email.tsx
 msgid "Before you get started, please confirm your email address by clicking the button below:"
 msgstr "Prima di iniziare, conferma il tuo indirizzo email facendo clic sul pulsante qui sotto:"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
-#: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
-#: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
 msgid "Billing"
 msgstr "Fatturazione"
 
@@ -1395,11 +1484,26 @@ msgstr "Nero"
 msgid "Blue"
 msgstr "Blu"
 
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Brand Details"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Brand Website"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Branding Logo"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Branding Preferences"
 msgstr "Preferenze per il branding"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Branding preferences updated"
 msgstr "Preferenze di branding aggiornate"
 
@@ -1412,7 +1516,7 @@ msgstr "Browser"
 msgid "Bulk Copy"
 msgstr "Copia massiva"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Bulk Import"
 msgstr "Importazione Massiva"
 
@@ -1434,7 +1538,7 @@ msgstr "Invio modello in blocco tramite CSV"
 msgid "Bulk Send via CSV"
 msgstr "Invio Massivo via CSV"
 
-#: packages/email/templates/team-invite.tsx
+#: packages/email/templates/organisation-invite.tsx
 msgid "by <0>{senderName}</0>"
 msgstr "da <0>{senderName}</0>"
 
@@ -1442,10 +1546,6 @@ msgstr "da <0>{senderName}</0>"
 msgid "By accepting this request, you will be granting <0>{teamName}</0> access to:"
 msgstr "Accettando questa richiesta, concederai l'accesso a <0>{teamName}</0> a:"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "By accepting this request, you will take responsibility for any billing items associated with this team."
-msgstr "Accettando questa richiesta, ti assumerai la responsabilità di qualsiasi voce di fatturazione associata a questo team."
-
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "By deleting this document, the following will occur:"
 msgstr "Eliminando questo documento, si verificherà quanto segue:"
@@ -1476,7 +1576,6 @@ msgstr "Può preparare"
 
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-signature-field.tsx
@@ -1487,6 +1586,7 @@ msgstr "Può preparare"
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-account.tsx
@@ -1497,30 +1597,44 @@ msgstr "Può preparare"
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/template-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 #: apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
 #: apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 #: packages/ui/primitives/signature-pad/signature-pad-dialog.tsx
 #: packages/ui/primitives/document-flow/send-document-action-dialog.tsx
 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx
@@ -1572,7 +1686,8 @@ msgstr "Casella di controllo"
 msgid "Checkbox values"
 msgstr "Valori della casella di controllo"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Checkout"
 msgstr "Pagamento"
 
@@ -1592,6 +1707,10 @@ msgstr "Scegli come il documento verrà inviato ai destinatari"
 msgid "Choose how to distribute your document to recipients. Email will send notifications, None will generate signing links for manual distribution."
 msgstr "Scegli come distribuire il tuo documento ai destinatari. L'email invierà notifiche, Nessuna genererà link di firma per la distribuzione manuale."
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Choose your preferred authentication method:"
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "Choose..."
 msgstr "Scegli..."
@@ -1600,13 +1719,9 @@ msgstr "Scegli..."
 msgid "Claim account"
 msgstr "Rivendica account"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Claim username"
-msgstr "Rivendica nome utente"
-
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Claim your username now"
-msgstr "Rivendica il tuo nome utente ora"
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+msgid "Claims"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Clear file"
@@ -1631,7 +1746,7 @@ msgstr "Clicca qui per iniziare"
 msgid "Click here to retry"
 msgstr "Clicca qui per riprovare"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Click here to upload"
 msgstr "Clicca qui per caricare"
 
@@ -1644,10 +1759,11 @@ msgstr "Clicca per copiare il link di firma da inviare al destinatario"
 #: apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Click to insert field"
 msgstr "Clicca per inserire il campo"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
@@ -1655,6 +1771,9 @@ msgstr "Clicca per inserire il campo"
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: packages/ui/primitives/document-flow/missing-signature-field-dialog.tsx
@@ -1665,11 +1784,16 @@ msgstr "Chiudi"
 msgid "Communication"
 msgstr "Comunicazione"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Compare all plans and features in detail"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Complete"
 msgstr "Completa"
 
@@ -1701,6 +1825,7 @@ msgstr "Completa la Visualizzazione"
 #: apps/remix/app/components/general/stack-avatars-with-tooltip.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/document.ts
 #: packages/email/template-components/template-document-self-signed.tsx
 #: packages/email/template-components/template-document-recipient-signed.tsx
@@ -1776,16 +1901,21 @@ msgstr "Configura il campo {0}"
 msgid "Configure the fields you want to place on the document."
 msgstr "Configura i campi che vuoi posizionare sul documento."
 
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Configure the team roles for each group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Configure the team roles for each member"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Confirm"
 msgstr "Conferma"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Confirm by typing <0>{confirmTransferMessage}</0>"
-msgstr "Conferma digitando <0>{confirmTransferMessage}</0>"
-
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 msgid "Confirm by typing <0>{deleteMessage}</0>"
 msgstr "Conferma digitando <0>{deleteMessage}</0>"
 
@@ -1817,20 +1947,24 @@ msgstr "Consenso alle transazioni elettroniche"
 msgid "Contact Information"
 msgstr "Informazioni di contatto"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Contact sales here"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "Content"
 msgstr "Contenuto"
 
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-view.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx
 #: packages/ui/primitives/document-flow/document-flow-root.tsx
 msgid "Continue"
@@ -1856,19 +1990,19 @@ msgstr "Continua firmando il documento."
 msgid "Continue by viewing the document."
 msgstr "Continua visualizzando il documento."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "Continue to login"
 msgstr "Continua per accedere"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the default language of an uploaded document. This will be used as the language in email communications with the recipients."
 msgstr "Controlla la lingua predefinita di un documento caricato. Questa verrà usata come lingua nelle comunicazioni email con i destinatari."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the default visibility of an uploaded document."
 msgstr "Controlla la visibilità predefinita di un documento caricato."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the formatting of the message that will be sent when inviting a recipient to sign a document. If a custom message has been provided while configuring the document, it will be used instead."
 msgstr "Controlla la formattazione del messaggio che verrà inviato quando si invita un destinatario a firmare un documento. Se è stato fornito un messaggio personalizzato durante la configurazione del documento, verrà utilizzato invece."
 
@@ -1876,11 +2010,11 @@ msgstr "Controlla la formattazione del messaggio che verrà inviato quando si in
 msgid "Controls the language for the document, including the language to be used for email notifications, and the final certificate that is generated and attached to the document."
 msgstr "Controlla la lingua del documento, inclusa quella per le notifiche email e il certificato finale che viene generato e allegato al documento."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls whether the signing certificate will be included in the document when it is downloaded. The signing certificate can still be downloaded from the logs page separately."
 msgstr "Controlla se il certificato di firma sarà incluso nel documento quando viene scaricato. Il certificato di firma può comunque essere scaricato separatamente dalla pagina dei log."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls which signatures are allowed to be used when signing a document."
 msgstr "Controlla quali firme sono consentite per firmare un documento."
 
@@ -1929,6 +2063,9 @@ msgstr "Copia il token"
 
 #: apps/remix/app/routes/_profile+/_layout.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 msgid "Create"
 msgstr "Crea"
 
@@ -1940,16 +2077,31 @@ msgstr "Crea un <0>account gratuito</0> per accedere ai tuoi documenti firmati i
 msgid "Create a new account"
 msgstr "Crea un nuovo account"
 
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Create a new organisation with {planName} plan. Keep your current organisation on it's current plan"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create a team to collaborate with your team members."
 msgstr "Crea un team per collaborare con i membri del tuo team."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 #: packages/email/template-components/template-document-self-signed.tsx
 msgid "Create account"
 msgstr "Crea un account"
 
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Create an organisation for this user"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Create an organisation to collaborate with teams"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Create an organisation to get started."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Create and send"
 msgstr "Crea e invia"
@@ -1962,6 +2114,14 @@ msgstr "Crea come bozza"
 msgid "Create as pending"
 msgstr "Crea come in attesa"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create claim"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create Claim"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog-wrapper.tsx
 msgid "Create Direct Link"
 msgstr "Crea Link Diretto"
@@ -1974,6 +2134,15 @@ msgstr "Crea Link di Firma Diretto"
 msgid "Create document from template"
 msgstr "Crea documento da modello"
 
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Create group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Create Groups"
+msgstr ""
+
 #: apps/remix/app/routes/_profile+/_layout.tsx
 msgid "Create now"
 msgstr "Crea ora"
@@ -1982,17 +2151,47 @@ msgstr "Crea ora"
 msgid "Create one automatically"
 msgstr "Crea uno automaticamente"
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Create organisation"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/menu-switcher.tsx
+msgid "Create Organisation"
+msgstr ""
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Create separate organisation"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Create signing links"
 msgstr "Crea link di firma"
 
-#: apps/remix/app/components/general/menu-switcher.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Create Stripe customer"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Create subscription"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create Subscription Claim"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create team"
 msgstr "Crea team"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create Team"
 msgstr "Crea Team"
@@ -2025,6 +2224,8 @@ msgstr "Crea il tuo account e inizia a utilizzare firme digitali all'avanguardia
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 #: apps/remix/app/components/tables/templates-table.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/tables/admin-leaderboard-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-information.tsx
@@ -2035,25 +2236,23 @@ msgid "Created"
 msgstr "Creato"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Created At"
 msgstr "Creato il"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Created by"
 msgstr "Creato da"
 
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table.tsx
 msgid "Created on"
 msgstr "Creato il"
 
 #. placeholder {0}: i18n.date(webhook.createdAt, DateTime.DATETIME_FULL)
 #. placeholder {0}: i18n.date(token.createdAt, DateTime.DATETIME_FULL)
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Created on {0}"
 msgstr "Creato il {0}"
 
@@ -2073,14 +2272,26 @@ msgstr "La password corrente è errata."
 msgid "Current recipients:"
 msgstr "Destinatari attuali:"
 
-#: apps/remix/app/components/general/billing-plans.tsx
-msgid "Daily"
-msgstr "Giornaliero"
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "Currently all organisation members can access this team"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Currently branding can only be configured for Teams and above plans."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups._index.tsx
+msgid "Custom Organisation Groups"
+msgstr ""
 
 #: apps/remix/app/components/general/app-command-menu.tsx
 msgid "Dark Mode"
 msgstr "Modalità Scura"
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Dashboard"
+msgstr ""
+
 #: apps/remix/app/components/tables/settings-security-activity-table.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
@@ -2089,8 +2300,7 @@ msgstr "Modalità Scura"
 msgid "Date"
 msgstr "Data"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Date created"
 msgstr "Data di creazione"
 
@@ -2100,24 +2310,20 @@ msgstr "Data di creazione"
 msgid "Date Format"
 msgstr "Formato data"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: packages/email/templates/team-invite.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: packages/email/templates/organisation-invite.tsx
 msgid "Decline"
 msgstr "Declina"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Declined team invitation"
-msgstr "Invito al team rifiutato"
-
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Document Language"
 msgstr "Lingua predefinita del documento"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Document Visibility"
 msgstr "Visibilità predefinita del documento"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Signature Settings"
 msgstr "Impostazioni predefinite della firma"
 
@@ -2125,20 +2331,30 @@ msgstr "Impostazioni predefinite della firma"
 msgid "delete"
 msgstr "elimina"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/document/document-page-view-dropdown.tsx
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
 msgid "Delete"
 msgstr "Elimina"
 
@@ -2148,6 +2364,7 @@ msgstr "Elimina"
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-folder-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/folder-delete-dialog.tsx
 msgid "delete {0}"
 msgstr "elimina {0}"
@@ -2178,18 +2395,33 @@ msgstr "Elimina documento"
 msgid "Delete Document"
 msgstr "Elimina Documento"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "Delete organisation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "Delete organisation group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "Delete organisation member"
+msgstr ""
+
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "Delete passkey"
 msgstr "Elimina chiave d'accesso"
 
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Delete Subscription Claim"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Delete team"
 msgstr "Elimina squadra"
 
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-msgid "Delete team member"
-msgstr "Elimina membro del team"
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "Delete team group"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 msgid "Delete the document. This action is irreversible so proceed with caution."
@@ -2278,6 +2510,7 @@ msgstr "Collegamento diretto al modello eliminato"
 msgid "Direct template link usage exceeded ({0}/{1})"
 msgstr "Utilizzo del collegamento diretto al modello superato ({0}/{1})"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Disable"
 msgstr "Disabilita"
@@ -2288,6 +2521,10 @@ msgstr "Disabilita"
 msgid "Disable 2FA"
 msgstr "Disabilita 2FA"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "Disable access"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
 msgid "Disable account"
 msgstr "Disabilita account"
@@ -2302,7 +2539,6 @@ msgid "Disable Two Factor Authentication before deleting your account."
 msgstr "Disabilita l'Autenticazione a Due Fattori prima di eliminare il tuo account."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "Disabled"
 msgstr "Disabilitato"
 
@@ -2338,8 +2574,7 @@ msgstr "Vuoi duplicare questo modello?"
 msgid "Documenso will delete <0>all of your documents</0>, along with all of your completed documents, signatures, and all other resources belonging to your Account."
 msgstr "Documenso eliminerà <0>tutti i tuoi documenti</0>, insieme a tutti i tuoi documenti completati, firme e tutte le altre risorse appartenenti al tuo account."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Document"
 msgstr "Documento"
@@ -2426,8 +2661,7 @@ msgstr "Documento creato usando un <0>link diretto</0>"
 msgid "Document Creation"
 msgstr "Creazione del documento"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 #: packages/lib/utils/document-audit-logs.ts
@@ -2463,15 +2697,13 @@ msgstr "ID esterno del documento aggiornato"
 msgid "Document found in your account"
 msgstr "Documento trovato nel tuo account"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/components/general/document/document-history-sheet.tsx
 msgid "Document history"
 msgstr "Cronologia del documento"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document ID"
 msgstr "ID del documento"
 
@@ -2496,7 +2728,6 @@ msgid "Document metrics"
 msgstr "Metriche del documento"
 
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "Document moved"
 msgstr "Documento spostato"
 
@@ -2520,7 +2751,8 @@ msgstr "Documento in sospeso"
 msgid "Document pending email"
 msgstr "Email documento in attesa"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Document preferences updated"
 msgstr "Preferenze del documento aggiornate"
 
@@ -2559,13 +2791,11 @@ msgstr "Autenticazione firma documento aggiornata"
 msgid "Document signing process will be cancelled"
 msgstr "Il processo di firma del documento sarà annullato"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document status"
 msgstr "Stato del documento"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document title"
 msgstr "Titolo del documento"
 
@@ -2603,16 +2833,13 @@ msgid "Document will be permanently deleted"
 msgstr "Il documento sarà eliminato definitivamente"
 
 #: apps/remix/app/routes/_profile+/p.$url.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
 #: apps/remix/app/components/general/user-profile-timur.tsx
-#: apps/remix/app/components/general/generic-error-layout.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -2620,8 +2847,7 @@ msgstr "Il documento sarà eliminato definitivamente"
 msgid "Documents"
 msgstr "Documenti"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Documents created from template"
 msgstr "Documenti creati da modello"
 
@@ -2629,6 +2855,10 @@ msgstr "Documenti creati da modello"
 msgid "Documents Received"
 msgstr "Documenti ricevuti"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
+msgid "Documents that require your attention will appear here"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
 msgid "Documents Viewed"
 msgstr "Documenti visualizzati"
@@ -2638,7 +2868,8 @@ msgstr "Documenti visualizzati"
 msgid "Don't have an account? <0>Sign up</0>"
 msgstr "Non hai un account? <0>Registrati</0>"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/share-document-download-button.tsx
@@ -2711,7 +2942,7 @@ msgstr "Menu a tendina"
 msgid "Dropdown options"
 msgstr "Opzioni del menu a tendina"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Due to an unpaid invoice, your team has been restricted. Please settle the payment to restore full access to your team."
 msgstr "A causa di una fattura non pagata, il vostro team è stato limitato. Si prega di effettuare il pagamento per ripristinare l'accesso completo al team."
 
@@ -2730,7 +2961,6 @@ msgid "Duplicate on all pages"
 msgstr "Duplica in tutte le pagine"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
@@ -2741,13 +2971,11 @@ msgstr "Duplica in tutte le pagine"
 msgid "Edit"
 msgstr "Modifica"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Edit Template"
 msgstr "Modifica Modello"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Edit webhook"
 msgstr "Modifica webhook"
 
@@ -2762,6 +2990,7 @@ msgstr "Divulgazione della firma elettronica"
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/tables/admin-document-recipient-item-table.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-email-field.tsx
@@ -2772,6 +3001,7 @@ msgstr "Divulgazione della firma elettronica"
 #: apps/remix/app/components/forms/forgot-password.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
@@ -2793,7 +3023,7 @@ msgstr "Email"
 
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/send-confirmation-email.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Email address"
 msgstr "Indirizzo email"
 
@@ -2837,15 +3067,27 @@ msgstr "Verifica email rimossa"
 msgid "Email verification has been resent"
 msgstr "Verifica email rinviata"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Embedding, 5 members included and more"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "Empty field"
 msgstr "Campo vuoto"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Enable"
+msgstr ""
+
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "Enable 2FA"
 msgstr "Abilita 2FA"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Enable access"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 msgid "Enable account"
 msgstr "Abilita account"
@@ -2859,9 +3101,17 @@ msgstr "Abilita Account"
 msgid "Enable Authenticator App"
 msgstr "Abilita l'app Authenticator"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
-msgid "Enable custom branding for all documents in this team."
-msgstr "Abilita il branding personalizzato per tutti i documenti in questo team."
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable Custom Branding"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable custom branding for all documents in this organisation"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable custom branding for all documents in this team"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: packages/lib/constants/template.ts
@@ -2876,8 +3126,6 @@ msgstr "Abilita ordine di firma"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Enabled"
@@ -2891,11 +3139,15 @@ msgstr "Abilitare l'account consente all'utente di utilizzare nuovamente l'accou
 msgid "Enclosed Document"
 msgstr "Documento Allegato"
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "Ends On"
-msgstr "Termina il"
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Enter claim name"
+msgstr ""
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Enter your 2FA code"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Enter your brand details"
 msgstr "Inserisci i dettagli del tuo marchio"
 
@@ -2911,15 +3163,24 @@ msgstr "Inserisci il tuo indirizzo email per ricevere il documento completato."
 msgid "Enter your name"
 msgstr "Inserisci il tuo nome"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Enter your password"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 msgid "Enter your text here"
 msgstr "Inserisci il tuo testo qui"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Enterprise"
+msgstr ""
+
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
 #: apps/remix/app/components/general/verify-email-banner.tsx
 #: apps/remix/app/components/general/template/template-edit-form.tsx
@@ -2954,15 +3215,14 @@ msgstr "Inserisci il tuo testo qui"
 #: apps/remix/app/components/general/document/document-edit-form.tsx
 #: apps/remix/app/components/general/document/document-edit-form.tsx
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/template-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx
@@ -2975,7 +3235,7 @@ msgstr "Errore"
 msgid "Error uploading file"
 msgstr "Errore durante il caricamento del file"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Everyone can access and view the document"
 msgstr "Tutti possono accedere e visualizzare il documento"
 
@@ -2996,7 +3256,7 @@ msgid "Expired"
 msgstr "Scaduto"
 
 #. placeholder {0}: i18n.date(token.expires, DateTime.DATETIME_FULL)
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Expires on {0}"
 msgstr "Scade il {0}"
 
@@ -3010,6 +3270,18 @@ msgstr "ID esterno"
 msgid "Failed to create folder"
 msgstr "Creazione cartella fallita"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Failed to create subscription claim."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Failed to delete subscription claim."
+msgstr ""
+
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
+msgid "Failed to load document"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
 msgid "Failed to reseal document"
 msgstr "Fallito il risigillo del documento"
@@ -3026,12 +3298,15 @@ msgstr "Aggiornamento documento fallito"
 msgid "Failed to update recipient"
 msgstr "Aggiornamento destinario fallito"
 
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Failed to update subscription claim."
+msgstr ""
+
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 msgid "Failed to update template"
 msgstr "Aggiornamento modello fallito"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Failed to update webhook"
 msgstr "Aggiornamento webhook fallito"
 
@@ -3039,6 +3314,12 @@ msgstr "Aggiornamento webhook fallito"
 msgid "Failed: {failedCount}"
 msgstr "Falliti: {failedCount}"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Feature Flags"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 msgid "Field character limit"
 msgstr "Limite di caratteri del campo"
@@ -3096,6 +3377,10 @@ msgstr "Il file non può essere più grande di {APP_DOCUMENT_UPLOAD_SIZE_LIMIT}
 msgid "File size exceeds the limit of {APP_DOCUMENT_UPLOAD_SIZE_LIMIT} MB"
 msgstr "La dimensione del file supera il limite di {APP_DOCUMENT_UPLOAD_SIZE_LIMIT} MB"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Fill in the details to create a new subscription claim."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
 msgid "Folder"
@@ -3132,6 +3417,10 @@ msgstr "Per qualsiasi domanda riguardante questa divulgazione, le firme elettron
 msgid "For each recipient, provide their email (required) and name (optional) in separate columns. Download the template CSV below for the correct format."
 msgstr "Per ogni destinatario, fornisci la loro email (obbligatoria) e il nome (opzionale) in colonne separate. Scarica il modello CSV qui sotto per il formato corretto."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "For example, if the claim has a new flag \"FLAG_1\" set to true, then this organisation will get that flag added."
+msgstr ""
+
 #: packages/lib/server-only/auth/send-forgot-password.ts
 msgid "Forgot Password?"
 msgstr "Password dimenticata?"
@@ -3142,6 +3431,10 @@ msgstr "Password dimenticata?"
 msgid "Forgot your password?"
 msgstr "Hai dimenticato la tua password?"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Free"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/types.ts
 msgid "Free Signature"
 msgstr "Firma gratuita"
@@ -3153,9 +3446,12 @@ msgstr "Firma gratuita"
 #: apps/remix/app/components/forms/profile.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Full Name"
 msgstr "Nome completo"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/template/template-edit-form.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
@@ -3173,8 +3469,16 @@ msgstr "Genera link"
 msgid "Global recipient action authentication"
 msgstr "Autenticazione globale del destinatario"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Go back"
+msgstr ""
+
 #: apps/remix/app/routes/_recipient+/_layout.tsx
 #: apps/remix/app/routes/_profile+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
 #: packages/ui/primitives/document-flow/document-flow-root.tsx
 msgid "Go Back"
@@ -3192,6 +3496,10 @@ msgstr "Torna alla home"
 msgid "Go Back Home"
 msgstr "Torna alla home"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid "Go home"
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "Go to document"
 msgstr "Vai al documento"
@@ -3200,6 +3508,10 @@ msgstr "Vai al documento"
 msgid "Go to owner"
 msgstr "Vai al proprietario"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Go to team"
+msgstr ""
+
 #: apps/remix/app/routes/_profile+/p.$url.tsx
 msgid "Go to your <0>public profile settings</0> to add documents."
 msgstr "Vai alle tue <0>impostazioni del profilo pubblico</0> per aggiungere documenti."
@@ -3208,6 +3520,34 @@ msgstr "Vai alle tue <0>impostazioni del profilo pubblico</0> per aggiungere doc
 msgid "Green"
 msgstr "Verde"
 
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Group has been created."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Group has been updated successfully"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Group Name"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
+#: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Groups"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
 msgid "has invited you to approve this document"
 msgstr "ti ha invitato ad approvare questo documento"
@@ -3237,6 +3577,10 @@ msgstr "Avere un assistente come ultimo firmatario significa che non saranno in
 msgid "Help complete the document for other signers."
 msgstr "Aiuta a completare il documento per altri firmatari."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "Here you can edit your organisation details."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/profile.tsx
 msgid "Here you can edit your personal details."
 msgstr "Qui puoi modificare i tuoi dati personali."
@@ -3245,14 +3589,23 @@ msgstr "Qui puoi modificare i tuoi dati personali."
 msgid "Here you can manage your password and security settings."
 msgstr "Qui puoi gestire la tua password e le impostazioni di sicurezza."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Here you can set preferences and defaults for branding."
 msgstr "Qui puoi impostare preferenze e valori predefiniti per il branding."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Here you can set preferences and defaults for your organisation. Teams will inherit these settings by default."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Here you can set preferences and defaults for your team."
 msgstr "Qui puoi impostare preferenze e valori predefiniti per il tuo team."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Here you can set your general preferences"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "Here's how it works:"
 msgstr "Ecco come funziona:"
@@ -3269,7 +3622,7 @@ msgstr "Ciao {userName},"
 msgid "Hi, {userName} <0>({userEmail})</0>"
 msgstr "Ciao, {userName} <0>({userEmail})</0>"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "Hide"
@@ -3279,6 +3632,10 @@ msgstr "Nascondi"
 msgid "Hide additional information"
 msgstr "Nascondi informazioni aggiuntive"
 
+#: apps/remix/app/components/general/generic-error-layout.tsx
+msgid "Home"
+msgstr ""
+
 #: packages/lib/constants/recipient-roles.ts
 msgid "I am a signer of this document"
 msgstr "Sono un firmatario di questo documento"
@@ -3308,9 +3665,13 @@ msgstr "Sono il proprietario di questo documento"
 msgid "I'm sure! Delete it"
 msgstr "Sono sicuro! Eliminalo"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "If they accept this request, the team will be transferred to their account."
-msgstr "Se accettano questa richiesta, il team sarà trasferito sul loro account."
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "ID"
+msgstr ""
+
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "ID copied to clipboard"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "If you do not want to use the authenticator prompted, you can close it, which will then display the next available authenticator."
@@ -3324,6 +3685,8 @@ msgstr "Se non trovi il link di conferma nella tua casella di posta, puoi richie
 msgid "If your authenticator app does not support QR codes, you can use the following code instead:"
 msgstr "Se la tua app autenticatrice non supporta i codici QR, puoi usare il seguente codice:"
 
+#: apps/remix/app/components/general/app-nav-mobile.tsx
+#: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 msgid "Inbox"
 msgstr "Posta in arrivo"
@@ -3332,7 +3695,7 @@ msgstr "Posta in arrivo"
 msgid "Inbox documents"
 msgstr "Documenti in arrivo"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Include the Signing Certificate in the Document"
 msgstr "Includi il certificato di firma nel documento"
 
@@ -3341,11 +3704,27 @@ msgstr "Includi il certificato di firma nel documento"
 msgid "Information"
 msgstr "Informazioni"
 
-#: packages/ui/components/recipient/recipient-action-auth-select.tsx
 #: packages/ui/components/recipient/recipient-action-auth-select.tsx
 msgid "Inherit authentication method"
 msgstr "Ereditare metodo di autenticazione"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Inherit from organisation"
+msgstr ""
+
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "Inherit organisation members"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Inherited subscription claim"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-initials-field.tsx
 #: packages/ui/primitives/document-flow/types.ts
 msgid "Initials"
@@ -3372,8 +3751,8 @@ msgstr "Email non valida"
 msgid "Invalid link"
 msgstr "Link non valido"
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Invalid token"
 msgstr "Token non valido"
 
@@ -3381,43 +3760,52 @@ msgstr "Token non valido"
 msgid "Invalid token provided. Please try again."
 msgstr "Token non valido fornito. Per favore riprova."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Invitation accepted"
+msgstr ""
+
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "Invitation accepted!"
 msgstr "Invito accettato!"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "Invitation declined"
 msgstr "Invito rifiutato"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invitation has been deleted"
 msgstr "L'invito è stato eliminato"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invitation has been resent"
 msgstr "L'invito è stato inviato nuovamente"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite"
 msgstr "Invita"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite member"
 msgstr "Invita un membro"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite Members"
 msgstr "Invita membri"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "Invite team members"
-msgstr "Invita membri del team"
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Invite organisation members"
+msgstr ""
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Invite team members to collaborate"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invited At"
 msgstr "Invitato il"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
 msgid "Invoice"
 msgstr "Fattura"
 
@@ -3435,6 +3823,10 @@ msgstr "È fondamentale mantenere aggiornate le tue informazioni di contatto, in
 msgid "It looks like {0} hasn't added any documents to their profile yet."
 msgstr "Sembra che {0} non abbia ancora aggiunto documenti al proprio profilo."
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "It looks like we ran into an issue!"
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
 msgid "It seems that the provided token has expired. We've just sent you another token, please check your email and try again."
 msgstr "Sembra che il token fornito sia scaduto. Ti abbiamo appena inviato un altro token, controlla la tua email e riprova."
@@ -3451,9 +3843,14 @@ msgstr "Attualmente non è il tuo turno di firmare. Torna presto a controllare p
 msgid "It's currently not your turn to sign. You will receive an email with instructions once it's your turn to sign the document."
 msgstr "Al momento, non è il tuo turno di firmare. Riceverai un'email con le istruzioni quando sarà il tuo turno di firmare il documento."
 
-#: packages/email/templates/team-invite.tsx
-msgid "Join {teamName} on Documenso"
-msgstr "Unisci a {teamName} su Documenso"
+#: packages/email/templates/organisation-invite.tsx
+msgid "Join {organisationName} on Documenso"
+msgstr ""
+
+#. placeholder {0}: DateTime.fromJSDate(team.createdAt).toRelative({ style: 'short' })
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Joined {0}"
+msgstr ""
 
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
@@ -3463,6 +3860,7 @@ msgstr "Unisci a {teamName} su Documenso"
 msgid "Label"
 msgstr "Etichetta"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
@@ -3487,8 +3885,7 @@ msgstr "Ultimi 7 giorni"
 msgid "Last modified"
 msgstr "Ultima modifica"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Last updated"
 msgstr "Ultimo aggiornamento"
 
@@ -3508,14 +3905,20 @@ msgstr "Ultimo utilizzo"
 msgid "Leaderboard"
 msgstr "Classifica"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
 msgid "Leave"
 msgstr "Lascia"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "Leave team"
-msgstr "Lascia il team"
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Leave blank to inherit from the organisation."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "Leave organisation"
+msgstr ""
 
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Legality of Electronic Signatures"
@@ -3529,12 +3932,11 @@ msgstr "Modalità chiara"
 msgid "Like to have your own public profile with agreements?"
 msgstr "Ti piacerebbe avere il tuo profilo pubblico con accordi?"
 
-#: packages/email/templates/team-transfer-request.tsx
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Link expires in 1 hour."
 msgstr "Il link scade tra 1 ora."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Link template"
 msgstr "Collega modello"
 
@@ -3544,7 +3946,6 @@ msgstr "Link Generati"
 
 #. placeholder {0}: webhook.eventTriggers .map((trigger) => toFriendlyWebhookEventName(trigger)) .join(', ')
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "Listening to {0}"
 msgstr "Ascoltando {0}"
 
@@ -3553,6 +3954,7 @@ msgid "Load older activity"
 msgstr "Carica attività precedente"
 
 #: apps/remix/app/components/general/skeletons/document-edit-skeleton.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: packages/ui/primitives/pdf-viewer.tsx
 msgid "Loading document..."
 msgstr "Caricamento del documento..."
@@ -3562,11 +3964,6 @@ msgstr "Caricamento del documento..."
 msgid "Loading Document..."
 msgstr "Caricamento Documento..."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Loading teams..."
-msgstr "Caricamento dei team..."
-
 #: apps/remix/app/components/general/document/document-page-view-recent-activity.tsx
 msgid "Loading..."
 msgstr "Caricamento in corso..."
@@ -3577,7 +3974,9 @@ msgstr "Caricamento in corso..."
 msgid "Login"
 msgstr "Accedi"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Manage"
 msgstr "Gestisci"
 
@@ -3586,16 +3985,19 @@ msgstr "Gestisci"
 msgid "Manage {0}'s profile"
 msgstr "Gestisci il profilo di {0}"
 
-#: apps/remix/app/routes/_authenticated+/settings+/teams.tsx
-msgid "Manage all teams you are currently associated with."
-msgstr "Gestisci tutti i team a cui sei attualmente associato."
+#: apps/remix/app/routes/_authenticated+/settings+/organisations.tsx
+msgid "Manage all organisations you are currently associated with."
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Manage all subscription claims"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Manage and view template"
 msgstr "Gestisci e visualizza il modello"
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
 msgid "Manage billing"
 msgstr "Gestisci la fatturazione"
 
@@ -3611,42 +4013,69 @@ msgstr "Gestisci Link Diretto"
 msgid "Manage documents"
 msgstr "Gestisci documenti"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage organisation"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Manage organisations"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security._index.tsx
 msgid "Manage passkeys"
 msgstr "Gestisci chiavi di accesso"
 
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Manage permissions and access controls"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 msgid "Manage subscription"
 msgstr "Gestisci abbonamento"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-msgid "Manage Subscription"
-msgstr "Gestisci Abbonamento"
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage the {0} organisation"
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "Manage subscriptions"
-msgstr "Gestisci abbonamenti"
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage the {0} organisation subscription"
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Manage team subscription."
-msgstr "Gestisci abbonamento del team."
-
-#: apps/remix/app/components/general/menu-switcher.tsx
-msgid "Manage teams"
-msgstr "Gestisci gruppi"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups._index.tsx
+msgid "Manage the custom groups of members for your organisation."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "Manage the direct link signing for this template"
 msgstr "Gestisci la firma del link diretto per questo modello"
 
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
+msgid "Manage the groups assigned to this team."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+msgid "Manage the members of your team."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 msgid "Manage the members or invite new members."
 msgstr "Gestisci i membri o invita nuovi membri."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+msgid "Manage the teams in this organisation."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/users._index.tsx
 msgid "Manage users"
 msgstr "Gestisci utenti"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Manage your organisation group settings."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.passkeys.tsx
 msgid "Manage your passkeys."
 msgstr "Gestisci le tue chiavi di accesso."
@@ -3655,7 +4084,8 @@ msgstr "Gestisci le tue chiavi di accesso."
 msgid "Manage your site settings here"
 msgstr "Gestisci le impostazioni del tuo sito qui"
 
-#: packages/lib/constants/teams.ts
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Manager"
 msgstr "Responsabile"
 
@@ -3684,18 +4114,33 @@ msgstr ""
 msgid "Maximum file size: 4MB. Maximum 100 rows per upload. Blank values will use template defaults."
 msgstr "Dimensione massima del file: 4MB. Massimo 100 righe per caricamento. I valori vuoti utilizzeranno i valori predefiniti del modello."
 
-#: packages/lib/constants/teams.ts
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Member"
 msgstr "Membro"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Member Count"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
 msgid "Member Since"
 msgstr "Membro dal"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
 msgid "Members"
 msgstr "Membri"
 
@@ -3714,8 +4159,12 @@ msgstr ""
 msgid "Modify recipients"
 msgstr "Modifica destinatari"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Modify the details of the subscription claim."
+msgstr ""
+
 #: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Monthly"
 msgstr "Mensile"
 
@@ -3728,9 +4177,7 @@ msgid "Monthly Active Users: Users that had at least one of their documents comp
 msgstr "Utenti attivi mensili: Utenti con almeno uno dei loro documenti completati"
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "Move"
 msgstr "Sposta"
 
@@ -3742,36 +4189,18 @@ msgstr "Sposta \"{templateTitle}\" in una cartella"
 msgid "Move Document to Folder"
 msgstr "Sposta documento nella cartella"
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Move Document to Team"
-msgstr "Sposta documento al team"
-
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 msgid "Move Template to Folder"
 msgstr "Sposta modello nella cartella"
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Move Template to Team"
-msgstr "Sposta modello al team"
-
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 msgid "Move to Folder"
 msgstr "Sposta nella cartella"
 
-#: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
-#: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
-msgid "Move to Team"
-msgstr "Sposta nel team"
-
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Moving..."
-msgstr "Spostamento..."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "My templates"
-msgstr "I miei modelli"
+#: packages/ui/components/document/document-global-auth-access-select.tsx
+msgid "Multiple access methods can be selected."
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table.tsx
@@ -3779,9 +4208,11 @@ msgstr "I miei modelli"
 #: apps/remix/app/components/tables/admin-leaderboard-table.tsx
 #: apps/remix/app/components/tables/admin-document-recipient-item-table.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-name-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
@@ -3799,6 +4230,10 @@ msgstr "I miei modelli"
 msgid "Name"
 msgstr "Nome"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Name is required"
+msgstr ""
+
 #: apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
 msgid "Need to sign documents?"
 msgstr "Hai bisogno di firmare documenti?"
@@ -3827,18 +4262,16 @@ msgstr "Mai scadere"
 msgid "New Password"
 msgstr "Nuova Password"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "New team owner"
-msgstr "Nuovo proprietario del team"
-
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
 msgid "New Template"
 msgstr "Nuovo modello"
 
-#: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: packages/ui/primitives/signature-pad/signature-pad-dialog.tsx
 msgid "Next"
 msgstr "Successivo"
@@ -3847,6 +4280,11 @@ msgstr "Successivo"
 msgid "Next field"
 msgstr "Campo successivo"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "No"
+msgstr ""
+
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "No active drafts"
 msgstr "Nessuna bozza attiva"
@@ -3856,9 +4294,9 @@ msgstr "Nessuna bozza attiva"
 msgid "No further action is required from you at this time."
 msgstr "Non sono richieste ulteriori azioni da parte tua in questo momento."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "No payment required"
-msgstr "Nessun pagamento richiesto"
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "No organisations found"
+msgstr ""
 
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
 msgid "No public profile templates found"
@@ -3890,8 +4328,6 @@ msgid "No recipients with this role"
 msgstr "Nessun destinatario con questo ruolo"
 
 #: packages/ui/components/document/document-global-auth-action-select.tsx
-#: packages/ui/components/document/document-global-auth-action-select.tsx
-#: packages/ui/components/document/document-global-auth-access-select.tsx
 #: packages/ui/components/document/document-global-auth-access-select.tsx
 msgid "No restrictions"
 msgstr "Nessuna restrizione"
@@ -3908,6 +4344,18 @@ msgstr "Nessun risultato trovato."
 msgid "No signature field found"
 msgstr "Nessun campo di firma trovato"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "No Stripe customer attached"
+msgstr ""
+
+#: apps/remix/app/components/tables/team-groups-table.tsx
+msgid "No team groups found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "No teams yet"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "No valid direct templates found"
 msgstr "Nessun modello diretto valido trovato"
@@ -3926,6 +4374,7 @@ msgstr "Nessun valore trovato."
 msgid "No worries, it happens! Enter your email and we'll email you a special link to reset your password."
 msgstr "Non ti preoccupare, succede! Inserisci la tua email e ti invieremo un link speciale per reimpostare la tua password."
 
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/lib/constants/document.ts
 msgid "None"
@@ -3951,6 +4400,16 @@ msgstr "Numero"
 msgid "Number format"
 msgstr "Formato numero"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Number of members allowed. 0 = Unlimited"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Number of teams allowed. 0 = Unlimited"
+msgstr ""
+
 #. placeholder {0}: document.team?.name
 #: apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
 msgid "on behalf of \"{0}\" has invited you to approve this document"
@@ -3975,17 +4434,15 @@ msgstr "per conto di \"{0}\" ti ha invitato a visualizzare questo documento"
 msgid "On this page, you can create a new webhook."
 msgstr "In questa pagina, puoi creare un nuovo webhook."
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "On this page, you can create and manage API tokens. See our <0>Documentation</0> for more information."
 msgstr "Su questa pagina, puoi creare e gestire token API. Consulta la nostra <0>Documentazione</0> per maggiori informazioni."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "On this page, you can create new Webhooks and manage the existing ones."
 msgstr "In questa pagina, puoi creare nuovi Webhook e gestire quelli esistenti."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "On this page, you can edit the webhook and its settings."
 msgstr "In questa pagina, puoi modificare il webhook e le sue impostazioni."
 
@@ -4005,18 +4462,18 @@ msgstr "Una volta scansionato il codice QR o inserito manualmente il codice, ins
 msgid "Once your template is set up, share the link anywhere you want. The person who opens the link will be able to enter their information in the direct link recipient field and complete any other fields assigned to them."
 msgstr "Una volta configurato il tuo modello, condividi il link ovunque tu voglia. La persona che apre il link potrà inserire le proprie informazioni nel campo destinatario del link diretto e completare qualsiasi altro campo assegnato a loro."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "One of the documents in the current bundle has a signing role that is not compatible with the current signing experience."
+msgstr ""
+
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Only admins can access and view the document"
 msgstr "Solo gli amministratori possono accedere e visualizzare il documento"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Only managers and above can access and view the document"
 msgstr "Solo i manager e superiori possono accedere e visualizzare il documento"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Only subscribers can have a username shorter than 6 characters"
-msgstr "Solo gli abbonati possono avere un nome utente più corto di 6 caratteri"
-
 #: apps/remix/app/routes/_profile+/_layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
@@ -4036,15 +4493,131 @@ msgstr "Oppure"
 msgid "Or continue with"
 msgstr "Oppure continua con"
 
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "Organisation"
+msgstr ""
+
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Admin"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Organisation created"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Organisation group not found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Organisation Group Settings"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation has been updated successfully"
+msgstr ""
+
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "Organisation invitation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Organisation invitations have been sent."
+msgstr ""
+
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Manager"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Member"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation Members"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Organisation Name"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation not found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Organisation Preferences"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Organisation role"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Organisation Role"
+msgstr ""
+
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Organisation settings"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+msgid "Organisation Settings"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation Teams"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Organisation URL"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/routes/_authenticated+/settings+/organisations.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+#: apps/remix/app/components/general/settings-nav-mobile.tsx
+#: apps/remix/app/components/general/settings-nav-desktop.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Organisations"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "Organisations that the user is a member of."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Organise your members into groups which can be assigned to teams"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Organize your documents and templates"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Otherwise, the document will be created as a draft."
 msgstr "Altrimenti, il documento sarà creato come bozza."
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Owner"
 msgstr "Proprietario"
 
@@ -4059,10 +4632,7 @@ msgstr "Pagina {0} di {1}"
 msgid "Page {0} of {numPages}"
 msgstr "Pagina {0} di {numPages}"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "Paid"
-msgstr "Pagato"
-
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/forms/signin.tsx
 msgid "Passkey"
 msgstr "Password"
@@ -4105,12 +4675,18 @@ msgid "Passkeys are not supported on this browser"
 msgstr "Le passkey non sono supportate su questo browser"
 
 #: apps/remix/app/components/general/app-command-menu.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/forms/signin.tsx
 #: apps/remix/app/components/forms/reset-password.tsx
 msgid "Password"
 msgstr "\"Password\""
 
+#: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
+msgid "Password Re-Authentication"
+msgstr ""
+
 #: packages/email/templates/forgot-password.tsx
 msgid "Password Reset Requested"
 msgstr "Richiesta di reimpostazione password"
@@ -4133,21 +4709,12 @@ msgstr "Password aggiornato"
 msgid "Password updated!"
 msgstr "Password aggiornata!"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "Pay"
-msgstr "Paga"
-
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Payment is required to finalise the creation of your team."
-msgstr "È necessario il pagamento per completare la creazione del tuo team."
-
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Payment overdue"
 msgstr "Pagamento scaduto"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
@@ -4168,22 +4735,36 @@ msgstr "Documenti in sospeso"
 msgid "Pending Documents"
 msgstr "Documenti in sospeso"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "Pending invitations"
 msgstr "Inviti in sospeso"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "Pending team deleted."
-msgstr "Team in sospeso eliminato."
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "per month"
+msgstr ""
 
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "per year"
+msgstr ""
+
+#: apps/remix/app/components/tables/user-organisations-table.tsx
 msgid "Personal"
 msgstr "Personale"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 msgid "Personal Account"
 msgstr "Account personale"
 
+#: apps/remix/app/routes/_authenticated+/inbox.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/menu-switcher.tsx
+msgid "Personal Inbox"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
 msgid "Pick a number"
 msgstr "Scegli un numero"
@@ -4223,7 +4804,7 @@ msgstr "Per favore {recipientActionVerb} questo documento creato dal tuo modello
 msgid "Please {recipientActionVerb} your document"
 msgstr "Per favore {recipientActionVerb} il tuo documento"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Please check the CSV file and make sure it is according to our format"
 msgstr "Si prega di controllare il file CSV e assicurarsi che sia conforme al nostro formato"
 
@@ -4256,6 +4837,10 @@ msgstr "Per favore conferma il tuo indirizzo email"
 msgid "Please contact support if you would like to revert this action."
 msgstr "Si prega di contattare il supporto se si desidera annullare questa azione."
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Please contact the site owner for further assistance."
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "Please enter a meaningful name for your token. This will help you identify it later."
 msgstr "Si prega di inserire un nome significativo per il proprio token. Questo ti aiuterà a identificarlo più tardi."
@@ -4341,17 +4926,25 @@ msgstr "Per favore, digita {0} per confermare"
 msgid "Please type <0>{0}</0> to confirm."
 msgstr "Si prega di digitare <0>{0}</0> per confermare."
 
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Please upload a logo"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
 msgid "Pre-formatted CSV template with example data."
 msgstr "Modello CSV preformattato con dati di esempio."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/components/general/settings-nav-mobile.tsx
+#: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Preview"
 msgstr "Anteprima"
 
@@ -4379,11 +4972,11 @@ msgstr "Procedi"
 msgid "Profile"
 msgstr "Profilo"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Profile is currently <0>hidden</0>."
 msgstr "Il profilo è attualmente <0>nascosto</0>."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Profile is currently <0>visible</0>."
 msgstr "Il profilo è attualmente <0>visibile</0>."
 
@@ -4392,12 +4985,16 @@ msgstr "Il profilo è attualmente <0>visibile</0>."
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Progress"
+msgstr ""
+
 #: apps/remix/app/components/tables/templates-table.tsx
 #: apps/remix/app/components/general/template/template-type.tsx
 msgid "Public"
 msgstr "Pubblico"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -4409,10 +5006,6 @@ msgstr "Profilo pubblico"
 msgid "Public profile URL"
 msgstr "URL del profilo pubblico"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Public profile username"
-msgstr "Nome utente del profilo pubblico"
-
 #: apps/remix/app/components/tables/templates-table.tsx
 msgid "Public templates are connected to your public profile. Any modifications to public templates will also appear in your public profile."
 msgstr "I modelli pubblici sono collegati al tuo profilo pubblico. Ogni modifica ai modelli pubblici apparirà anche nel tuo profilo pubblico."
@@ -4482,6 +5075,7 @@ msgstr "Attività recenti"
 msgid "Recent documents"
 msgstr "Documenti recenti"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
@@ -4562,6 +5156,7 @@ msgstr "Rifiuta Documento"
 #: apps/remix/app/components/general/stack-avatars-with-tooltip.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/document.ts
 msgid "Rejected"
 msgstr "Rifiutato"
@@ -4596,43 +5191,47 @@ msgstr "Promemoria: per favore {recipientActionVerb} questo documento"
 msgid "Reminder: Please {recipientActionVerb} your document"
 msgstr "Promemoria: per favore {recipientActionVerb} il tuo documento"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-field-container.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: packages/ui/primitives/document-flow/field-item.tsx
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "Remove"
 msgstr "Rimuovi"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+msgid "Remove organisation group"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+msgid "Remove organisation member"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 msgid "Remove team email"
 msgstr "Rimuovere l'email del team"
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "Remove team member"
 msgstr "Rimuovere il membro del team"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Renews: {formattedDate}"
-msgstr "Rinnova: {formattedDate}"
-
 #: apps/remix/app/components/forms/reset-password.tsx
 #: apps/remix/app/components/forms/password.tsx
 msgid "Repeat Password"
 msgstr "Ripeti Password"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Request transfer"
-msgstr "Richiedi trasferimento"
-
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx
@@ -4645,7 +5244,7 @@ msgstr "Campo richiesto"
 msgid "Reseal document"
 msgstr "Risigilla documento"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Resend"
@@ -4661,6 +5260,7 @@ msgstr "Reinvia verifica"
 
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 msgid "Reset"
 msgstr "Ripristina"
 
@@ -4679,11 +5279,11 @@ msgstr "Reimposta password"
 msgid "Resetting Password..."
 msgstr "Reimpostazione della password..."
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Resolve"
 msgstr "Risolvi"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Resolve payment"
 msgstr "Risolvere il pagamento"
 
@@ -4691,6 +5291,10 @@ msgstr "Risolvere il pagamento"
 msgid "Rest assured, your document is strictly confidential and will never be shared. Only your signing experience will be highlighted. Share your personalized signing card to showcase your signature!"
 msgstr "Stai tranquillo, il tuo documento è strettamente confidenziale e non sarà mai condiviso. Solo la tua esperienza di firma sarà evidenziata. Condividi la tua carta di firma personalizzata per mostrare la tua firma!"
 
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
+msgid "Restricted Access"
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Retention of Documents"
 msgstr "Conservazione dei documenti"
@@ -4701,16 +5305,12 @@ msgstr "Riprova"
 
 #: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Return"
 msgstr "Ritorna"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "Return to Dashboard"
-msgstr "Torna al cruscotto"
-
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Return to Home"
 msgstr "Torna alla home"
 
@@ -4727,13 +5327,17 @@ msgstr "Revoca"
 msgid "Revoke access"
 msgstr "Revoca l'accesso"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
 msgid "Role"
 msgstr "Ruolo"
 
@@ -4764,13 +5368,23 @@ msgstr "Salva"
 msgid "Save Template"
 msgstr "Salva modello"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
 #: apps/remix/app/components/tables/documents-table-sender-filter.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 msgid "Search"
 msgstr "Cerca"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Search and manage all organisations"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Search by claim ID or name"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 msgid "Search by document title"
 msgstr "Cerca per titolo del documento"
@@ -4780,6 +5394,10 @@ msgstr "Cerca per titolo del documento"
 msgid "Search by name or email"
 msgstr "Cerca per nome o email"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Search by organisation ID, name, customer ID or owner email"
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-search.tsx
 msgid "Search documents..."
 msgstr "Cerca documenti..."
@@ -4788,7 +5406,6 @@ msgstr "Cerca documenti..."
 msgid "Search languages..."
 msgstr "Cerca lingue..."
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Secret"
 msgstr "Segreto"
@@ -4813,18 +5430,17 @@ msgstr "Seleziona"
 msgid "Select a folder to move this document to."
 msgstr "Seleziona una cartella in cui spostare questo documento."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Select a team"
-msgstr "Seleziona un team"
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Select a plan"
+msgstr ""
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Select a team to move this document to. This action cannot be undone."
-msgstr "Seleziona un team a cui spostare questo documento. Questa azione non può essere annullata."
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Select a plan to continue"
+msgstr ""
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Select a team to move this template to. This action cannot be undone."
-msgstr "Seleziona un team a cui spostare questo modello. Questa azione non può essere annullata."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Select a team to view its dashboard"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Select a template you'd like to display on your public profile"
@@ -4834,22 +5450,70 @@ msgstr "Seleziona un modello che desideri mostrare nel tuo profilo pubblico"
 msgid "Select a template you'd like to display on your team's public profile"
 msgstr "Seleziona un modello che desideri mostrare nel profilo pubblico del tuo team"
 
+#: packages/ui/components/document/document-global-auth-access-select.tsx
+msgid "Select access methods"
+msgstr ""
+
 #: packages/ui/primitives/combobox.tsx
 msgid "Select an option"
 msgstr "Seleziona un'opzione"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Select an organisation to view teams"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
 msgid "Select at least"
 msgstr "Seleziona almeno"
 
+#: packages/ui/components/recipient/recipient-action-auth-select.tsx
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "Select authentication methods"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/dropdown-field.tsx
 msgid "Select default option"
 msgstr "Seleziona opzione predefinita"
 
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select groups"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select groups to add to this team"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Select members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select members or groups of members to add to the team."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Select members to add to this team"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 msgid "Select passkey"
 msgstr "Seleziona una chiave di accesso"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Select signature types"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Select the members to add to this group"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Select the members to include in this group"
+msgstr ""
+
 #: apps/remix/app/components/general/webhook-multiselect-combobox.tsx
 #: apps/remix/app/components/general/webhook-multiselect-combobox.tsx
 msgid "Select triggers"
@@ -4898,7 +5562,7 @@ msgstr "Invia documenti a nome del team utilizzando l'indirizzo email"
 msgid "Send documents to recipients immediately"
 msgstr "Invia documenti ai destinatari immediatamente"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Send on Behalf of Team"
 msgstr "Invia per conto del team"
 
@@ -4918,6 +5582,7 @@ msgstr "Invia email richiesta firma destinatario"
 msgid "Send reminder"
 msgstr "Invia promemoria"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 msgid "Sender"
 msgstr "Mittente"
@@ -4947,7 +5612,10 @@ msgstr "Configura le proprietà del documento e le informazioni sui destinatari"
 msgid "Set up your template properties and recipient information"
 msgstr "Configura le proprietà del modello e le informazioni sui destinatari"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/routes/_authenticated+/settings+/_layout.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -4980,7 +5648,7 @@ msgstr "Condividi il link"
 msgid "Share your signing experience!"
 msgstr "Condividi la tua esperienza di firma!"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Show"
 msgstr "Mostra"
 
@@ -4993,15 +5661,12 @@ msgstr "Mostra informazioni aggiuntive"
 msgid "Show advanced settings"
 msgstr "Mostra impostazioni avanzate"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Show templates in your public profile for your audience to sign and get started quickly"
 msgstr "Mostra modelli nel tuo profilo pubblico per il tuo pubblico da firmare e iniziare rapidamente"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Show templates in your team public profile for your audience to sign and get started quickly"
-msgstr "Mostra modelli nel profilo pubblico della tua squadra per il tuo pubblico da firmare e iniziare rapidamente"
-
 #: apps/remix/app/routes/_profile+/p.$url.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/user-profile-timur.tsx
@@ -5010,6 +5675,7 @@ msgstr "Mostra modelli nel profilo pubblico della tua squadra per il tuo pubblic
 #: apps/remix/app/components/general/document-signing/document-signing-name-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 #: apps/remix/app/components/general/document/document-page-view-button.tsx
 #: packages/lib/constants/recipient-roles.ts
@@ -5030,6 +5696,7 @@ msgstr "Firma come<0>{0} <1>({1})</1></0>"
 
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Sign document"
 msgstr "Firma il documento"
 
@@ -5038,6 +5705,11 @@ msgstr "Firma il documento"
 msgid "Sign Document"
 msgstr "Firma documento"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Sign Documents"
+msgstr ""
+
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 msgid "Sign field"
 msgstr "Campo di firma"
@@ -5053,9 +5725,11 @@ msgid "Sign In"
 msgstr "Accedi"
 
 #: apps/remix/app/routes/_unauthenticated+/signin.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 msgid "Sign in to your account"
 msgstr "Accedi al tuo account"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 msgid "Sign Out"
@@ -5063,6 +5737,7 @@ msgstr "Disconnetti"
 
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Sign the document to complete the process."
 msgstr "Firma il documento per completare il processo."
 
@@ -5086,6 +5761,7 @@ msgstr "Iscriviti con OIDC"
 #: apps/remix/app/components/forms/profile.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
 #: packages/ui/primitives/document-flow/types.ts
 #: packages/ui/primitives/document-flow/add-fields.tsx
@@ -5208,24 +5884,25 @@ msgstr "Alcuni firmatari non hanno un campo firma assegnato. Assegna almeno 1 ca
 
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/share-document-download-button.tsx
-#: apps/remix/app/components/general/billing-portal-button.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-page.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-account.tsx
 #: apps/remix/app/components/general/document/document-page-view-dropdown.tsx
@@ -5235,7 +5912,6 @@ msgstr "Alcuni firmatari non hanno un campo firma assegnato. Assegna almeno 1 ca
 #: apps/remix/app/components/general/document/document-audit-log-download-button.tsx
 #: apps/remix/app/components/general/direct-template/direct-template-signing-auth-page.tsx
 #: apps/remix/app/components/general/direct-template/direct-template-page.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
@@ -5243,11 +5919,11 @@ msgstr "Alcuni firmatari non hanno un campo firma assegnato. Assegna almeno 1 ca
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
@@ -5255,11 +5931,6 @@ msgstr "Alcuni firmatari non hanno un campo firma assegnato. Assegna almeno 1 ca
 msgid "Something went wrong"
 msgstr "Qualcosa è andato storto"
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Something went wrong while attempting to transfer the ownership of team <0>{0}</0> to your. Please try again later or contact support."
-msgstr "Qualcosa è andato storto durante il tentativo di trasferimento della proprietà del team <0>{0}</0> a te. Riprova più tardi o contatta il supporto."
-
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "Something went wrong while attempting to verify your email address for <0>{0}</0>. Please try again later."
@@ -5282,7 +5953,8 @@ msgstr "Qualcosa è andato storto durante l'invio dell'e-mail di conferma."
 msgid "Something went wrong while updating the team billing subscription, please contact support."
 msgstr "Qualcosa è andato storto durante l'aggiornamento dell'abbonamento di fatturazione del team, contatta il supporto."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Something went wrong!"
 msgstr "Qualcosa è andato storto!"
 
@@ -5307,6 +5979,7 @@ msgstr "Siamo spiacenti, non siamo riusciti a scaricare i log di verifica. Ripro
 msgid "Sorry, we were unable to download the certificate. Please try again later."
 msgstr "Siamo spiacenti, non siamo riusciti a scaricare il certificato. Riprova più tardi."
 
+#: apps/remix/app/components/tables/team-members-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Source"
 msgstr "Fonte"
@@ -5316,10 +5989,11 @@ msgid "Stats"
 msgstr "Statistiche"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Status"
 msgstr "Stato"
@@ -5328,48 +6002,78 @@ msgstr "Stato"
 msgid "Step <0>{step} of {maxStep}</0>"
 msgstr "Passo <0>{step} di {maxStep}</0>"
 
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "Stripe"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Stripe customer created successfully"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Stripe Customer ID"
+msgstr ""
+
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Subject <0>(Optional)</0>"
 msgstr "Oggetto <0>(Opzionale)</0>"
 
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
 msgid "Subscribe"
 msgstr "Iscriviti"
 
-#: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Subscription"
 msgstr "Abbonamento"
 
-#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
-msgid "Subscriptions"
-msgstr "Abbonamenti"
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Subscription claim created successfully."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Subscription claim deleted successfully."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Subscription claim updated successfully."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Subscription Claims"
+msgstr ""
 
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/general/verify-email-banner.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
@@ -5378,6 +6082,15 @@ msgstr "Abbonamenti"
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 msgid "Success"
 msgstr "Successo"
 
@@ -5401,8 +6114,9 @@ msgstr "Requisiti di sistema"
 msgid "System Theme"
 msgstr "Tema del sistema"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table.tsx
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
 msgid "Team"
 msgstr "Squadra"
 
@@ -5411,9 +6125,18 @@ msgstr "Squadra"
 msgid "Team \"{0}\" has been deleted on Documenso"
 msgstr "Il team \"{0}\" è stato eliminato su Documenso"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Team checkout"
-msgstr "Acquisto squadra"
+#: packages/lib/constants/teams-translations.ts
+msgid "Team Admin"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Team Assignments"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Team Count"
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
@@ -5457,25 +6180,34 @@ msgstr "Email del team verificato!"
 msgid "Team email was updated."
 msgstr "L'email del team è stato aggiornato."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "Team invitation"
-msgstr "Invito del team"
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
+msgid "Team Groups"
+msgstr ""
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "Team invitations have been sent."
-msgstr "Gli inviti del team sono stati inviati."
+#: packages/lib/constants/teams-translations.ts
+msgid "Team Manager"
+msgstr ""
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: packages/lib/constants/teams-translations.ts
 msgid "Team Member"
 msgstr "Membro del team"
 
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+msgid "Team Members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Team members have been added."
+msgstr ""
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Team Name"
 msgstr "Nome del team"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "Team not found"
 msgstr "Squadra non trovata"
@@ -5488,27 +6220,17 @@ msgstr "Solo team"
 msgid "Team only templates are not linked anywhere and are visible only to your team."
 msgstr "I modelli solo per il team non sono collegati da nessuna parte e sono visibili solo al tuo team."
 
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transfer"
-msgstr "Trasferimento di proprietà del team"
-
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transfer already completed!"
-msgstr "Trasferimento della proprietà del team già completato!"
-
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transferred!"
-msgstr "Proprietà del team trasferita!"
-
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Team Preferences"
 msgstr "Preferenze del team"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Team Public Profile"
-msgstr "Profilo pubblico del team"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Team Role"
+msgstr ""
 
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 msgid "Team settings"
 msgstr "Impostazioni del team"
 
@@ -5516,44 +6238,37 @@ msgstr "Impostazioni del team"
 msgid "Team Settings"
 msgstr "Impostazioni del team"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Team templates"
-msgstr "Modelli del team"
-
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "Team transfer in progress"
-msgstr "Trasferimento del team in corso"
-
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "Team transfer request expired"
-msgstr "Richiesta di trasferimento del team scaduta"
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Team url"
+msgstr ""
 
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Team URL"
 msgstr "URL del team"
 
-#: apps/remix/app/routes/_authenticated+/settings+/teams.tsx
-#: apps/remix/app/components/general/settings-nav-mobile.tsx
-#: apps/remix/app/components/general/settings-nav-desktop.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
-#: apps/remix/app/components/general/app-nav-mobile.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 msgid "Teams"
 msgstr "Team"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-msgid "Teams restricted"
-msgstr "Team limitati"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Teams help you organise your work and collaborate with others. Create your first team to get started."
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Teams that this organisation group is currently assigned to"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Template"
 msgstr "Modello"
 
@@ -5586,14 +6301,9 @@ msgid "Template is using legacy field insertion"
 msgstr "Il modello utilizza l'inserimento campo legacy"
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 msgid "Template moved"
 msgstr "Modello spostato"
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Template not found or already associated with a team."
-msgstr "Modello non trovato o già associato a un team."
-
 #: apps/remix/app/components/general/template/template-edit-form.tsx
 msgid "Template saved"
 msgstr "Modello salvato"
@@ -5606,10 +6316,10 @@ msgstr "Titolo del modello"
 msgid "Template updated successfully"
 msgstr "Modello aggiornato con successo"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -5641,6 +6351,10 @@ msgstr "Allineamento del testo"
 msgid "Text Color"
 msgstr "Colore del testo"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Thank you for completing the signing process."
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Thank you for using Documenso to perform your electronic document signing. The purpose of this disclosure is to inform you about the process, legality, and your rights regarding the use of electronic signatures on our platform. By opting to use an electronic signature, you are agreeing to the terms and conditions outlined below."
 msgstr "Grazie per aver utilizzato Documenso per eseguire la firma elettronica dei tuoi documenti. Lo scopo di questa divulgazione è informarti sul processo, la legalità e i tuoi diritti riguardanti l'uso delle firme elettroniche sulla nostra piattaforma. Optando per l'utilizzo di una firma elettronica, accetti i termini e le condizioni delineati di seguito."
@@ -5662,16 +6376,16 @@ msgid "The account has been enabled successfully."
 msgstr "L'account è stato abilitato con successo."
 
 #: packages/ui/components/recipient/recipient-action-auth-select.tsx
-msgid "The authentication required for recipients to sign fields"
-msgstr "Autenticazione richiesta per i destinatari per firmare i campi"
+msgid "The authentication methods required for recipients to sign fields"
+msgstr ""
 
 #: packages/ui/components/document/document-global-auth-action-select.tsx
-msgid "The authentication required for recipients to sign the signature field."
-msgstr "Autenticazione richiesta per i destinatari per firmare il campo della firma."
+msgid "The authentication methods required for recipients to sign the signature field."
+msgstr ""
 
 #: packages/ui/components/document/document-global-auth-access-select.tsx
-msgid "The authentication required for recipients to view the document."
-msgstr "Autenticazione richiesta per i destinatari per visualizzare il documento."
+msgid "The authentication methods required for recipients to view the document."
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "The content to show in the banner, HTML is allowed"
@@ -5687,10 +6401,6 @@ msgstr "Il link diretto è stato copiato negli appunti"
 msgid "The document has been moved successfully."
 msgstr "Il documento è stato spostato con successo."
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "The document has been successfully moved to the selected team."
-msgstr "Il documento è stato spostato con successo al team selezionato."
-
 #: apps/remix/app/components/embed/authoring/configure-document-upload.tsx
 msgid "The document is already saved and cannot be changed."
 msgstr "Il documento è già salvato e non può essere modificato."
@@ -5760,17 +6470,30 @@ msgid "The following errors occurred:"
 msgstr "Si sono verificati i seguenti errori:"
 
 #: packages/email/templates/team-delete.tsx
-msgid "The following team has been deleted by its owner. You will no longer be able to access this team and its documents"
-msgstr "Il seguente team è stato eliminato dal suo proprietario. Non potrai più accedere a questo team e ai suoi documenti"
+msgid "The following team has been deleted. You will no longer be able to access this team and its documents"
+msgstr ""
 
-#: packages/email/templates/team-delete.tsx
-msgid "The following team has been deleted by you"
-msgstr "Il seguente team è stato eliminato da te"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid ""
+"The organisation group you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "The ownership of team <0>{0}</0> has been successfully transferred to you."
-msgstr "La proprietà del team <0>{0}</0> è stata trasferita con successo a te."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "The organisation role that will be applied to all members in this group."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid ""
+"The organisation you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid ""
+"The organisation you are looking for may have been removed, renamed or may have never\n"
+"                  existed."
+msgstr ""
 
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "The page you are looking for was moved, removed, renamed or might never have existed."
@@ -5820,10 +6543,6 @@ msgstr "Il destinatario è tenuto a firmare il documento affinché sia completat
 msgid "The recipient is required to view the document for it to be completed."
 msgstr "Il destinatario è tenuto a visualizzare il documento affinché sia completato."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "The selected team member will receive an email which they must accept before the team is transferred"
-msgstr "Il membro del team selezionato riceverà un'email che dovrà accettare prima che il team venga trasferito"
-
 #: packages/ui/components/document/document-share-button.tsx
 msgid "The sharing link could not be created at this time. Please try again."
 msgstr "Il link di condivisione non può essere creato in questo momento. Per favore riprova."
@@ -5855,14 +6574,11 @@ msgstr "Il banner del sito è un messaggio che viene mostrato in cima al sito. P
 msgid "The team email <0>{teamEmail}</0> has been removed from the following team"
 msgstr "L'email del team <0>{teamEmail}</0> è stata rimossa dal seguente team"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "The team transfer invitation has been successfully deleted."
-msgstr "L'invito al trasferimento del team è stato eliminato con successo."
-
-#. placeholder {0}: transferVerification.name
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "The team transfer request to <0>{0}</0> has expired."
-msgstr "La richiesta di trasferimento del team a <0>{0}</0> è scaduta."
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid ""
+"The team you are looking for may have been removed, renamed or may have never\n"
+"                  existed."
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "The team you are looking for may have been removed, renamed or may have never\n"
@@ -5874,10 +6590,6 @@ msgstr "La squadra che stai cercando potrebbe essere stata rimossa, rinominata o
 msgid "The template has been moved successfully."
 msgstr "Il modello è stato spostato con successo."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "The template has been successfully moved to the selected team."
-msgstr "Il modello è stato spostato con successo al team selezionato."
-
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "The template will be removed from your profile"
 msgstr "Il modello sarà rimosso dal tuo profilo"
@@ -5903,17 +6615,21 @@ msgid "The types of signatures that recipients are allowed to use when signing t
 msgstr "I tipi di firma che i destinatari possono utilizzare quando firmano il documento."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "The URL for Documenso to send webhook events to."
 msgstr "L'URL per Documenso per inviare eventi webhook."
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid ""
+"The user you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 msgid "The webhook has been successfully deleted."
 msgstr "Il webhook è stato eliminato con successo."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "The webhook has been updated successfully."
 msgstr "Il webhook è stato aggiornato con successo."
 
@@ -5933,6 +6649,14 @@ msgstr "Non ci sono ancora documenti completati. I documenti che hai creato o ri
 msgid "There was an error uploading your file. Please try again."
 msgstr "Si è verificato un errore durante il caricamento del tuo file. Per favore riprova."
 
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "These can be overriden by setting the authentication requirements directly on each recipient in the next step. Multiple methods can be selected."
+msgstr ""
+
+#: packages/ui/components/recipient/recipient-action-auth-select.tsx
+msgid "These will override any global settings. Multiple methods can be selected."
+msgstr ""
+
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 msgid "They have permission on your behalf to:"
 msgstr "Hanno il permesso per tuo conto di:"
@@ -5955,9 +6679,9 @@ msgstr "Questa azione non è reversibile. Si prega di essere certi."
 msgid "This action is reversible, but please be careful as the account may be affected permanently (e.g. their settings and contents not being restored properly)."
 msgstr "Questa azione è reversibile, ma fai attenzione poiché l'account potrebbe essere influenzato permanentemente (ad es. le impostazioni e i contenuti potrebbero non essere ripristinati correttamente)."
 
-#: packages/ui/components/document/document-global-auth-action-select.tsx
-msgid "This can be overriden by setting the authentication requirements directly on each recipient in the next step."
-msgstr "Questo può essere sovrascritto impostando i requisiti di autenticazione direttamente su ciascun destinatario nel passaggio successivo."
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "This claim is locked and cannot be deleted."
+msgstr ""
 
 #: packages/email/template-components/template-document-super-delete.tsx
 msgid "This document can not be recovered, if you would like to dispute the reason for future documents please contact support."
@@ -5991,13 +6715,11 @@ msgstr "Questo documento è stato annullato dal proprietario e non è più dispo
 msgid "This document has been cancelled by the owner."
 msgstr "Questo documento è stato annullato dal proprietario."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document has been rejected by a recipient"
 msgstr "Questo documento è stato rifiutato da un destinatario"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document has been signed by all recipients"
 msgstr "Questo documento è stato firmato da tutti i destinatari"
 
@@ -6005,8 +6727,7 @@ msgstr "Questo documento è stato firmato da tutti i destinatari"
 msgid "This document is available in your Documenso account. You can view more details, recipients, and audit logs there."
 msgstr "Questo documento è disponibile nel tuo account Documenso. Puoi visualizzare più dettagli, destinatari e log di controllo lì."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document is currently a draft and has not been sent"
 msgstr "Questo documento è attualmente una bozza e non è stato inviato"
 
@@ -6063,14 +6784,22 @@ msgstr "Questo nome di cartella è già usato."
 msgid "This is how the document will reach the recipients once the document is ready for signing."
 msgstr "È così che il documento raggiungerà i destinatari una volta pronto per essere firmato."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "This is the claim that this organisation was initially created with. Any feature flag changes to this claim will be backported into this organisation."
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "This link is invalid or has expired. Please contact your team to resend a transfer request."
-msgstr "Questo link è invalido o è scaduto. Si prega di contattare il tuo team per inviare nuovamente una richiesta di trasferimento."
+msgid "This link is invalid or has expired."
+msgstr ""
 
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "This link is invalid or has expired. Please contact your team to resend a verification."
 msgstr "Questo link è invalido o è scaduto. Si prega di contattare il tuo team per inviare nuovamente una verifica."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "This organisation, and any associated data will be permanently deleted."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "This passkey has already been registered."
 msgstr "Questa chiave d'accesso è già stata registrata."
@@ -6079,10 +6808,6 @@ msgstr "Questa chiave d'accesso è già stata registrata."
 msgid "This passkey is not configured for this application. Please login and add one in the user settings."
 msgstr "Questa chiave di accesso non è configurata per questa applicazione. Effettua il login e aggiungine una nelle impostazioni utente."
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "This price includes minimum 5 seats."
-msgstr "Questo prezzo include almeno 5 posti."
-
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "This recipient can no longer be modified as they have signed a field, or completed the document."
 msgstr "Questo destinatario non può più essere modificato poiché ha firmato un campo o completato il documento."
@@ -6107,23 +6832,20 @@ msgstr "Questo modello non può essere eliminato in questo momento. Per favore p
 msgid "This template is using legacy field insertion, we recommend using the new field insertion method for more accurate results."
 msgstr "Questo modello utilizza l'inserimento campo legacy, consigliamo di utilizzare il nuovo metodo di inserimento campo per risultati più accurati."
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "This token is invalid or has expired. No action is needed."
 msgstr "Questo token è invalido o è scaduto. Non è necessaria alcuna azione."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "This token is invalid or has expired. Please contact your team for a new invitation."
 msgstr "Questo token è invalido o è scaduto. Si prega di contattare il vostro team per un nuovo invito."
 
 #: apps/remix/app/components/forms/team-update-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "This URL is already in use."
 msgstr "Questo URL è già in uso."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "This username has already been taken"
-msgstr "Questo nome utente è già stato preso"
-
 #: packages/ui/components/document/document-email-checkboxes.tsx
 msgid "This will be sent to all recipients if a pending document has been deleted."
 msgstr "Questo sarà inviato a tutti i destinatari se un documento in attesa è stato eliminato."
@@ -6136,17 +6858,16 @@ msgstr "Questo sarà inviato a tutti i destinatari una volta che il documento è
 msgid "This will be sent to the document owner once the document has been fully completed."
 msgstr "Questo sarà inviato al proprietario del documento una volta che il documento è stato completamente completato."
 
-#: packages/ui/components/recipient/recipient-action-auth-select.tsx
-msgid "This will override any global settings."
-msgstr "Questo sovrascriverà qualsiasi impostazione globale."
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "This will ONLY backport feature flags which are set to true, anything disabled in the initial claim will not be backported"
+msgstr ""
 
 #: apps/remix/app/components/tables/internal-audit-log-table.tsx
 #: apps/remix/app/components/tables/document-logs-table.tsx
 msgid "Time"
 msgstr "Ora"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Time zone"
 msgstr "Fuso orario"
 
@@ -6159,6 +6880,7 @@ msgstr "Fuso orario"
 
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 #: apps/remix/app/components/tables/templates-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-view.tsx
@@ -6170,7 +6892,7 @@ msgstr "Titolo"
 msgid "Title cannot be empty"
 msgstr "Il titolo non può essere vuoto"
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "To accept this invitation you must create an account."
 msgstr "Per accettare questo invito devi creare un account."
 
@@ -6191,10 +6913,6 @@ msgstr "Per confermare, inserisci l'indirizzo email dell'account <0/>({0})."
 msgid "To confirm, please enter the reason"
 msgstr "Per confermare, per favore inserisci il motivo"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "To decline this invitation you must create an account."
-msgstr "Per rifiutare questo invito devi creare un account."
-
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "To enable two-factor authentication, scan the following QR code using your authenticator app."
 msgstr "Per abilitare l'autenticazione a due fattori, scansiona il seguente codice QR utilizzando la tua app di autenticazione."
@@ -6223,11 +6941,11 @@ msgstr "Per utilizzare il nostro servizio di firma elettronica, devi avere acces
 msgid "To view this document you need to be signed into your account, please sign in to continue."
 msgstr "Per visualizzare questo documento devi essere connesso al tuo account, per favore accedi per continuare."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Toggle the switch to hide your profile from the public."
 msgstr "Attiva l'interruttore per nascondere il tuo profilo al pubblico."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Toggle the switch to show your profile to the public."
 msgstr "Attiva l'interruttore per mostrare il tuo profilo al pubblico."
 
@@ -6247,7 +6965,7 @@ msgstr "Token creato"
 msgid "Token deleted"
 msgstr "Token eliminato"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Token doesn't have an expiration date"
 msgstr "Il token non ha una data di scadenza"
 
@@ -6283,26 +7001,7 @@ msgstr "Totale firmatari che si sono iscritti"
 msgid "Total Users"
 msgstr "Totale utenti"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "transfer {teamName}"
-msgstr "trasferisci {teamName}"
-
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Transfer ownership of this team to a selected team member."
-msgstr "Trasferisci la proprietà di questo team a un membro del team selezionato."
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Transfer team"
-msgstr "Trasferisci il team"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-msgid "Transfer the ownership of the team to another team member."
-msgstr "Trasferisci la proprietà del team a un altro membro del team."
-
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Triggers"
 msgstr "Trigger"
@@ -6369,11 +7068,11 @@ msgstr "Impossibile copiare il token"
 msgid "Unable to create direct template access. Please try again later."
 msgstr "Impossibile creare l'accesso diretto al modello. Si prega di riprovare più tardi."
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Unable to decline this team invitation at this time."
-msgstr "Impossibile rifiutare questo invito al team in questo momento."
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Unable to decline this invitation at this time."
+msgstr ""
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Unable to delete invitation. Please try again."
 msgstr "Impossibile eliminare l'invito. Si prega di riprovare."
 
@@ -6385,9 +7084,9 @@ msgstr "Impossibile eliminare il team"
 msgid "Unable to disable two-factor authentication"
 msgstr "Impossibile disabilitare l'autenticazione a due fattori"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Unable to join this team at this time."
-msgstr "Impossibile unirsi a questo team in questo momento."
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Unable to join this organisation at this time."
+msgstr ""
 
 #: apps/remix/app/components/general/document/document-page-view-recent-activity.tsx
 #: apps/remix/app/components/general/document/document-history-sheet.tsx
@@ -6410,7 +7109,7 @@ msgstr "Impossibile rimuovere la verifica e-mail in questo momento. Si prega di
 msgid "Unable to remove team email at this time. Please try again."
 msgstr "Impossibile rimuovere l'e-mail del team in questo momento. Si prega di riprovare."
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Unable to resend invitation. Please try again."
 msgstr "Impossibile reinviare l'invito. Si prega di riprovare."
 
@@ -6432,7 +7131,10 @@ msgstr "Impossibile configurare l'autenticazione a due fattori"
 msgid "Unable to sign in"
 msgstr "Impossibile accedere"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 msgid "Unauthorized"
 msgstr "Non autorizzato"
@@ -6446,22 +7148,35 @@ msgstr "Incompleto"
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "Unpaid"
-msgstr "Non pagato"
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "Unlimited"
+msgstr ""
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Unlimited documents, API and more"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Untitled Group"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Update"
@@ -6471,10 +7186,31 @@ msgstr "Aggiorna"
 msgid "Update Banner"
 msgstr "Aggiorna banner"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Update Billing"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Update Claim"
+msgstr ""
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Update current organisation"
+msgstr ""
+
 #: apps/remix/app/components/general/legacy-field-warning-popover.tsx
 msgid "Update Fields"
 msgstr "Aggiorna campi"
 
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Update organisation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "Update organisation member"
+msgstr ""
+
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "Update passkey"
 msgstr "Aggiorna chiave d'accesso"
@@ -6493,10 +7229,16 @@ msgstr "Aggiorna profilo"
 msgid "Update Recipient"
 msgstr "Aggiorna destinatario"
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
 msgid "Update role"
 msgstr "Aggiorna ruolo"
 
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Update Subscription Claim"
+msgstr ""
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 msgid "Update team"
 msgstr "Aggiorna team"
@@ -6506,6 +7248,11 @@ msgstr "Aggiorna team"
 msgid "Update team email"
 msgstr "Aggiorna email del team"
 
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "Update team group"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 msgid "Update team member"
@@ -6520,7 +7267,6 @@ msgid "Update user"
 msgstr "Aggiorna utente"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Update webhook"
 msgstr "Aggiorna webhook"
 
@@ -6537,6 +7283,11 @@ msgstr "Aggiornamento delle tue informazioni"
 msgid "Upgrade"
 msgstr "Aggiorna"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Upgrade <0>{0}</0> to {planName}"
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
 msgid "Upgrade your plan to upload more documents"
 msgstr "Aggiorna il tuo piano per caricare più documenti"
@@ -6584,7 +7335,7 @@ msgstr "Carica Firma"
 msgid "Upload Template Document"
 msgstr "Carica Documento Modello"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Upload your brand logo (max 5MB, JPG, PNG, or WebP)"
 msgstr "Carica il tuo logo aziendale (max 5MB, JPG, PNG o WebP)"
 
@@ -6609,8 +7360,7 @@ msgstr "Il file caricato non è di un tipo di file consentito"
 msgid "Uploading document..."
 msgstr "Caricamento documento in corso..."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Use"
 msgstr "Utilizza"
 
@@ -6628,6 +7378,10 @@ msgstr "Usa il Codice di Backup"
 msgid "Use Template"
 msgstr "Usa Modello"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Use your passkey for authentication"
+msgstr ""
+
 #: apps/remix/app/components/tables/internal-audit-log-table.tsx
 #: apps/remix/app/components/tables/document-logs-table.tsx
 msgid "User"
@@ -6637,9 +7391,9 @@ msgstr "Utente"
 msgid "User has no password."
 msgstr "L'utente non ha password."
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "User ID"
-msgstr "ID Utente"
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "User not found"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
@@ -6647,6 +7401,10 @@ msgstr "ID Utente"
 msgid "User not found."
 msgstr "Utente non trovato."
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "User Organisations"
+msgstr ""
+
 #: apps/remix/app/components/forms/signup.tsx
 msgid "User profiles are here!"
 msgstr "I profili utente sono qui!"
@@ -6659,10 +7417,6 @@ msgstr "Impostazioni utente"
 msgid "User with this email already exists. Please use a different email address."
 msgstr "Un utente con questo email esiste già. Si prega di utilizzare un indirizzo email diverso."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Username can only container alphanumeric characters and dashes."
-msgstr "Il nome utente può contenere solo caratteri alfanumerici e trattini."
-
 #: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
 msgid "Users"
 msgstr "Utenti"
@@ -6710,12 +7464,15 @@ msgstr "Verifica il tuo indirizzo email del team"
 msgid "Version History"
 msgstr "Cronologia delle versioni"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/document/document-page-view-button.tsx
 #: apps/remix/app/components/forms/2fa/view-recovery-codes-dialog.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "View"
 msgstr "Visualizza"
@@ -6765,7 +7522,7 @@ msgstr "Visualizza documento"
 msgid "View documents associated with this email"
 msgstr "Visualizza documenti associati a questa email"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "View invites"
 msgstr "Visualizza inviti"
 
@@ -6773,10 +7530,18 @@ msgstr "Visualizza inviti"
 msgid "View more"
 msgstr "Vedi di più"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "View next document"
+msgstr ""
+
 #: apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
 msgid "View Original Document"
 msgstr "Visualizza Documento Originale"
 
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "View owner"
+msgstr ""
+
 #: packages/email/template-components/template-document-self-signed.tsx
 msgid "View plans"
 msgstr "Visualizza piani"
@@ -6792,6 +7557,7 @@ msgstr "Visualizza squadre"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "Viewed"
 msgstr "Visualizzato"
@@ -6846,9 +7612,8 @@ msgstr "Vuoi il tuo profilo pubblico?"
 msgid "Warning: Assistant as last signer"
 msgstr "Avvertenza: Assistente come ultimo firmatario"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "We are unable to proceed to the billing portal at this time. Please try again, or contact support."
 msgstr "Non siamo in grado di procedere al portale di fatturazione in questo momento. Per favore riprova, o contatta l'assistenza."
 
@@ -6860,19 +7625,45 @@ msgstr "Non siamo in grado di rimuovere questa chiave d'accesso al momento. Per
 msgid "We are unable to update this passkey at the moment. Please try again later."
 msgstr "Non siamo in grado di aggiornare questa chiave d'accesso al momento. Per favore riprova più tardi."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "We couldn't create a Stripe customer. Please try again."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "We couldn't update the group. Please try again."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "We couldn't update the organisation. Please try again."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "We encountered an error while removing the direct template link. Please try again later."
 msgstr "Abbiamo riscontrato un errore durante la rimozione del link diretto al modello. Per favore riprova più tardi."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "We encountered an error while updating the webhook. Please try again later."
 msgstr "Abbiamo riscontrato un errore durante l'aggiornamento del webhook. Per favore riprova più tardi."
 
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to add team members. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 msgid "We encountered an unknown error while attempting to add this email. Please try again later."
 msgstr "Abbiamo riscontrato un errore sconosciuto mentre tentavamo di aggiungere questa email. Per favore riprova più tardi."
 
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to create a group. Please try again later."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to create a organisation. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "We encountered an unknown error while attempting to create a team. Please try again later."
 msgstr "Abbiamo riscontrato un errore sconosciuto mentre tentavamo di creare un team. Per favore riprova più tardi."
@@ -6881,9 +7672,9 @@ msgstr "Abbiamo riscontrato un errore sconosciuto mentre tentavamo di creare un
 msgid "We encountered an unknown error while attempting to delete it. Please try again later."
 msgstr "Abbiamo riscontrato un errore sconosciuto durante il tentativo di eliminarlo. Per favore riprova più tardi."
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "We encountered an unknown error while attempting to delete the pending team. Please try again later."
-msgstr "Abbiamo riscontrato un errore sconosciuto mentre tentavamo di eliminare il team in sospeso. Per favore riprova più tardi."
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "We encountered an unknown error while attempting to delete this organisation. Please try again later."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "We encountered an unknown error while attempting to delete this team. Please try again later."
@@ -6897,30 +7688,36 @@ msgstr "Abbiamo riscontrato un errore sconosciuto durante il tentativo di elimin
 msgid "We encountered an unknown error while attempting to delete your account. Please try again later."
 msgstr "Abbiamo riscontrato un errore sconosciuto durante il tentativo di eliminare il tuo account. Si prega di riprovare più tardi."
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "We encountered an unknown error while attempting to invite team members. Please try again later."
-msgstr "Abbiamo riscontrato un errore sconosciuto durante il tentativo di invitare membri del team. Si prega di riprovare più tardi."
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "We encountered an unknown error while attempting to disable access."
+msgstr ""
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "We encountered an unknown error while attempting to leave this team. Please try again later."
-msgstr "Abbiamo riscontrato un errore sconosciuto durante il tentativo di abbandonare questo team. Si prega di riprovare più tardi."
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "We encountered an unknown error while attempting to enable access."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "We encountered an unknown error while attempting to invite organisation members. Please try again later."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "We encountered an unknown error while attempting to leave this organisation. Please try again later."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "We encountered an unknown error while attempting to remove this group. Please try again later."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "We encountered an unknown error while attempting to remove this template from your profile. Please try again later."
 msgstr "Abbiamo riscontrato un errore sconosciuto durante il tentativo di rimuovere questo modello dal tuo profilo. Si prega di riprovare più tardi."
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "We encountered an unknown error while attempting to remove this transfer. Please try again or contact support."
-msgstr "Abbiamo riscontrato un errore sconosciuto durante il tentativo di rimuovere questo trasferimento. Si prega di riprovare o contattare il supporto."
-
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
 msgid "We encountered an unknown error while attempting to remove this user. Please try again later."
 msgstr "Abbiamo riscontrato un errore sconosciuto durante il tentativo di rimuovere questo utente. Si prega di riprovare più tardi."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "We encountered an unknown error while attempting to request a transfer of this team. Please try again later."
-msgstr "Abbiamo riscontrato un errore sconosciuto durante il tentativo di richiedere un trasferimento di questo team. Si prega di riprovare più tardi."
-
 #: apps/remix/app/components/forms/reset-password.tsx
 msgid "We encountered an unknown error while attempting to reset your password. Please try again later."
 msgstr "Abbiamo riscontrato un errore sconosciuto durante il tentativo di reimpostare la tua password. Si prega di riprovare più tardi."
@@ -6947,10 +7744,19 @@ msgstr "Abbiamo riscontrato un errore sconosciuto durante il tentativo di aggior
 msgid "We encountered an unknown error while attempting to update the template. Please try again later."
 msgstr "Abbiamo riscontrato un errore sconosciuto durante il tentativo di aggiornare il modello. Si prega di riprovare più tardi."
 
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "We encountered an unknown error while attempting to update this organisation member. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
 msgid "We encountered an unknown error while attempting to update this team member. Please try again later."
 msgstr "Abbiamo riscontrato un errore sconosciuto durante il tentativo di aggiornare questo membro del team. Si prega di riprovare più tardi."
 
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "We encountered an unknown error while attempting to update your organisation. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/forms/password.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 msgid "We encountered an unknown error while attempting to update your password. Please try again later."
@@ -6976,10 +7782,6 @@ msgstr "Abbiamo riscontrato un errore sconosciuto durante il tentativo di aggior
 msgid "We have sent a confirmation email for verification."
 msgstr "Abbiamo inviato un'email di conferma per la verifica."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "We need a username to create your profile"
-msgstr "Abbiamo bisogno di un nome utente per creare il tuo profilo"
-
 #: apps/remix/app/components/forms/signup.tsx
 msgid "We need your signature to sign documents"
 msgstr "Abbiamo bisogno della tua firma per firmare i documenti"
@@ -6992,10 +7794,6 @@ msgstr "Non siamo riusciti a copiare il token negli appunti. Si prega di riprova
 msgid "We were unable to copy your recovery code to your clipboard. Please try again."
 msgstr "Non siamo riusciti a copiare il tuo codice di recupero negli appunti. Si prega di riprovare."
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "We were unable to create a checkout session. Please try again, or contact support"
-msgstr "Non siamo riusciti a creare una sessione di pagamento. Si prega di riprovare o contattare il supporto"
-
 #: apps/remix/app/components/forms/signup.tsx
 msgid "We were unable to create your account. Please review the information you provided and try again."
 msgstr "Non siamo riusciti a creare il tuo account. Si prega di rivedere le informazioni fornite e riprovare."
@@ -7010,7 +7808,7 @@ msgstr "Non siamo riusciti a disabilitare l'autenticazione a due fattori per il
 msgid "We were unable to log you out at this time."
 msgstr "Non siamo riusciti a disconnetterti in questo momento."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "We were unable to set your public profile to public. Please try again."
 msgstr "Non siamo riusciti a impostare il tuo profilo pubblico come pubblico. Per favore riprova."
 
@@ -7025,14 +7823,17 @@ msgstr "Non siamo riusciti a impostare l'autenticazione a due fattori per il tuo
 msgid "We were unable to submit this document at this time. Please try again later."
 msgstr "Non siamo riusciti a inviare questo documento in questo momento. Per favore riprova più tardi."
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "We were unable to update your branding preferences at this time, please try again later"
 msgstr "Non siamo riusciti ad aggiornare le tue preferenze di branding al momento, riprova più tardi"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "We were unable to update your document preferences at this time, please try again later"
 msgstr "Non siamo riusciti ad aggiornare le tue preferenze sui documenti al momento, riprova più tardi"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 msgid "We were unable to verify your details. Please try again or contact support"
 msgstr "Non siamo riusciti a verificare i tuoi dati. Per favore riprova o contatta il supporto"
@@ -7058,8 +7859,8 @@ msgstr "Genereremo link di firma per te, che potrai inviare ai destinatari trami
 msgid "We won't send anything to notify recipients."
 msgstr "Non invieremo nulla per notificare i destinatari."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "We're all empty"
 msgstr "Siamo tutti vuoti"
@@ -7085,17 +7886,14 @@ msgid "Webhook deleted"
 msgstr "Webhook eliminato"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Webhook updated"
 msgstr "Webhook aggiornato"
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Webhook URL"
 msgstr "URL del webhook"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -7103,10 +7901,6 @@ msgstr "URL del webhook"
 msgid "Webhooks"
 msgstr "Webhook"
 
-#: apps/remix/app/components/general/billing-plans.tsx
-msgid "Weekly"
-msgstr "Settimanale"
-
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Welcome"
 msgstr "Benvenuto"
@@ -7115,6 +7909,10 @@ msgstr "Benvenuto"
 msgid "Welcome back, we are lucky to have you."
 msgstr "Bentornato, siamo fortunati ad averti."
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Welcome back! Here's an overview of your account."
+msgstr ""
+
 #: packages/email/template-components/template-confirmation-email.tsx
 msgid "Welcome to Documenso!"
 msgstr "Benvenuto su Documenso!"
@@ -7123,6 +7921,10 @@ msgstr "Benvenuto su Documenso!"
 msgid "Were you trying to edit this document instead?"
 msgstr "Stavi provando a modificare questo documento invece?"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "What you can do with teams:"
+msgstr ""
+
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
 #: packages/ui/primitives/document-flow/add-signers.tsx
@@ -7145,6 +7947,10 @@ msgstr "Quando utilizzi la nostra piattaforma per apporre la tua firma elettroni
 msgid "While waiting for them to do so you can create your own Documenso account and get started with document signing right away."
 msgstr "Mentre aspetti che lo facciano, puoi creare il tuo account Documenso e iniziare a firmare documenti subito."
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Whitelabeling, unlimited members and more"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 msgid "Who do you want to remind?"
 msgstr "Chi vuoi ricordare?"
@@ -7154,18 +7960,19 @@ msgid "Withdrawing Consent"
 msgstr "Ritiro del consenso"
 
 #: apps/remix/app/components/forms/public-profile-form.tsx
-msgid "Write about the team"
-msgstr "Scrivi della squadra"
+msgid "Write a description to display on your public profile"
+msgstr ""
 
-#: apps/remix/app/components/forms/public-profile-form.tsx
-msgid "Write about yourself"
-msgstr "Scrivi di te stesso"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Yearly"
 msgstr "Annuale"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Yes"
+msgstr ""
+
 #: apps/remix/app/components/general/template/template-page-view-information.tsx
 #: apps/remix/app/components/general/document/document-page-view-information.tsx
 #: packages/lib/utils/document-audit-logs.ts
@@ -7176,17 +7983,42 @@ msgstr "Tu"
 msgid "You are about to delete <0>\"{documentTitle}\"</0>"
 msgstr "Stai per eliminare <0>\"{documentTitle}\"</0>"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "You are about to delete <0>{0}</0>. All data related to this organisation such as teams, documents, and all other resources will be deleted. This action is irreversible."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 msgid "You are about to delete the following team email from <0>{teamName}</0>."
 msgstr "Stai per eliminare la seguente email del team da <0>{teamName}</0>."
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "You are about to give all organisation members access to this team under their organisation role."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "You are about to hide <0>\"{documentTitle}\"</0>"
 msgstr "Stai per nascondere <0>\"{documentTitle}\"</0>"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "You are about to leave the following team."
-msgstr "Stai per abbandonare il seguente team."
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "You are about to leave the following organisation."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "You are about to remove default access to this team for all organisation members. Any members not explicitly added to this team will no longer have access."
+msgstr ""
+
+#. placeholder {0}: team.name
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "You are about to remove the following group from <0>{0}</0>."
+msgstr ""
+
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "You are about to remove the following user from <0>{0}</0>."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "You are about to remove the following user from <0>{teamName}</0>."
@@ -7202,21 +8034,38 @@ msgstr "Stai per revocare l'accesso per il team <0>{0}</0> ({1}) per utilizzare
 msgid "You are about to send this document to the recipients. Are you sure you want to continue?"
 msgstr "Stai per inviare questo documento ai destinatari. Sei sicuro di voler continuare?"
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "You are about to subscribe to the {planName}"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
 msgid "You are currently on the <0>Free Plan</0>."
 msgstr "Attualmente sei sul <0>Piano Gratuito</0>."
 
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-msgid "You are currently updating <0>{teamMemberName}.</0>"
-msgstr "Stai attualmente aggiornando <0>{teamMemberName}.</0>"
+msgid "You are currently updating <0>{memberName}.</0>"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You are currently updating <0>{organisationMemberName}.</0>"
+msgstr ""
 
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "You are currently updating the <0>{passkeyName}</0> passkey."
 msgstr "Stai attualmente aggiornando la chiave d'accesso <0>{passkeyName}</0>."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "You are not a member of this team."
-msgstr "Non sei un membro di questo team."
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You are currently updating the <0>{teamGroupName}</0> team group."
+msgstr ""
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "You are currently updating your \"Personal\" organisation to a plan where you can add multiple members. These members may have access to the documents, templates and other data in this organisation, including documents sent to you."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+msgid "You are not authorized to access this page."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx
 msgid "You are not authorized to delete this user."
@@ -7234,18 +8083,18 @@ msgstr "Non sei autorizzato ad abilitare questo utente."
 msgid "You can also copy and paste this link into your browser: {confirmationLink} (link expires in 1 hour)"
 msgstr "Puoi anche copiare e incollare questo link nel tuo browser: {confirmationLink} (il link scade tra 1 ora)"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You can choose to enable or disable your profile for public view."
-msgstr "Puoi scegliere di abilitare o disabilitare il tuo profilo per la visualizzazione pubblica."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You can choose to enable or disable your team profile for public view."
-msgstr "Puoi scegliere di abilitare o disabilitare il profilo del tuo team per la visualizzazione pubblica."
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
+msgid "You can choose to enable or disable the profile for public view."
+msgstr ""
 
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 msgid "You can copy and share these links to recipients so they can action the document."
 msgstr "Puoi copiare e condividere questi link con i destinatari affinché possano agire sul documento."
 
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "You can enable access to allow all organisation members to access this team by default."
+msgstr ""
+
 #: packages/email/templates/confirm-team-email.tsx
 msgid "You can revoke access at any time in your team settings on Documenso <0>here.</0>"
 msgstr "Puoi revocare l'accesso in qualsiasi momento nelle impostazioni del tuo team su Documenso <0>qui.</0>"
@@ -7275,14 +8124,30 @@ msgstr "Puoi visualizzare il documento e il suo stato cliccando sul pulsante qui
 msgid "You cannot add assistants when signing order is disabled."
 msgstr "Non puoi aggiungere assistenti quando l'ordine di firma è disabilitato."
 
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "You cannot delete a group which has a higher role than you."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "You cannot have more than {MAXIMUM_PASSKEYS} passkeys."
 msgstr "Non puoi avere più di {MAXIMUM_PASSKEYS} passkey."
 
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You cannot modify a group which has a higher role than you."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You cannot modify a organisation member who has a higher role than you."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 msgid "You cannot modify a team member who has a higher role than you."
 msgstr "Non puoi modificare un membro del team che ha un ruolo superiore al tuo."
 
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+msgid "You cannot remove members from this team if the inherit member feature is enabled."
+msgstr ""
+
 #: packages/ui/primitives/document-upload.tsx
 #: packages/ui/primitives/document-dropzone.tsx
 msgid "You cannot upload documents at this time."
@@ -7293,9 +8158,13 @@ msgstr "Non puoi caricare documenti in questo momento."
 msgid "You cannot upload encrypted PDFs"
 msgstr "Non puoi caricare PDF crittografati"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-msgid "You do not currently have a customer record, this should not happen. Please contact support for assistance."
-msgstr "Attualmente non hai un record cliente, questo non dovrebbe succedere. Per favore contatta il supporto per assistenza."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "You currently have an inactive <0>{currentProductName}</0> subscription"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "You currently have no access to any teams within this organisation. Please contact your organisation to request access."
+msgstr ""
 
 #: apps/remix/app/components/forms/token.tsx
 msgid "You do not have permission to create a token for this team"
@@ -7305,50 +8174,43 @@ msgstr "Non hai il permesso di creare un token per questo team"
 msgid "You don't need to sign it anymore."
 msgstr "Non hai più bisogno di firmarlo."
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-msgid "You have accepted an invitation from <0>{0}</0> to join their team."
-msgstr "Hai accettato un invito da <0>{0}</0> per unirti al loro team."
-
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "You have already completed the ownership transfer for <0>{0}</0>."
-msgstr "Hai già completato il trasferimento di proprietà per <0>{0}</0>."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "You have accepted an invitation from <0>{0}</0> to join their organisation."
+msgstr ""
 
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "You have already verified your email address for <0>{0}</0>."
 msgstr "Hai già verificato il tuo indirizzo email per <0>{0}</0>."
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "You have been invited by <0>{0}</0> to join their team."
-msgstr "Sei stato invitato da <0>{0}</0> a unirti al loro team."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "You have been invited by <0>{0}</0> to join their organisation."
+msgstr ""
 
-#. placeholder {0}: team.name
-#: packages/lib/server-only/team/create-team-member-invites.ts
+#. placeholder {0}: organisation.name
+#: packages/lib/server-only/organisation/create-organisation-member-invites.ts
 msgid "You have been invited to join {0} on Documenso"
 msgstr "Sei stato invitato a unirti a {0} su Documenso"
 
-#: packages/email/templates/team-invite.tsx
-msgid "You have been invited to join the following team"
-msgstr "Sei stato invitato a unirti al seguente team"
+#: packages/email/templates/organisation-invite.tsx
+msgid "You have been invited to join the following organisation"
+msgstr ""
 
 #: packages/lib/server-only/recipient/set-document-recipients.ts
 #: packages/lib/server-only/recipient/delete-document-recipient.ts
 msgid "You have been removed from a document"
 msgstr "Sei stato rimosso da un documento"
 
-#. placeholder {0}: team.name
-#: packages/lib/server-only/team/request-team-ownership-transfer.ts
-msgid "You have been requested to take ownership of team {0} on Documenso"
-msgstr "Ti è stato richiesto di prendere possesso del team {0} su Documenso"
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "You have been requested to sign the following documents. Review each document carefully and complete the signing process."
+msgstr ""
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "You have declined the invitation from <0>{0}</0> to join their team."
-msgstr "Hai rifiutato l'invito da <0>{0}</0> per unirti al loro team."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
+msgid "You have declined the invitation from <0>{0}</0> to join their organisation."
+msgstr ""
 
 #. placeholder {0}: `"${document.title}"`
 #: packages/lib/server-only/document/resend-document.tsx
@@ -7357,12 +8219,11 @@ msgid "You have initiated the document {0} that requires you to {recipientAction
 msgstr "Hai avviato il documento {0} che richiede che tu lo {recipientActionVerb}."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "You have no webhooks yet. Your webhooks will be shown here once you create them."
 msgstr "Non hai ancora webhook. I tuoi webhook verranno visualizzati qui una volta creati."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
 msgid "You have not yet created any templates. To create a template please upload one."
 msgstr "Non hai ancora creato alcun modello. Per creare un modello, caricane uno."
 
@@ -7375,6 +8236,10 @@ msgstr "Non hai ancora creato o ricevuto documenti. Per creare un documento cari
 msgid "You have reached the maximum limit of {0} direct templates. <0>Upgrade your account to continue!</0>"
 msgstr "Hai raggiunto il limite massimo di {0} modelli diretti. <0>Aggiorna il tuo account per continuare!</0>"
 
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
+msgid "You have reached the maximum number of teams for your plan. Please contact sales at <0>support@documenso.com</0> if you would like to adjust your plan."
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-upload.tsx
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
 msgid "You have reached your document limit for this month. Please upgrade your plan."
@@ -7402,15 +8267,27 @@ msgstr "Hai rifiutato questo documento"
 msgid "You have signed “{documentName}”"
 msgstr "Hai firmato “{documentName}”"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "You have successfully left this team."
-msgstr "Hai lasciato con successo questo team."
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "You have successfully left this organisation."
+msgstr ""
 
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/signup.tsx
 msgid "You have successfully registered. Please verify your account by clicking on the link you received in the email."
 msgstr "Ti sei registrato con successo. Verifica il tuo account cliccando sul link ricevuto via email."
 
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "You have successfully removed this group from the organisation."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "You have successfully removed this group from the team."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "You have successfully removed this user from the organisation."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "You have successfully removed this user from the team."
 msgstr "Hai rimosso con successo questo utente dal team."
@@ -7424,38 +8301,35 @@ msgid "You have the right to withdraw your consent to use electronic signatures
 msgstr "Hai il diritto di ritirare il tuo consenso all'uso delle firme elettroniche in qualsiasi momento prima di completare il processo di firma. Per ritirare il tuo consenso, contatta il mittente del documento. Nel caso in cui non riesci a contattare il mittente, puoi contattare <0>{SUPPORT_EMAIL}</0> per assistenza. Sii consapevole che il ritiro del consenso potrebbe ritardare o fermare il completamento della transazione o del servizio correlato."
 
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-msgid "You have updated {teamMemberName}."
-msgstr "Hai aggiornato {teamMemberName}."
+msgid "You have updated {memberName}."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You have updated {organisationMemberName}."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You have updated the team group."
+msgstr ""
 
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "You have verified your email address for <0>{0}</0>."
 msgstr "Hai verificato il tuo indirizzo email per <0>{0}</0>."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "You must be an admin of this team to manage billing."
-msgstr "Devi essere un amministratore di questo team per gestire la fatturazione."
-
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 msgid "You must enter '{deleteMessage}' to proceed"
 msgstr "Devi inserire '{deleteMessage}' per procedere"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "You must have at least one other team member to transfer ownership."
-msgstr "Devi avere almeno un altro membro del team per trasferire la proprietà."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You must set a profile URL before enabling your public profile."
-msgstr "Devi impostare un'URL del profilo prima di abilitare il tuo profilo pubblico."
-
 #: apps/remix/app/components/dialogs/template-folder-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/folder-delete-dialog.tsx
 msgid "You must type '{deleteMessage}' to confirm"
 msgstr "Devi digitare '{deleteMessage}' per confermare"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "You need to be an admin to manage API tokens."
 msgstr "Devi essere un amministratore per gestire i token API."
 
@@ -7471,9 +8345,9 @@ msgstr "Devi essere loggato per visualizzare questa pagina."
 msgid "You need to setup 2FA to mark this document as viewed."
 msgstr "Devi configurare l'autenticazione a due fattori per contrassegnare questo documento come visualizzato."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "You will get notified & be able to set up your documenso public profile when we launch the feature."
-msgstr "Riceverai una notifica e potrai configurare il tuo profilo pubblico su Documenso quando lanceremo la funzionalità."
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "You will need to configure any claims or subscription after creating this organisation"
+msgstr ""
 
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "You will now be required to enter a code from your authenticator app when signing in."
@@ -7495,11 +8369,12 @@ msgstr "Il tuo avatar è stato aggiornato correttamente."
 msgid "Your banner has been updated successfully."
 msgstr "Il tuo banner è stato aggiornato correttamente."
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Your brand website URL"
 msgstr "URL del sito web del tuo marchio"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Your branding preferences have been updated"
 msgstr "Le tue preferenze di branding sono state aggiornate"
 
@@ -7511,9 +8386,17 @@ msgstr "Il tuo invio massivo è stato avviato. Riceverai una notifica via email
 msgid "Your bulk send operation for template \"{templateName}\" has completed."
 msgstr "La tua operazione di invio massivo per il modello \"{templateName}\" è stata completata."
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
-msgid "Your current plan is past due. Please update your payment information."
-msgstr "Il tuo piano attuale è scaduto. Aggiorna le informazioni di pagamento."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current {currentProductName} plan is past due. Please update your payment information."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current plan is inactive."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current plan is past due."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Your direct signing templates"
@@ -7558,7 +8441,8 @@ msgstr "Il tuo documento è stato caricato correttamente."
 msgid "Your document has been uploaded successfully. You will be redirected to the template page."
 msgstr "Il tuo documento è stato caricato correttamente. Sarai reindirizzato alla pagina del modello."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Your document preferences have been updated"
 msgstr "Le tue preferenze sui documenti sono state aggiornate"
 
@@ -7580,7 +8464,7 @@ msgstr "La tua email è stata confermata con successo! Ora puoi utilizzare tutte
 msgid "Your email is currently being used by team <0>{0}</0> ({1})."
 msgstr "La tua email è attualmente utilizzata dal team <0>{0}</0> ({1})."
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Your existing tokens"
 msgstr "I tuoi token esistenti"
 
@@ -7589,6 +8473,18 @@ msgstr "I tuoi token esistenti"
 msgid "Your new password cannot be the same as your old password."
 msgstr "La tua nuova password non può essere la stessa della vecchia password."
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Your organisation has been created."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "Your organisation has been successfully deleted."
+msgstr ""
+
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Your organisation has been successfully updated."
+msgstr ""
+
 #: apps/remix/app/components/forms/reset-password.tsx
 #: apps/remix/app/components/forms/password.tsx
 msgid "Your password has been updated successfully."
@@ -7598,10 +8494,18 @@ msgstr "La tua password è stata aggiornata con successo."
 msgid "Your password has been updated."
 msgstr "La tua password è stata aggiornata."
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Your payment for teams is overdue. Please settle the payment to avoid any service disruptions."
 msgstr "Il pagamento per i team è in ritardo. Si prega di effettuare il pagamento per evitare interruzioni del servizio."
 
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+msgid "Your personal organisation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Your plan does not support inviting members. Please upgrade or your plan or contact sales at <0>support@documenso.com</0> if you would like to discuss your options."
+msgstr ""
+
 #: apps/remix/app/components/forms/profile.tsx
 msgid "Your profile has been updated successfully."
 msgstr "Il tuo profilo è stato aggiornato correttamente."
@@ -7623,19 +8527,10 @@ msgstr "Il tuo codice di recupero è stato copiato negli appunti."
 msgid "Your recovery codes are listed below. Please store them in a safe place."
 msgstr "I tuoi codici di recupero sono elencati di seguito. Si prega di conservarli in un luogo sicuro."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Your subscription is currently active."
-msgstr "Il tuo abbonamento è attualmente attivo."
-
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Your team has been created."
 msgstr "Il tuo team è stato creato."
 
-#: packages/email/templates/team-delete.tsx
-#: packages/email/templates/team-delete.tsx
-msgid "Your team has been deleted"
-msgstr "Il tuo team è stato eliminato"
-
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Your team has been successfully deleted."
 msgstr "Il tuo team è stato eliminato correttamente."
@@ -7672,7 +8567,7 @@ msgstr "Il tuo token è scaduto!"
 msgid "Your token was created successfully! Make sure to copy it because you won't be able to see it again!"
 msgstr "Il tuo token è stato creato con successo! Assicurati di copiarlo perché non potrai più vederlo!"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Your tokens will be shown here once you create them."
 msgstr "I tuoi token verranno mostrati qui una volta creati."
 
diff --git a/packages/lib/translations/pl/web.po b/packages/lib/translations/pl/web.po
index b552e03d9..584f6c429 100644
--- a/packages/lib/translations/pl/web.po
+++ b/packages/lib/translations/pl/web.po
@@ -22,19 +22,10 @@ msgstr ""
 msgid " Enable direct link signing"
 msgstr " Włącz podpisywanie linku bezpośredniego"
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
-msgid " The events that will trigger a webhook to be sent to your URL."
-msgstr " Zdarzenia, które uruchomią wysłanie webhooka na Twój URL."
-
 #: apps/remix/app/components/embed/authoring/configure-document-upload.tsx
 msgid ".PDF documents accepted (max {APP_DOCUMENT_UPLOAD_SIZE_LIMIT}MB)"
 msgstr "Akceptowane dokumenty .PDF (maks. {APP_DOCUMENT_UPLOAD_SIZE_LIMIT}MB)"
 
-#. placeholder {0}: team.name
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-msgid "\"{0}\" has invited you to sign \"example document\"."
-msgstr "Użytkownik \"{0}\" zaprosił Cię do podpisania \"przykładowego dokumentu\"."
-
 #. placeholder {0}: field.customText
 #. placeholder {1}: timezone || ''
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
@@ -57,10 +48,13 @@ msgstr "Dokument \"{documentName}\" został podpisany przez wszystkich podpisuj
 msgid "\"{documentTitle}\" has been successfully deleted"
 msgstr "Dokument \"{documentTitle}\" został usunięty"
 
-#. placeholder {0}: team.name
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-msgid "\"{placeholderEmail}\" on behalf of \"{0}\" has invited you to sign \"example document\"."
-msgstr "\"{placeholderEmail}\" w imieniu \"{0}\" zaprosił Cię do podpisania \"przykładowego dokumentu\"."
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "\"{placeholderEmail}\" on behalf of \"Team Name\" has invited you to sign \"example document\"."
+msgstr ""
+
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "\"Team Name\" has invited you to sign \"example document\"."
+msgstr ""
 
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
@@ -83,16 +77,16 @@ msgstr "{0, plural, one {# znak przekroczony} few {# znaki przekroczone} many {#
 msgid "{0, plural, one {# recipient} other {# recipients}}"
 msgstr "{0, plural, one {# odbiorca} few {# odbiorców} many {# odbiorców} other {# odbiorców}}"
 
-#. placeholder {0}: row.original.quantity
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "{0, plural, one {# Seat} other {# Seats}}"
-msgstr "{0, plural, one {# miejsce} few {# miejsca} many {# miejsc} other {# miejsc}}"
+#. placeholder {0}: org.teams.length
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "{0, plural, one {# team} other {# teams}}"
+msgstr ""
 
 #. placeholder {0}: data.length
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "{0, plural, one {<0>You have <1>1</1> pending team invitation</0>} other {<2>You have <3>#</3> pending team invitations</2>}}"
-msgstr "{0, plural, one {<0>Masz <1>1</1> oczekujące zaproszenie do zespołu</0>} few {<2>Masz <3>#</3> oczekujące zaproszenia do zespołu</2>} many {<2>Masz <3>#</3> oczekujących zaproszeń do zespołu</2>} other {<2>Masz <3>#</3> oczekujących zaproszeń do zespołu</2>}}"
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "{0, plural, one {<0>You have <1>1</1> pending invitation</0>} other {<2>You have <3>#</3> pending invitations</2>}}"
+msgstr ""
 
 #. placeholder {0}: autoSignableFields.filter((f) => f.type === fieldType).length
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
@@ -100,18 +94,18 @@ msgid "{0, plural, one {1 matching field} other {# matching fields}}"
 msgstr "{0, plural, one {1 pasujące pole} few {# pasujące pola} many {# pasujących pól} other {# pasujących pól}}"
 
 #. placeholder {0}: recipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
 msgid "{0, plural, one {1 Recipient} other {# Recipients}}"
 msgstr "{0, plural, one {1 odbiorca} few {# odbiorców} many {# odbiorców} other {# odbiorców}}"
 
 #. placeholder {0}: pendingRecipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "{0, plural, one {Waiting on 1 recipient} other {Waiting on # recipients}}"
 msgstr "{0, plural, one {Czekam na 1 odbiorcę} few {Czekam na # odbiorców} many {Czekam na # odbiorców} other {Czekam na # odbiorców}}"
 
+#. placeholder {0}: route.label
 #. placeholder {0}: _(FRIENDLY_FIELD_TYPE[fieldType as FieldType])
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
 msgid "{0}"
 msgstr "{0}"
@@ -132,16 +126,6 @@ msgstr "{0} zaprosił cię do {recipientActionVerb} dokument „{1}”."
 msgid "{0} invited you to {recipientActionVerb} a document"
 msgstr "{0} zaprosił Cię do {recipientActionVerb} dokument"
 
-#. placeholder {0}: memberName || memberEmail
-#: packages/email/templates/team-join.tsx
-msgid "{0} joined the team {teamName} on Documenso"
-msgstr "{0} dołączył do zespołu {teamName} na Documenso"
-
-#. placeholder {0}: memberName || memberEmail
-#: packages/email/templates/team-leave.tsx
-msgid "{0} left the team {teamName} on Documenso"
-msgstr "{0} opuścił zespół {teamName} na Documenso"
-
 #. placeholder {0}: remaining.documents
 #. placeholder {1}: quota.documents
 #: apps/remix/app/components/general/document/document-upload.tsx
@@ -163,11 +147,15 @@ msgid "{0} on behalf of \"{1}\" has invited you to {recipientActionVerb} the doc
 msgstr "{0} w imieniu \"{1}\" zaprosił Cię do {recipientActionVerb} dokument „{2}”."
 
 #. placeholder {0}: recipients.length
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "{0} Recipient(s)"
 msgstr "{0} Odbiorca(ów)"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "{0} Teams"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 msgid "{charactersRemaining, plural, one {1 character remaining} other {{charactersRemaining} characters remaining}}"
 msgstr "{charactersRemaining, plural, one {Pozostał # znak} few {Pozostały {charactersRemaining} znaki} many {Pozostało {charactersRemaining} znaków} other {Pozostało {charactersRemaining} znaków}}"
@@ -220,18 +208,6 @@ msgstr "{inviterName} w imieniu \"{teamName}\" zaprosił Cię do {0}<0/>\"{docum
 msgid "{inviterName} on behalf of \"{teamName}\" has invited you to {action} {documentName}"
 msgstr "{inviterName} w imieniu \"{teamName}\" zaprosił Cię do {action} {documentName}"
 
-#: packages/email/templates/team-join.tsx
-msgid "{memberEmail} joined the following team"
-msgstr "{memberEmail} dołączył do następującego zespołu"
-
-#: packages/email/templates/team-leave.tsx
-msgid "{memberEmail} left the following team"
-msgstr "{memberEmail} opuścił następujący zespół"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "{numberOfSeats, plural, one {# member} other {# members}}"
-msgstr "{numberOfSeats, plural, one {# członek} few {# członkowie} many {# członków} other {# członków}}"
-
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{prefix} added a field"
 msgstr "Użytkownik {prefix} dodał pole"
@@ -377,10 +353,6 @@ msgstr "{teamName} zaprosił Cię do {0}<0/>\"{documentName}\""
 msgid "{teamName} has invited you to {action} {documentName}"
 msgstr "{teamName} zaprosił cię do {action} {documentName}"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "{teamName} ownership transfer request"
-msgstr "Prośba o przeniesienie własności zespołu {teamName}"
-
 #: packages/lib/utils/document-audit-logs.ts
 msgid "{userName} approved the document"
 msgstr "{userName} zatwierdził dokument"
@@ -414,10 +386,6 @@ msgstr "{visibleRows, plural, one {Wyświetlanie # wyniku.} other {Wyświetlanie
 msgid "<0>\"{0}\"</0>is no longer available to sign"
 msgstr "<0>\"{0}\"</0>nie jest już dostępny do podpisu"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "<0>{senderName}</0> has requested that you take ownership of the following team"
-msgstr "<0>{senderName}</0> poprosił, abyś przejął własność następującego zespołu"
-
 #: packages/email/templates/confirm-team-email.tsx
 msgid "<0>{teamName}</0> has requested to use your email address for their team on Documenso."
 msgstr "<0>{teamName}</0> poprosił o używanie twojego adresu e-mail dla swojego zespołu w Documenso."
@@ -472,6 +440,10 @@ msgstr "<0>Wymagana konto</0> - Odbiorca musi być zalogowany, aby wyświetlić
 msgid "<0>Require passkey</0> - The recipient must have an account and passkey configured via their settings"
 msgstr "<0>Wymagana passkey</0> - Odbiorca musi mieć konto i skonfigurowaną passkey w swoich ustawieniach"
 
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "<0>Require password</0> - The recipient must have an account and password configured via their settings, the password will be verified during signing"
+msgstr ""
+
 #: apps/remix/app/components/tables/documents-table-sender-filter.tsx
 msgid "<0>Sender:</0> All"
 msgstr "<0>Rządzący:</0> Wszyscy"
@@ -497,6 +469,14 @@ msgstr "<0>Jesteś na drodze do ukończenia podpisywania \"<1>{documentTitle}</1
 msgid "<0>You are about to complete viewing \"<1>{documentTitle}</1>\".</0><2/> Are you sure?"
 msgstr "<0>Jesteś na drodze do zakończenia przeglądania \"<1>{documentTitle}</1>\".</0><2/> Czy jesteś pewien?"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "0 Free organisations left"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "1 Free organisations left"
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "1 month"
 msgstr "1 miesiąc"
@@ -505,22 +485,53 @@ msgstr "1 miesiąc"
 msgid "12 months"
 msgstr "12 miesięcy"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "2FA"
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "3 months"
 msgstr "3 miesiące"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+msgid "401 Unauthorized"
+msgstr ""
+
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "404 not found"
 msgstr "404 nie znaleziono"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "404 Organisation group not found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "404 Organisation not found"
+msgstr ""
+
 #: apps/remix/app/routes/_profile+/_layout.tsx
 msgid "404 Profile not found"
 msgstr "404 Profil nie znaleziony"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "404 Team not found"
 msgstr "404 Zespół nie znaleziony"
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "404 User not found"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "5 documents a month"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "5 Documents a month"
+msgstr ""
+
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "500 Internal Server Error"
 msgstr "500 Wewnętrzny błąd serwera"
@@ -565,9 +576,29 @@ msgstr "Zaktualizowano pole"
 msgid "A means to print or download documents for your records"
 msgstr "Środek do drukowania lub pobierania dokumentów do swoich zapisów"
 
-#: packages/lib/jobs/definitions/emails/send-team-member-joined-email.handler.ts
-msgid "A new member has joined your team"
-msgstr "Nowy członek dołączył do Twojego zespołu"
+#: packages/email/templates/organisation-join.tsx
+msgid "A member has joined your organisation on Documenso"
+msgstr ""
+
+#: packages/lib/jobs/definitions/emails/send-organisation-member-left-email.handler.ts
+msgid "A member has left your organisation"
+msgstr ""
+
+#: packages/email/templates/organisation-leave.tsx
+msgid "A member has left your organisation {organisationName}"
+msgstr ""
+
+#: packages/email/templates/organisation-leave.tsx
+msgid "A member has left your organisation on Documenso"
+msgstr ""
+
+#: packages/lib/jobs/definitions/emails/send-organisation-member-joined-email.handler.ts
+msgid "A new member has joined your organisation"
+msgstr ""
+
+#: packages/email/templates/organisation-join.tsx
+msgid "A new member has joined your organisation {organisationName}"
+msgstr ""
 
 #: apps/remix/app/components/forms/token.tsx
 msgid "A new token was created successfully."
@@ -590,12 +621,6 @@ msgstr "Usunięto odbiorcę"
 msgid "A recipient was updated"
 msgstr "Zaktualizowano odbiorcę"
 
-#. placeholder {0}: transferVerification.name
-#. placeholder {1}: transferVerification.email
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "A request to transfer the ownership of this team has been sent to <0>{0} ({1})</0>"
-msgstr "Wniosek o przeniesienie własności tego zespołu został wysłany do <0>{0} ({1})</0>"
-
 #. placeholder {0}: team.name
 #: packages/lib/server-only/team/create-team-email-verification.ts
 msgid "A request to use your email has been initiated by {0} on Documenso"
@@ -606,7 +631,6 @@ msgid "A secret that will be sent to your URL so you can verify that the request
 msgstr "Sekret, który zostanie wysłany na Twój adres URL, abyś mógł zweryfikować, że prośba została wysłana przez Documenso"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "A secret that will be sent to your URL so you can verify that the request has been sent by Documenso."
 msgstr "Sekret, który zostanie wysłany na Twój adres URL, abyś mógł zweryfikować, że prośba została wysłana przez Documenso."
 
@@ -614,19 +638,6 @@ msgstr "Sekret, który zostanie wysłany na Twój adres URL, abyś mógł zweryf
 msgid "A stable internet connection"
 msgstr "Stabilne połączenie internetowe"
 
-#: packages/email/templates/team-join.tsx
-msgid "A team member has joined a team on Documenso"
-msgstr "Członek zespołu dołączył do zespołu na Documenso"
-
-#. placeholder {0}: team.name
-#: packages/lib/jobs/definitions/emails/send-team-member-left-email.handler.ts
-msgid "A team member has left {0}"
-msgstr "Członek zespołu opuścił {0}"
-
-#: packages/email/templates/team-leave.tsx
-msgid "A team member has left a team on Documenso"
-msgstr "Członek zespołu opuścił zespół na Documenso"
-
 #: packages/email/templates/team-delete.tsx
 #: packages/email/templates/team-delete.tsx
 msgid "A team you were a part of has been deleted"
@@ -636,6 +647,14 @@ msgstr "Zespół, którego częścią byłeś, został usunięty"
 msgid "A unique URL to access your profile"
 msgstr "Unikalny URL do dostępu do Twojego profilu"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "A unique URL to identify the organisation"
+msgstr ""
+
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "A unique URL to identify your organisation"
+msgstr ""
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "A unique URL to identify your team"
@@ -645,32 +664,36 @@ msgstr "Unikalny URL do identyfikacji Twojego zespołu"
 msgid "A verification email will be sent to the provided email."
 msgstr "E-mail weryfikacyjny zostanie wysłany na podany adres e-mail."
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: packages/email/templates/team-transfer-request.tsx
-#: packages/email/templates/team-invite.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: packages/email/templates/organisation-invite.tsx
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Accept"
 msgstr "Akceptuj"
 
-#: packages/email/templates/team-invite.tsx
-msgid "Accept invitation to join a team on Documenso"
-msgstr "Akceptuj zaproszenie do dołączenia do zespołu na Documenso"
+#: packages/email/templates/organisation-invite.tsx
+msgid "Accept invitation to join an organisation on Documenso"
+msgstr ""
 
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Accept team email request for {teamName} on Documenso"
 msgstr "Akceptuj prośbę o email zespołowy dla {teamName} na Documenso"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "Accept team transfer request on Documenso"
-msgstr "Akceptuj prośbę o przeniesienie zespołu na Documenso"
-
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Acceptance and Consent"
 msgstr "Akceptacja i Zgoda"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Accepted team invitation"
-msgstr "Akceptowane zaproszenie do zespołu"
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "Access disabled"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Access enabled"
+msgstr ""
+
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Account"
+msgstr ""
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 msgid "Account Authentication"
@@ -707,18 +730,25 @@ msgid "Action"
 msgstr "Akcja"
 
 #: apps/remix/app/components/tables/templates-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Actions"
 msgstr "Akcje"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
 msgid "Active"
 msgstr "Aktywne"
 
@@ -783,7 +813,29 @@ msgstr "Dodaj adres e-mail"
 msgid "Add Fields"
 msgstr "Dodaj pola"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add group roles"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add groups"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Add members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Add Members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Add members roles"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Add more"
 msgstr "Dodaj więcej"
 
@@ -841,15 +893,12 @@ msgstr "Dodaj osoby, które podpiszą dokument."
 msgid "Add the recipients to create the document with"
 msgstr "Dodaj odbiorców, aby utworzyć dokument"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Adding and removing seats will adjust your invoice accordingly."
-msgstr "Dodawanie i usuwanie miejsc dostosuje fakturę odpowiednio."
-
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Additional brand information to display at the bottom of emails"
 msgstr "Dodatkowe informacje o marce do wyświetlenia na dole wiadomości e-mail"
 
-#: packages/lib/constants/teams.ts
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Admin"
 msgstr "Administrator"
 
@@ -857,10 +906,15 @@ msgstr "Administrator"
 msgid "Admin Actions"
 msgstr "Akcje administratora"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 msgid "Admin panel"
 msgstr "Panel administratora"
 
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+msgid "Admin Panel"
+msgstr ""
+
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
 #: packages/ui/primitives/document-flow/add-settings.tsx
 msgid "Advanced Options"
@@ -893,6 +947,10 @@ msgstr "Wszystko"
 msgid "All documents"
 msgstr "Wszystkie dokumenty"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "All documents have been completed!"
+msgstr ""
+
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "All documents have been processed. Any new documents that are sent or received will show here."
 msgstr "Wszystkie dokumenty zostały przetworzone. Nowe dokumenty, które zostaną wysłane lub odebrane, pojawią się tutaj."
@@ -901,8 +959,8 @@ msgstr "Wszystkie dokumenty zostały przetworzone. Nowe dokumenty, które zostan
 msgid "All documents related to the electronic signing process will be provided to you electronically through our platform or via email. It is your responsibility to ensure that your email address is current and that you can receive and open our emails."
 msgstr "Wszystkie dokumenty związane z procesem podpisywania elektronicznego będą dostarczane do Ciebie elektronicznie za pośrednictwem naszej platformy lub za pośrednictwem e-maila. To Twoja odpowiedzialność, aby upewnić się, że twój adres e-mail jest aktualny i że możesz odbierać i otwierać nasze e-maile."
 
-#: apps/remix/app/routes/_authenticated+/templates.folders._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.folders._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.folders._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.folders._index.tsx
 msgid "All Folders"
 msgstr "Wszystkie foldery"
 
@@ -930,6 +988,10 @@ msgstr "Wszystkie szablony"
 msgid "All Time"
 msgstr "Cały czas"
 
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
+msgid "Allow all organisation members to access this team"
+msgstr ""
+
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Allow document recipients to reply directly to this email address"
 msgstr "Zezwól odbiorcom dokumentów na bezpośrednią odpowiedź na ten adres e-mail"
@@ -946,6 +1008,10 @@ msgstr "Pozwól sygnatariuszom wskazać następnego sygnatariusza"
 msgid "Allowed Signature Types"
 msgstr "Dozwolone typy podpisów"
 
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "Allowed teams"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security._index.tsx
 msgid "Allows authenticating using biometrics, password managers, hardware keys, etc."
 msgstr "Pozwala na uwierzytelnianie za pomocą biometrii, menedżerów haseł, kluczy sprzętowych itp."
@@ -954,7 +1020,7 @@ msgstr "Pozwala na uwierzytelnianie za pomocą biometrii, menedżerów haseł, k
 msgid "Already have an account? <0>Sign in instead</0>"
 msgstr "Masz już konto? <0>Zaloguj się zamiast tego</0>"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
 msgid "Amount"
 msgstr "Kwota"
 
@@ -970,14 +1036,13 @@ msgstr "Podpis elektroniczny dostarczony przez Ciebie na naszej platformie, zrea
 msgid "An email account"
 msgstr "Konto e-mail"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "An email containing an invitation will be sent to each member."
 msgstr "E-mail zawierający zaproszenie zostanie wysłany do każdego członka."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "An email requesting the transfer of this team has been sent."
-msgstr "E-mail z prośbą o przeniesienie tego zespołu został wysłany."
-
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/token.tsx
 #: apps/remix/app/components/forms/signup.tsx
@@ -1024,6 +1089,7 @@ msgstr "Wystąpił błąd podczas dezaktywacji podpisywania za pomocą linku bez
 msgid "An error occurred while disabling the user."
 msgstr "Wystąpił błąd podczas wyłączania użytkownika."
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
@@ -1046,21 +1112,15 @@ msgstr "Wystąpił błąd podczas aktywacji podpisywania za pomocą linku bezpo
 msgid "An error occurred while enabling the user."
 msgstr "Wystąpił błąd podczas włączania użytkownika."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "An error occurred while loading team members. Please try again later."
-msgstr "Wystąpił błąd podczas ładowania członków zespołu. Proszę spróbować ponownie później."
-
 #: packages/ui/primitives/pdf-viewer.tsx
 msgid "An error occurred while loading the document."
 msgstr "Wystąpił błąd podczas ładowania dokumentu."
 
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "An error occurred while moving the document."
 msgstr "Wystąpił błąd podczas przenoszenia dokumentu."
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 msgid "An error occurred while moving the template."
 msgstr "Wystąpił błąd podczas przenoszenia szablonu."
 
@@ -1113,6 +1173,7 @@ msgstr "Wystąpił błąd podczas podpisywania jako asystent."
 #: apps/remix/app/components/general/document-signing/document-signing-dropdown-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-checkbox-field.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "An error occurred while signing the document."
 msgstr "Wystąpił błąd podczas podpisywania dokumentu."
 
@@ -1144,7 +1205,6 @@ msgstr "Wystąpił nieoczekiwany błąd."
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/forms/signup.tsx
@@ -1153,20 +1213,31 @@ msgstr "Wystąpił nieoczekiwany błąd."
 #: apps/remix/app/components/forms/signin.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
 #: apps/remix/app/components/forms/profile.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/account-delete-dialog.tsx
 msgid "An unknown error occurred"
@@ -1187,9 +1258,9 @@ msgstr "Wystąpił nieznany błąd podczas usuwania folderu."
 msgid "An unknown error occurred while moving the folder."
 msgstr "Wystąpił nieznany błąd podczas przenoszenia folderu."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Any payment methods attached to this team will remain attached to this team. Please contact us if you need to update this information."
-msgstr "Jakiekolwiek metody płatności przypisane do tego zespołu pozostaną przypisane do tego zespołu. Proszę skontaktować się z nami, jeśli potrzebujesz zaktualizować te informacje."
+#: apps/remix/app/routes/_authenticated+/inbox.tsx
+msgid "Any documents that you have been invited to will appear here"
+msgstr ""
 
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Any Source"
@@ -1199,7 +1270,7 @@ msgstr "Jakiekolwiek źródło"
 msgid "Any Status"
 msgstr "Jakikolwiek status"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -1211,6 +1282,7 @@ msgstr "Tokeny API"
 msgid "App Version"
 msgstr "Wersja aplikacji"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
@@ -1246,6 +1318,10 @@ msgstr "Zatwierdzanie"
 msgid "Are you sure you want to complete the document? This action cannot be undone. Please ensure that you have completed prefilling all relevant fields before proceeding."
 msgstr "Czy na pewno chcesz zakończyć dokument? Tego działania nie można cofnąć. Upewnij się, że wypełniłeś wszystkie odpowiednie pola przed kontynuacją."
 
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Are you sure you want to delete the following claim?"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 msgid "Are you sure you want to delete this token?"
 msgstr "Czy na pewno chcesz usunąć ten token?"
@@ -1258,6 +1334,10 @@ msgstr "Czy na pewno chcesz odrzucić ten dokument? Ta akcja nie może być cofn
 msgid "Are you sure you want to remove the <0>{passkeyName}</0> passkey."
 msgstr "Czy na pewno chcesz usunąć klucz hasła <0>{passkeyName}</0>."
 
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "Are you sure you wish to delete this organisation?"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Are you sure you wish to delete this team?"
 msgstr "Czy na pewno chcesz usunąć ten zespół?"
@@ -1265,13 +1345,22 @@ msgstr "Czy na pewno chcesz usunąć ten zespół?"
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "Are you sure?"
 msgstr "Czy na pewno?"
 
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+msgid "Assigned Teams"
+msgstr ""
+
 #: packages/lib/constants/recipient-roles.ts
 msgid "Assist"
 msgstr "Asysta"
@@ -1297,6 +1386,10 @@ msgstr "Rola asystenta jest dostępna tylko w trybie sekwencyjnego podpisywania
 msgid "Assistants"
 msgstr "Asystenci"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Assistants and Copy roles are currently not compatible with the multi-sign experience."
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "Assisted"
@@ -1306,7 +1399,7 @@ msgstr "Asystowany"
 msgid "Assisting"
 msgstr "Asystowanie"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.types.tsx
 #: packages/ui/primitives/document-flow/add-settings.types.ts
 #: packages/lib/types/document-meta.ts
@@ -1343,15 +1436,17 @@ msgid "Awaiting email confirmation"
 msgstr "Czekam na potwierdzenie e-maila"
 
 #: apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx
-#: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/authoring/configure-fields-view.tsx
 #: apps/remix/app/components/embed/authoring/configure-fields-view.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Back"
 msgstr "Powrót"
 
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
-msgid "Back to Documents"
-msgstr "Powrót do dokumentów"
+msgid "Back home"
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "Background Color"
@@ -1370,20 +1465,14 @@ msgstr "Kody zapasowe"
 msgid "Banner Updated"
 msgstr "Baner został zaktualizowany"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Basic details"
-msgstr "Podstawowe szczegóły"
-
 #: packages/email/template-components/template-confirmation-email.tsx
 msgid "Before you get started, please confirm your email address by clicking the button below:"
 msgstr "Zanim zaczniesz, proszę potwierdź swój adres e-mail, klikając przycisk poniżej:"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
-#: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
-#: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
 msgid "Billing"
 msgstr "Fakturowanie"
 
@@ -1395,11 +1484,26 @@ msgstr "Czarny"
 msgid "Blue"
 msgstr "Niebieski"
 
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Brand Details"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Brand Website"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Branding Logo"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Branding Preferences"
 msgstr "Preferencje dotyczące marki"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Branding preferences updated"
 msgstr "Preferencje dotyczące marki zaktualizowane"
 
@@ -1412,7 +1516,7 @@ msgstr "Przeglądarka"
 msgid "Bulk Copy"
 msgstr "Masowa kopia"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Bulk Import"
 msgstr "Import zbiorczy"
 
@@ -1434,7 +1538,7 @@ msgstr "Szablon masowej wysyłki przez CSV"
 msgid "Bulk Send via CSV"
 msgstr "Zbiorcza wysyłka przez CSV"
 
-#: packages/email/templates/team-invite.tsx
+#: packages/email/templates/organisation-invite.tsx
 msgid "by <0>{senderName}</0>"
 msgstr "przez <0>{senderName}</0>"
 
@@ -1442,10 +1546,6 @@ msgstr "przez <0>{senderName}</0>"
 msgid "By accepting this request, you will be granting <0>{teamName}</0> access to:"
 msgstr "Akceptując tę prośbę, przyznasz <0>{teamName}</0> dostęp do:"
 
-#: packages/email/templates/team-transfer-request.tsx
-msgid "By accepting this request, you will take responsibility for any billing items associated with this team."
-msgstr "Akceptując tę prośbę, przejmiesz odpowiedzialność za wszelkie pozycje dotyczące rozliczeń związane z tym zespołem."
-
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "By deleting this document, the following will occur:"
 msgstr "Usunięcie tego dokumentu spowoduje następujące:"
@@ -1476,7 +1576,6 @@ msgstr "Może przygotować"
 
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-signature-field.tsx
@@ -1487,6 +1586,7 @@ msgstr "Może przygotować"
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-account.tsx
@@ -1497,30 +1597,44 @@ msgstr "Może przygotować"
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/template-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 #: apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
 #: apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 #: packages/ui/primitives/signature-pad/signature-pad-dialog.tsx
 #: packages/ui/primitives/document-flow/send-document-action-dialog.tsx
 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx
@@ -1572,7 +1686,8 @@ msgstr "Pole wyboru"
 msgid "Checkbox values"
 msgstr "Wartości checkboxa"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Checkout"
 msgstr "Kasa"
 
@@ -1592,6 +1707,10 @@ msgstr "Wybierz, jak dokument dotrze do odbiorców"
 msgid "Choose how to distribute your document to recipients. Email will send notifications, None will generate signing links for manual distribution."
 msgstr "Wybierz sposób dystrybucji dokumentu do odbiorców. E-mail wyśle powiadomienia, Brak wygeneruje linki do podpisu do ręcznej dystrybucji."
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Choose your preferred authentication method:"
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "Choose..."
 msgstr "Wybierz..."
@@ -1600,13 +1719,9 @@ msgstr "Wybierz..."
 msgid "Claim account"
 msgstr "Zgłoś konto"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Claim username"
-msgstr "Zgłoś nazwę użytkownika"
-
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Claim your username now"
-msgstr "Zgłoś swoją nazwę użytkownika teraz"
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+msgid "Claims"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Clear file"
@@ -1631,7 +1746,7 @@ msgstr "Kliknij, aby rozpocząć"
 msgid "Click here to retry"
 msgstr "Kliknij tutaj, aby spróbować ponownie"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Click here to upload"
 msgstr "Kliknij tutaj, aby przesłać"
 
@@ -1644,10 +1759,11 @@ msgstr "Kliknij, aby skopiować link podpisu do wysłania do odbiorcy"
 #: apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Click to insert field"
 msgstr "Kliknij, aby wstawić pole"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
@@ -1655,6 +1771,9 @@ msgstr "Kliknij, aby wstawić pole"
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: packages/ui/primitives/document-flow/missing-signature-field-dialog.tsx
@@ -1665,11 +1784,16 @@ msgstr "Zamknij"
 msgid "Communication"
 msgstr "Komunikacja"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Compare all plans and features in detail"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Complete"
 msgstr "Zakończono"
 
@@ -1701,6 +1825,7 @@ msgstr "Zakończ wyświetlanie"
 #: apps/remix/app/components/general/stack-avatars-with-tooltip.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/document.ts
 #: packages/email/template-components/template-document-self-signed.tsx
 #: packages/email/template-components/template-document-recipient-signed.tsx
@@ -1776,16 +1901,21 @@ msgstr "Skonfiguruj pole {0}"
 msgid "Configure the fields you want to place on the document."
 msgstr "Skonfiguruj pola, które chcesz umieścić na dokumencie."
 
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Configure the team roles for each group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Configure the team roles for each member"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Confirm"
 msgstr "Potwierdź"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Confirm by typing <0>{confirmTransferMessage}</0>"
-msgstr "Potwierdź, wpisując <0>{confirmTransferMessage}</0>"
-
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 msgid "Confirm by typing <0>{deleteMessage}</0>"
 msgstr "Potwierdź, wpisując <0>{deleteMessage}</0>"
 
@@ -1817,20 +1947,24 @@ msgstr "Zgoda na transakcje elektroniczne"
 msgid "Contact Information"
 msgstr "Informacje kontaktowe"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Contact sales here"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "Content"
 msgstr "Treść"
 
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-form.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-view.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 #: apps/remix/app/components/dialogs/assistant-confirmation-dialog.tsx
 #: packages/ui/primitives/document-flow/document-flow-root.tsx
 msgid "Continue"
@@ -1856,19 +1990,19 @@ msgstr "Kontynuuj, podpisując dokument."
 msgid "Continue by viewing the document."
 msgstr "Kontynuuj, wyświetlając dokument."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "Continue to login"
 msgstr "Kontynuuj do logowania"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the default language of an uploaded document. This will be used as the language in email communications with the recipients."
 msgstr "Kontroluje domyślny język przesłanego dokumentu. Będzie używany jako język w komunikacji e-mailowej z odbiorcami."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the default visibility of an uploaded document."
 msgstr "Kontroluje domyślną widoczność przesłanego dokumentu."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls the formatting of the message that will be sent when inviting a recipient to sign a document. If a custom message has been provided while configuring the document, it will be used instead."
 msgstr "Kontroluje formatowanie wiadomości, która zostanie wysłana podczas zapraszania odbiorcy do podpisania dokumentu. Jeśli w konfiguracji dokumentu podano niestandardową wiadomość, zostanie użyta zamiast tego."
 
@@ -1876,11 +2010,11 @@ msgstr "Kontroluje formatowanie wiadomości, która zostanie wysłana podczas za
 msgid "Controls the language for the document, including the language to be used for email notifications, and the final certificate that is generated and attached to the document."
 msgstr "Kontroluje język dokumentu, w tym język powiadomień e-mail i ostateczny certyfikat, który jest generowany i dołączony do dokumentu."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls whether the signing certificate will be included in the document when it is downloaded. The signing certificate can still be downloaded from the logs page separately."
 msgstr "Kontroluje, czy certyfikat podpisu zostanie dołączony do dokumentu podczas jego pobierania. Certyfikat podpisu można również pobrać osobno ze strony logów."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Controls which signatures are allowed to be used when signing a document."
 msgstr "Kontroluje, które podpisy są dozwolone do użycia podczas podpisywania dokumentu."
 
@@ -1929,6 +2063,9 @@ msgstr "Kopiuj token"
 
 #: apps/remix/app/routes/_profile+/_layout.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 msgid "Create"
 msgstr "Utwórz"
 
@@ -1940,16 +2077,31 @@ msgstr "Utwórz <0>darmowe konto</0>, aby uzyskać dostęp do podpisanych dokume
 msgid "Create a new account"
 msgstr "Utwórz nowe konto"
 
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Create a new organisation with {planName} plan. Keep your current organisation on it's current plan"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create a team to collaborate with your team members."
 msgstr "Utwórz zespół, aby współpracować z członkami zespołu."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 #: packages/email/template-components/template-document-self-signed.tsx
 msgid "Create account"
 msgstr "Utwórz konto"
 
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Create an organisation for this user"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Create an organisation to collaborate with teams"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Create an organisation to get started."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Create and send"
 msgstr "Utwórz i wyślij"
@@ -1962,6 +2114,14 @@ msgstr "Utwórz jako szkic"
 msgid "Create as pending"
 msgstr "Utwórz jako oczekujące"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create claim"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create Claim"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog-wrapper.tsx
 msgid "Create Direct Link"
 msgstr "Utwórz bezpośredni link"
@@ -1974,6 +2134,15 @@ msgstr "Utwórz bezpośredni link do podpisu"
 msgid "Create document from template"
 msgstr "Utwórz dokument z szablonu"
 
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Create group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Create Groups"
+msgstr ""
+
 #: apps/remix/app/routes/_profile+/_layout.tsx
 msgid "Create now"
 msgstr "Utwórz teraz"
@@ -1982,17 +2151,47 @@ msgstr "Utwórz teraz"
 msgid "Create one automatically"
 msgstr "Utwórz jeden automatycznie"
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Create organisation"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/menu-switcher.tsx
+msgid "Create Organisation"
+msgstr ""
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Create separate organisation"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Create signing links"
 msgstr "Utwórz linki do podpisania"
 
-#: apps/remix/app/components/general/menu-switcher.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Create Stripe customer"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Create subscription"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Create Subscription Claim"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create team"
 msgstr "Utwórz zespół"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Create Team"
 msgstr "Utwórz zespół"
@@ -2025,6 +2224,8 @@ msgstr "Utwórz swoje konto i zacznij korzystać z nowoczesnego podpisywania dok
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 #: apps/remix/app/components/tables/templates-table.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/tables/admin-leaderboard-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-information.tsx
@@ -2035,25 +2236,23 @@ msgid "Created"
 msgstr "Utworzono"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Created At"
 msgstr "Utworzono w"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Created by"
 msgstr "Utworzono przez"
 
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table.tsx
 msgid "Created on"
 msgstr "Utworzone w"
 
 #. placeholder {0}: i18n.date(webhook.createdAt, DateTime.DATETIME_FULL)
 #. placeholder {0}: i18n.date(token.createdAt, DateTime.DATETIME_FULL)
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Created on {0}"
 msgstr "Utworzono {0}"
 
@@ -2073,14 +2272,26 @@ msgstr "Aktualne hasło jest niepoprawne."
 msgid "Current recipients:"
 msgstr "Aktualni odbiorcy:"
 
-#: apps/remix/app/components/general/billing-plans.tsx
-msgid "Daily"
-msgstr "Codziennie"
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "Currently all organisation members can access this team"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Currently branding can only be configured for Teams and above plans."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups._index.tsx
+msgid "Custom Organisation Groups"
+msgstr ""
 
 #: apps/remix/app/components/general/app-command-menu.tsx
 msgid "Dark Mode"
 msgstr "Tryb ciemny"
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Dashboard"
+msgstr ""
+
 #: apps/remix/app/components/tables/settings-security-activity-table.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-date-field.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
@@ -2089,8 +2300,7 @@ msgstr "Tryb ciemny"
 msgid "Date"
 msgstr "Data"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Date created"
 msgstr "Data utworzenia"
 
@@ -2100,24 +2310,20 @@ msgstr "Data utworzenia"
 msgid "Date Format"
 msgstr "Format daty"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: packages/email/templates/team-invite.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: packages/email/templates/organisation-invite.tsx
 msgid "Decline"
 msgstr "Odmów"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Declined team invitation"
-msgstr "Odrzucono zaproszenie do zespołu"
-
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Document Language"
 msgstr "Domyślny język dokumentu"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Document Visibility"
 msgstr "Domyślna widoczność dokumentu"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Default Signature Settings"
 msgstr "Domyślne ustawienia podpisu"
 
@@ -2125,20 +2331,30 @@ msgstr "Domyślne ustawienia podpisu"
 msgid "delete"
 msgstr "usuń"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/document/document-page-view-dropdown.tsx
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
 msgid "Delete"
 msgstr "Usuń"
 
@@ -2148,6 +2364,7 @@ msgstr "Usuń"
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-folder-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/folder-delete-dialog.tsx
 msgid "delete {0}"
 msgstr "usuń {0}"
@@ -2178,18 +2395,33 @@ msgstr "Usuń dokument"
 msgid "Delete Document"
 msgstr "Usuń dokument"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "Delete organisation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "Delete organisation group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "Delete organisation member"
+msgstr ""
+
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "Delete passkey"
 msgstr "Usuń klucz dostępu"
 
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Delete Subscription Claim"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Delete team"
 msgstr "Usuń zespół"
 
-#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-msgid "Delete team member"
-msgstr "Usuń członka zespołu"
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "Delete team group"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 msgid "Delete the document. This action is irreversible so proceed with caution."
@@ -2278,6 +2510,7 @@ msgstr "Link szablonu bezpośredniego usunięty"
 msgid "Direct template link usage exceeded ({0}/{1})"
 msgstr "Przekroczono użycie linku szablonu bezpośredniego ({0}/{1})"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Disable"
 msgstr "Wyłącz"
@@ -2288,6 +2521,10 @@ msgstr "Wyłącz"
 msgid "Disable 2FA"
 msgstr "Wyłącz 2FA"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "Disable access"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
 msgid "Disable account"
 msgstr "Wyłącz konto"
@@ -2302,7 +2539,6 @@ msgid "Disable Two Factor Authentication before deleting your account."
 msgstr "Wyłącz dwuskładnikowe uwierzytelnianie przed usunięciem konta."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "Disabled"
 msgstr "Wyłączone"
 
@@ -2338,8 +2574,7 @@ msgstr "Czy chcesz zduplikować ten szablon?"
 msgid "Documenso will delete <0>all of your documents</0>, along with all of your completed documents, signatures, and all other resources belonging to your Account."
 msgstr "Documenso usunie <0>wszystkie twoje dokumenty</0>, wraz ze wszystkimi zakończonymi dokumentami, podpisami i wszystkimi innymi zasobami należącymi do twojego konta."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Document"
 msgstr "Dokument"
@@ -2426,8 +2661,7 @@ msgstr "Dokument utworzony za pomocą <0>bezpośredniego linku</0>"
 msgid "Document Creation"
 msgstr "Tworzenie dokumentu"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx
 #: packages/lib/utils/document-audit-logs.ts
@@ -2463,15 +2697,13 @@ msgstr "Zaktualizowane ID zewnętrzne dokumentu"
 msgid "Document found in your account"
 msgstr "Dokument znaleziony na Twoim koncie"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/components/general/document/document-history-sheet.tsx
 msgid "Document history"
 msgstr "Historia dokumentu"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document ID"
 msgstr "Identyfikator dokumentu"
 
@@ -2496,7 +2728,6 @@ msgid "Document metrics"
 msgstr "Metryki dokumentów"
 
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "Document moved"
 msgstr "Dokument przeniesiony"
 
@@ -2520,7 +2751,8 @@ msgstr "Dokument w toku"
 msgid "Document pending email"
 msgstr "E-mail oczekującego dokumentu"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Document preferences updated"
 msgstr "Preferencje dokumentu zaktualizowane"
 
@@ -2559,13 +2791,11 @@ msgstr "Zaktualizowano autoryzację podpisu dokumentu"
 msgid "Document signing process will be cancelled"
 msgstr "Proces podpisywania dokumentu zostanie anulowany"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document status"
 msgstr "Status dokumentu"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Document title"
 msgstr "Tytuł dokumentu"
 
@@ -2603,16 +2833,13 @@ msgid "Document will be permanently deleted"
 msgstr "Dokument zostanie trwale usunięty"
 
 #: apps/remix/app/routes/_profile+/p.$url.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
 #: apps/remix/app/components/general/user-profile-timur.tsx
-#: apps/remix/app/components/general/generic-error-layout.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -2620,8 +2847,7 @@ msgstr "Dokument zostanie trwale usunięty"
 msgid "Documents"
 msgstr "Dokumenty"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Documents created from template"
 msgstr "Dokumenty utworzone z szablonu"
 
@@ -2629,6 +2855,10 @@ msgstr "Dokumenty utworzone z szablonu"
 msgid "Documents Received"
 msgstr "Odebrane dokumenty"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
+msgid "Documents that require your attention will appear here"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
 msgid "Documents Viewed"
 msgstr "Wyświetlone dokumenty"
@@ -2638,7 +2868,8 @@ msgstr "Wyświetlone dokumenty"
 msgid "Don't have an account? <0>Sign up</0>"
 msgstr "Nie masz konta? <0>Zarejestruj się</0>"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/share-document-download-button.tsx
@@ -2711,7 +2942,7 @@ msgstr "Lista rozwijana"
 msgid "Dropdown options"
 msgstr "Opcje rozwijane"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Due to an unpaid invoice, your team has been restricted. Please settle the payment to restore full access to your team."
 msgstr "Z powodu nieopłaconej faktury Twój zespół został ograniczony. Proszę uregulować płatność, aby przywrócić pełny dostęp do zespołu."
 
@@ -2730,7 +2961,6 @@ msgid "Duplicate on all pages"
 msgstr "Powiel na wszystkich stronach"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
@@ -2741,13 +2971,11 @@ msgstr "Powiel na wszystkich stronach"
 msgid "Edit"
 msgstr "Edytuj"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Edit Template"
 msgstr "Edytuj szablon"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Edit webhook"
 msgstr "Edytuj webhook"
 
@@ -2762,6 +2990,7 @@ msgstr "Ujawnienie podpisu elektronicznego"
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/tables/admin-document-recipient-item-table.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-email-field.tsx
@@ -2772,6 +3001,7 @@ msgstr "Ujawnienie podpisu elektronicznego"
 #: apps/remix/app/components/forms/forgot-password.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
@@ -2793,7 +3023,7 @@ msgstr "Adres e-mail"
 
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/send-confirmation-email.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Email address"
 msgstr "Adres e-mail"
 
@@ -2837,15 +3067,27 @@ msgstr "Weryfikacja e-mailu została usunięta"
 msgid "Email verification has been resent"
 msgstr "Weryfikacja e-mailu została ponownie wysłana"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Embedding, 5 members included and more"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "Empty field"
 msgstr "Puste pole"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Enable"
+msgstr ""
+
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "Enable 2FA"
 msgstr "Włącz 2FA"
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "Enable access"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 msgid "Enable account"
 msgstr "Włącz konto"
@@ -2859,9 +3101,17 @@ msgstr "Włącz konto"
 msgid "Enable Authenticator App"
 msgstr "Włącz aplikację uwierzytelniającą"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
-msgid "Enable custom branding for all documents in this team."
-msgstr "Włącz niestandardowe brandowanie dla wszystkich dokumentów w tym zespole."
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable Custom Branding"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable custom branding for all documents in this organisation"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Enable custom branding for all documents in this team"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: packages/lib/constants/template.ts
@@ -2876,8 +3126,6 @@ msgstr "Włącz kolejność podpisów"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Enabled"
@@ -2891,11 +3139,15 @@ msgstr "Włączenie konta pozwala użytkownikowi na ponowne korzystanie z niego
 msgid "Enclosed Document"
 msgstr "Załączony dokument"
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "Ends On"
-msgstr "Kończy się"
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Enter claim name"
+msgstr ""
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Enter your 2FA code"
+msgstr ""
+
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Enter your brand details"
 msgstr "Wprowadź szczegóły swojej marki"
 
@@ -2911,15 +3163,24 @@ msgstr "Wprowadź swój adres e-mail, aby otrzymać ukończony dokument."
 msgid "Enter your name"
 msgstr "Wprowadź swoje imię"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Enter your password"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-text-field.tsx
 msgid "Enter your text here"
 msgstr "Wprowadź swój tekst tutaj"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Enterprise"
+msgstr ""
+
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
 #: apps/remix/app/components/general/verify-email-banner.tsx
 #: apps/remix/app/components/general/template/template-edit-form.tsx
@@ -2954,15 +3215,14 @@ msgstr "Wprowadź swój tekst tutaj"
 #: apps/remix/app/components/general/document/document-edit-form.tsx
 #: apps/remix/app/components/general/document/document-edit-form.tsx
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/template-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx
@@ -2975,7 +3235,7 @@ msgstr "Błąd"
 msgid "Error uploading file"
 msgstr "Błąd przesyłania pliku"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Everyone can access and view the document"
 msgstr "Każdy może uzyskać dostęp do dokumentu i go wyświetlić"
 
@@ -2996,7 +3256,7 @@ msgid "Expired"
 msgstr "Wygasło"
 
 #. placeholder {0}: i18n.date(token.expires, DateTime.DATETIME_FULL)
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Expires on {0}"
 msgstr "Wygasa {0}"
 
@@ -3010,6 +3270,18 @@ msgstr "Zewnętrzny ID"
 msgid "Failed to create folder"
 msgstr "Nie udało się utworzyć folderu"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Failed to create subscription claim."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Failed to delete subscription claim."
+msgstr ""
+
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
+msgid "Failed to load document"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
 msgid "Failed to reseal document"
 msgstr "Nie udało się ponownie zaplombować dokumentu"
@@ -3026,12 +3298,15 @@ msgstr "Nie udało się aktualizować dokumentu"
 msgid "Failed to update recipient"
 msgstr "Nie udało się zaktualizować odbiorcy"
 
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Failed to update subscription claim."
+msgstr ""
+
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 msgid "Failed to update template"
 msgstr "Nie udało się zaktualizować szablonu"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Failed to update webhook"
 msgstr "Nie udało się zaktualizować webhooku"
 
@@ -3039,6 +3314,12 @@ msgstr "Nie udało się zaktualizować webhooku"
 msgid "Failed: {failedCount}"
 msgstr "Niepowodzenia: {failedCount}"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Feature Flags"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 msgid "Field character limit"
 msgstr "Limit znaków pola"
@@ -3096,6 +3377,10 @@ msgstr "Plik nie może mieć większej wielkości niż {APP_DOCUMENT_UPLOAD_SIZE
 msgid "File size exceeds the limit of {APP_DOCUMENT_UPLOAD_SIZE_LIMIT} MB"
 msgstr "Rozmiar pliku przekracza limit {APP_DOCUMENT_UPLOAD_SIZE_LIMIT} MB"
 
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Fill in the details to create a new subscription claim."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
 msgid "Folder"
@@ -3132,6 +3417,10 @@ msgstr "W przypadku jakichkolwiek pytań dotyczących tego ujawnienia, podpisów
 msgid "For each recipient, provide their email (required) and name (optional) in separate columns. Download the template CSV below for the correct format."
 msgstr "Dla każdego odbiorcy podaj jego email (wymagany) i nazwę (opcjonalnie) w oddzielnych kolumnach. Pobierz poniżej szablon CSV dla właściwego formatu."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "For example, if the claim has a new flag \"FLAG_1\" set to true, then this organisation will get that flag added."
+msgstr ""
+
 #: packages/lib/server-only/auth/send-forgot-password.ts
 msgid "Forgot Password?"
 msgstr "Zapomniałeś hasła?"
@@ -3142,6 +3431,10 @@ msgstr "Zapomniałeś hasła?"
 msgid "Forgot your password?"
 msgstr "Zapomniałeś swoje hasło?"
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Free"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/types.ts
 msgid "Free Signature"
 msgstr "Podpis wolny"
@@ -3153,9 +3446,12 @@ msgstr "Podpis wolny"
 #: apps/remix/app/components/forms/profile.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Full Name"
 msgstr "Imię i nazwisko"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
 #: apps/remix/app/components/general/template/template-edit-form.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
@@ -3173,8 +3469,16 @@ msgstr "Generuj linki"
 msgid "Global recipient action authentication"
 msgstr "Globalne uwierzytelnianie akcji odbiorcy"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Go back"
+msgstr ""
+
 #: apps/remix/app/routes/_recipient+/_layout.tsx
 #: apps/remix/app/routes/_profile+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
 #: packages/ui/primitives/document-flow/document-flow-root.tsx
 msgid "Go Back"
@@ -3192,6 +3496,10 @@ msgstr "Wróć do domu"
 msgid "Go Back Home"
 msgstr "Wróć do domu"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid "Go home"
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-certificate-qr-view.tsx
 msgid "Go to document"
 msgstr "Przejdź do dokumentu"
@@ -3200,6 +3508,10 @@ msgstr "Przejdź do dokumentu"
 msgid "Go to owner"
 msgstr "Przejdź do właściciela"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Go to team"
+msgstr ""
+
 #: apps/remix/app/routes/_profile+/p.$url.tsx
 msgid "Go to your <0>public profile settings</0> to add documents."
 msgstr "Przejdź do swojego <0>ustawienia profilu publicznego</0>, aby dodać dokumenty."
@@ -3208,6 +3520,34 @@ msgstr "Przejdź do swojego <0>ustawienia profilu publicznego</0>, aby dodać do
 msgid "Green"
 msgstr "Zielony"
 
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Group"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Group has been created."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Group has been updated successfully"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Group Name"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
+#: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Groups"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
 msgid "has invited you to approve this document"
 msgstr "Zaproszono Cię do zatwierdzenia tego dokumentu"
@@ -3237,6 +3577,10 @@ msgstr "Asystent jako ostatni sygnatariusz oznacza, że nie będą oni mogli pod
 msgid "Help complete the document for other signers."
 msgstr "Pomóc zakończyć dokument dla innych sygnatariuszy."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "Here you can edit your organisation details."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/profile.tsx
 msgid "Here you can edit your personal details."
 msgstr "Tutaj możesz edytować szczegóły konta."
@@ -3245,14 +3589,23 @@ msgstr "Tutaj możesz edytować szczegóły konta."
 msgid "Here you can manage your password and security settings."
 msgstr "Tutaj możesz zarządzać swoim hasłem i ustawieniami zabezpieczeń."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Here you can set preferences and defaults for branding."
 msgstr "Tutaj możesz ustawić preferencje i domyślne ustawienia dla brandowania."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Here you can set preferences and defaults for your organisation. Teams will inherit these settings by default."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Here you can set preferences and defaults for your team."
 msgstr "Tutaj możesz ustawić preferencje i domyślne ustawienia dla swojego zespołu."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Here you can set your general preferences"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "Here's how it works:"
 msgstr "Oto jak to działa:"
@@ -3269,7 +3622,7 @@ msgstr "Cześć, {userName},"
 msgid "Hi, {userName} <0>({userEmail})</0>"
 msgstr "Cześć, {userName} <0>({userEmail})</0>"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "Hide"
@@ -3279,6 +3632,10 @@ msgstr "Ukryj"
 msgid "Hide additional information"
 msgstr "Ukryj dodatkowe informacje"
 
+#: apps/remix/app/components/general/generic-error-layout.tsx
+msgid "Home"
+msgstr ""
+
 #: packages/lib/constants/recipient-roles.ts
 msgid "I am a signer of this document"
 msgstr "Jestem sygnatariuszem tego dokumentu"
@@ -3308,9 +3665,13 @@ msgstr "Jestem właścicielem tego dokumentu"
 msgid "I'm sure! Delete it"
 msgstr "Jestem pewny! Usuń to"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "If they accept this request, the team will be transferred to their account."
-msgstr "Jeśli zaakceptują tę prośbę, zespół zostanie przeniesiony na ich konto."
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "ID"
+msgstr ""
+
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "ID copied to clipboard"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "If you do not want to use the authenticator prompted, you can close it, which will then display the next available authenticator."
@@ -3324,6 +3685,8 @@ msgstr "Jeśli nie znajdziesz linku potwierdzającego w swojej skrzynce odbiorcz
 msgid "If your authenticator app does not support QR codes, you can use the following code instead:"
 msgstr "Jeśli Twoja aplikacja uwierzytelniająca nie obsługuje kodów QR, możesz użyć poniższego kodu:"
 
+#: apps/remix/app/components/general/app-nav-mobile.tsx
+#: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 msgid "Inbox"
 msgstr "Skrzynka odbiorcza"
@@ -3332,7 +3695,7 @@ msgstr "Skrzynka odbiorcza"
 msgid "Inbox documents"
 msgstr "Skrzynka odbiorcza dokumentów"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Include the Signing Certificate in the Document"
 msgstr "Dołącz certyfikat podpisu do dokumentu"
 
@@ -3341,11 +3704,27 @@ msgstr "Dołącz certyfikat podpisu do dokumentu"
 msgid "Information"
 msgstr "Informacje"
 
-#: packages/ui/components/recipient/recipient-action-auth-select.tsx
 #: packages/ui/components/recipient/recipient-action-auth-select.tsx
 msgid "Inherit authentication method"
 msgstr "Przechwyć metodę uwierzytelniania"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Inherit from organisation"
+msgstr ""
+
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "Inherit organisation members"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Inherited subscription claim"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-initials-field.tsx
 #: packages/ui/primitives/document-flow/types.ts
 msgid "Initials"
@@ -3372,8 +3751,8 @@ msgstr "Nieprawidłowy email"
 msgid "Invalid link"
 msgstr "Nieprawidłowy link"
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Invalid token"
 msgstr "Nieprawidłowy token"
 
@@ -3381,43 +3760,52 @@ msgstr "Nieprawidłowy token"
 msgid "Invalid token provided. Please try again."
 msgstr "Podano nieprawidłowy token. Spróbuj ponownie."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Invitation accepted"
+msgstr ""
+
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "Invitation accepted!"
 msgstr "Zaproszenie zaakceptowane!"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "Invitation declined"
 msgstr "Zaproszenie odrzucone"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invitation has been deleted"
 msgstr "Zaproszenie zostało usunięte"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invitation has been resent"
 msgstr "Zaproszenie zostało ponownie wysłane"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite"
 msgstr "Zaproszenie"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite member"
 msgstr "Zaproś członka"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Invite Members"
 msgstr "Zaproś członków"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "Invite team members"
-msgstr "Zaproś członków zespołu"
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Invite organisation members"
+msgstr ""
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Invite team members to collaborate"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Invited At"
 msgstr "Zaproś o"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -3435,6 +3823,10 @@ msgstr "Konieczne jest, aby mieć aktualne informacje kontaktowe, szczególnie s
 msgid "It looks like {0} hasn't added any documents to their profile yet."
 msgstr "Wygląda na to, że {0} jeszcze nie dodał żadnych dokumentów do swojego profilu."
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "It looks like we ran into an issue!"
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
 msgid "It seems that the provided token has expired. We've just sent you another token, please check your email and try again."
 msgstr "Wydaje się, że podany token wygasł. Właśnie wysłaliśmy Ci nowy token, proszę sprawdź swoją pocztę i spróbuj ponownie."
@@ -3451,9 +3843,14 @@ msgstr "Aktualnie nie jest Twoja kolej na podpisanie. Wróć wkrótce, ponieważ
 msgid "It's currently not your turn to sign. You will receive an email with instructions once it's your turn to sign the document."
 msgstr "Obecnie nie jest Twój czas na podpisanie dokumentu. Otrzymasz e-mail z instrukcjami, gdy przyjdzie Twój czas na podpisanie dokumentu."
 
-#: packages/email/templates/team-invite.tsx
-msgid "Join {teamName} on Documenso"
-msgstr "Dołącz do {teamName} na Documenso"
+#: packages/email/templates/organisation-invite.tsx
+msgid "Join {organisationName} on Documenso"
+msgstr ""
+
+#. placeholder {0}: DateTime.fromJSDate(team.createdAt).toRelative({ style: 'short' })
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Joined {0}"
+msgstr ""
 
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
@@ -3463,6 +3860,7 @@ msgstr "Dołącz do {teamName} na Documenso"
 msgid "Label"
 msgstr "Etykieta"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
@@ -3487,8 +3885,7 @@ msgstr "Ostatnie 7 dni"
 msgid "Last modified"
 msgstr "Ostatnia modyfikacja"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Last updated"
 msgstr "Zaktualizowano"
 
@@ -3508,14 +3905,20 @@ msgstr "Ostatnie użycie"
 msgid "Leaderboard"
 msgstr "Ranking"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
 msgid "Leave"
 msgstr "Wyjdź"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "Leave team"
-msgstr "Opuszczaj zespół"
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Leave blank to inherit from the organisation."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "Leave organisation"
+msgstr ""
 
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Legality of Electronic Signatures"
@@ -3529,12 +3932,11 @@ msgstr "Jasny tryb"
 msgid "Like to have your own public profile with agreements?"
 msgstr "Czy chcesz mieć własny publiczny profil z umowami?"
 
-#: packages/email/templates/team-transfer-request.tsx
 #: packages/email/templates/confirm-team-email.tsx
 msgid "Link expires in 1 hour."
 msgstr "Link wygasa za 1 godzinę."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Link template"
 msgstr "Szablon linku"
 
@@ -3544,7 +3946,6 @@ msgstr "Wygenerowane linki"
 
 #. placeholder {0}: webhook.eventTriggers .map((trigger) => toFriendlyWebhookEventName(trigger)) .join(', ')
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "Listening to {0}"
 msgstr "Słuchając {0}"
 
@@ -3553,6 +3954,7 @@ msgid "Load older activity"
 msgstr "Załaduj starszą aktywność"
 
 #: apps/remix/app/components/general/skeletons/document-edit-skeleton.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: packages/ui/primitives/pdf-viewer.tsx
 msgid "Loading document..."
 msgstr "Ładowanie dokumentu..."
@@ -3562,11 +3964,6 @@ msgstr "Ładowanie dokumentu..."
 msgid "Loading Document..."
 msgstr "Ładowanie dokumentu..."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Loading teams..."
-msgstr "Ładowanie zespołów..."
-
 #: apps/remix/app/components/general/document/document-page-view-recent-activity.tsx
 msgid "Loading..."
 msgstr "Ładowanie..."
@@ -3577,7 +3974,9 @@ msgstr "Ładowanie..."
 msgid "Login"
 msgstr "Zaloguj się"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Manage"
 msgstr "Zarządzaj"
 
@@ -3586,16 +3985,19 @@ msgstr "Zarządzaj"
 msgid "Manage {0}'s profile"
 msgstr "Zarządzaj profilem {0}"
 
-#: apps/remix/app/routes/_authenticated+/settings+/teams.tsx
-msgid "Manage all teams you are currently associated with."
-msgstr "Zarządzaj wszystkimi zespołami, z którymi jesteś obecnie związany."
+#: apps/remix/app/routes/_authenticated+/settings+/organisations.tsx
+msgid "Manage all organisations you are currently associated with."
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Manage all subscription claims"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Manage and view template"
 msgstr "Zarządzaj i przeglądaj szablon"
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
 msgid "Manage billing"
 msgstr "Zarządzaj fakturowaniem"
 
@@ -3611,42 +4013,69 @@ msgstr "Zarządzaj Bezpośrednim Linkiem"
 msgid "Manage documents"
 msgstr "Zarządzaj dokumentami"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage organisation"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Manage organisations"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security._index.tsx
 msgid "Manage passkeys"
 msgstr "Zarządzaj kluczami dostępu"
 
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Manage permissions and access controls"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 msgid "Manage subscription"
 msgstr "Zarządzaj subskrypcją"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-msgid "Manage Subscription"
-msgstr "Zarządzaj subskrypcją"
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage the {0} organisation"
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "Manage subscriptions"
-msgstr "Zarządzaj subskrypcjami"
+#. placeholder {0}: organisation.name
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Manage the {0} organisation subscription"
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Manage team subscription."
-msgstr "Zarządzaj subskrypcją zespołu."
-
-#: apps/remix/app/components/general/menu-switcher.tsx
-msgid "Manage teams"
-msgstr "Zarządzaj zespołami"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups._index.tsx
+msgid "Manage the custom groups of members for your organisation."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "Manage the direct link signing for this template"
 msgstr "Zarządzaj podpisywaniem bezpośredniego linku dla tego szablonu"
 
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
+msgid "Manage the groups assigned to this team."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+msgid "Manage the members of your team."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 msgid "Manage the members or invite new members."
 msgstr "Zarządzaj członkami lub zaproś nowych członków."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+msgid "Manage the teams in this organisation."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/users._index.tsx
 msgid "Manage users"
 msgstr "Zarządzaj użytkownikami"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Manage your organisation group settings."
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.passkeys.tsx
 msgid "Manage your passkeys."
 msgstr "Zarządzaj kluczami dostępu."
@@ -3655,7 +4084,8 @@ msgstr "Zarządzaj kluczami dostępu."
 msgid "Manage your site settings here"
 msgstr "Zarządzaj ustawieniami swojej witryny tutaj"
 
-#: packages/lib/constants/teams.ts
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Manager"
 msgstr "Menedżer"
 
@@ -3684,18 +4114,33 @@ msgstr "Max"
 msgid "Maximum file size: 4MB. Maximum 100 rows per upload. Blank values will use template defaults."
 msgstr "Maksymalny rozmiar pliku: 4MB. Maksymalnie 100 wierszy na przesyłkę. Puste wartości zostaną zastąpione domyślnymi z szablonu."
 
-#: packages/lib/constants/teams.ts
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: packages/lib/constants/teams-translations.ts
+#: packages/lib/constants/organisations-translations.ts
 msgid "Member"
 msgstr "Członek"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Member Count"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
 msgid "Member Since"
 msgstr "Data dołączenia"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
 msgid "Members"
 msgstr "Członkowie"
 
@@ -3714,8 +4159,12 @@ msgstr "Min"
 msgid "Modify recipients"
 msgstr "Modyfikuj odbiorców"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Modify the details of the subscription claim."
+msgstr ""
+
 #: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Monthly"
 msgstr "Miesięczny"
 
@@ -3728,9 +4177,7 @@ msgid "Monthly Active Users: Users that had at least one of their documents comp
 msgstr "Miesięczni aktywni użytkownicy: Użytkownicy, którzy mieli przynajmniej jeden z ukończonych dokumentów"
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 #: apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
 msgid "Move"
 msgstr "Przenieś"
 
@@ -3742,36 +4189,18 @@ msgstr "Przenieś \"{templateTitle}\" do folderu"
 msgid "Move Document to Folder"
 msgstr "Przenieś dokument do folderu"
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Move Document to Team"
-msgstr "Przenieś dokument do zespołu"
-
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
 msgid "Move Template to Folder"
 msgstr "Przenieś szablon do folderu"
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Move Template to Team"
-msgstr "Przenieś szablon do zespołu"
-
 #: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 msgid "Move to Folder"
 msgstr "Przenieś do folderu"
 
-#: apps/remix/app/components/tables/templates-table-action-dropdown.tsx
-#: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
-msgid "Move to Team"
-msgstr "Przenieś do zespołu"
-
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Moving..."
-msgstr "Przenoszenie..."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "My templates"
-msgstr "Moje szablony"
+#: packages/ui/components/document/document-global-auth-access-select.tsx
+msgid "Multiple access methods can be selected."
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table.tsx
@@ -3779,9 +4208,11 @@ msgstr "Moje szablony"
 #: apps/remix/app/components/tables/admin-leaderboard-table.tsx
 #: apps/remix/app/components/tables/admin-document-recipient-item-table.tsx
 #: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-name-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
@@ -3799,6 +4230,10 @@ msgstr "Moje szablony"
 msgid "Name"
 msgstr "Nazwa"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Name is required"
+msgstr ""
+
 #: apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
 msgid "Need to sign documents?"
 msgstr "Potrzebujesz podpisać dokumenty?"
@@ -3827,18 +4262,16 @@ msgstr "Nigdy nie wygasa"
 msgid "New Password"
 msgstr "Nowe hasło"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "New team owner"
-msgstr "Nowy właściciel zespołu"
-
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
 msgid "New Template"
 msgstr "Nowy szablon"
 
-#: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: packages/ui/primitives/signature-pad/signature-pad-dialog.tsx
 msgid "Next"
 msgstr "Dalej"
@@ -3847,6 +4280,11 @@ msgstr "Dalej"
 msgid "Next field"
 msgstr "Następne pole"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "No"
+msgstr ""
+
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "No active drafts"
 msgstr "Brak aktywnych szkiców"
@@ -3856,9 +4294,9 @@ msgstr "Brak aktywnych szkiców"
 msgid "No further action is required from you at this time."
 msgstr "Nie są wymagane żadne dalsze działania z Twojej strony w tym momencie."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "No payment required"
-msgstr "Brak wymaganej płatności"
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "No organisations found"
+msgstr ""
 
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
 msgid "No public profile templates found"
@@ -3890,8 +4328,6 @@ msgid "No recipients with this role"
 msgstr "Brak odbiorców z tą rolą"
 
 #: packages/ui/components/document/document-global-auth-action-select.tsx
-#: packages/ui/components/document/document-global-auth-action-select.tsx
-#: packages/ui/components/document/document-global-auth-access-select.tsx
 #: packages/ui/components/document/document-global-auth-access-select.tsx
 msgid "No restrictions"
 msgstr "Brak ograniczeń"
@@ -3908,6 +4344,18 @@ msgstr "Brak wyników."
 msgid "No signature field found"
 msgstr "Nie znaleziono pola podpisu"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "No Stripe customer attached"
+msgstr ""
+
+#: apps/remix/app/components/tables/team-groups-table.tsx
+msgid "No team groups found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "No teams yet"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "No valid direct templates found"
 msgstr "Nie znaleziono ważnych szablonów bezpośrednich"
@@ -3926,6 +4374,7 @@ msgstr "Nie znaleziono wartości."
 msgid "No worries, it happens! Enter your email and we'll email you a special link to reset your password."
 msgstr "Nie martw się, to się zdarza! Wprowadź swój e-mail, a my wyślemy Ci specjalny link do zresetowania hasła."
 
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/lib/constants/document.ts
 msgid "None"
@@ -3951,6 +4400,16 @@ msgstr "Numer"
 msgid "Number format"
 msgstr "Format liczby"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Number of members allowed. 0 = Unlimited"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Number of teams allowed. 0 = Unlimited"
+msgstr ""
+
 #. placeholder {0}: document.team?.name
 #: apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
 msgid "on behalf of \"{0}\" has invited you to approve this document"
@@ -3975,17 +4434,15 @@ msgstr "W imieniu \"{0}\" zaproszono Cię do wyświetlenia tego dokumentu"
 msgid "On this page, you can create a new webhook."
 msgstr "Na tej stronie możesz utworzyć nowy webhook."
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "On this page, you can create and manage API tokens. See our <0>Documentation</0> for more information."
 msgstr "Na tej stronie możesz tworzyć i zarządzać tokenami API. Zapoznaj się z naszą <0>Dokumentacją</0> po więcej informacji."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "On this page, you can create new Webhooks and manage the existing ones."
 msgstr "Na tej stronie możesz utworzyć nowe webhooki i zarządzać istniejącymi."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "On this page, you can edit the webhook and its settings."
 msgstr "Na tej stronie możesz edytować webhook i jego ustawienia."
 
@@ -4005,18 +4462,18 @@ msgstr "Po zeskanowaniu kodu QR lub ręcznym wpisaniu kodu, wprowadź poniżej k
 msgid "Once your template is set up, share the link anywhere you want. The person who opens the link will be able to enter their information in the direct link recipient field and complete any other fields assigned to them."
 msgstr "Po skonfigurowaniu szablonu udostępnij link wszędzie, gdzie chcesz. Osoba, która otworzy link, będzie mogła wprowadzić swoje dane w polu odbiorcy linku bezpośredniego i wypełnić wszelkie inne przypisane jej pola."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "One of the documents in the current bundle has a signing role that is not compatible with the current signing experience."
+msgstr ""
+
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Only admins can access and view the document"
 msgstr "Tylko administratorzy mogą uzyskać dostęp do dokumentu i go wyświetlić"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Only managers and above can access and view the document"
 msgstr "Tylko menedżerowie i wyżej mogą uzyskać dostęp do dokumentu i go wyświetlić"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Only subscribers can have a username shorter than 6 characters"
-msgstr "Tylko subskrybenci mogą mieć nazwę użytkownika krótszą niż 6 znaków"
-
 #: apps/remix/app/routes/_profile+/_layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
 #: apps/remix/app/components/general/generic-error-layout.tsx
@@ -4036,15 +4493,131 @@ msgstr "Lub"
 msgid "Or continue with"
 msgstr "Lub kontynuuj z"
 
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "Organisation"
+msgstr ""
+
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Admin"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Organisation created"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Organisation group not found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Organisation Group Settings"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation has been updated successfully"
+msgstr ""
+
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "Organisation invitation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Organisation invitations have been sent."
+msgstr ""
+
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Manager"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: packages/lib/constants/organisations-translations.ts
+msgid "Organisation Member"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation Members"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "Organisation Name"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation not found"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Organisation Preferences"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Organisation role"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Organisation Role"
+msgstr ""
+
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Organisation settings"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+msgid "Organisation Settings"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Organisation Teams"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Organisation URL"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/routes/_authenticated+/settings+/organisations.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
+#: apps/remix/app/components/general/settings-nav-mobile.tsx
+#: apps/remix/app/components/general/settings-nav-desktop.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Organisations"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "Organisations that the user is a member of."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Organise your members into groups which can be assigned to teams"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Organize your documents and templates"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-use-dialog.tsx
 msgid "Otherwise, the document will be created as a draft."
 msgstr "W przeciwnym razie dokument zostanie utworzony jako wersja robocza."
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Owner"
 msgstr "Właściciel"
 
@@ -4059,10 +4632,7 @@ msgstr "Strona {0} z {1}"
 msgid "Page {0} of {numPages}"
 msgstr "Strona {0} z {numPages}"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "Paid"
-msgstr "Opłacono"
-
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/forms/signin.tsx
 msgid "Passkey"
 msgstr "Klucz dostępu"
@@ -4105,12 +4675,18 @@ msgid "Passkeys are not supported on this browser"
 msgstr "Klucze dostępu nie są obsługiwane w tej przeglądarce"
 
 #: apps/remix/app/components/general/app-command-menu.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/forms/signup.tsx
 #: apps/remix/app/components/forms/signin.tsx
 #: apps/remix/app/components/forms/reset-password.tsx
 msgid "Password"
 msgstr "Hasło"
 
+#: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
+msgid "Password Re-Authentication"
+msgstr ""
+
 #: packages/email/templates/forgot-password.tsx
 msgid "Password Reset Requested"
 msgstr "Żądanie resetowania hasła"
@@ -4133,21 +4709,12 @@ msgstr "Hasło zostało zaktualizowane"
 msgid "Password updated!"
 msgstr "Hasło zaktualizowane!"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "Pay"
-msgstr "Zapłać"
-
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Payment is required to finalise the creation of your team."
-msgstr "Płatność jest wymagana do zakończenia tworzenia zespołu."
-
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Payment overdue"
 msgstr "Płatność zaległa"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
@@ -4168,22 +4735,36 @@ msgstr "Oczekujące Dokumenty"
 msgid "Pending Documents"
 msgstr "Oczekujące dokumenty"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "Pending invitations"
 msgstr "Oczekujące zaproszenia"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "Pending team deleted."
-msgstr "Oczekujący zespół usunięty."
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "per month"
+msgstr ""
 
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "per year"
+msgstr ""
+
+#: apps/remix/app/components/tables/user-organisations-table.tsx
 msgid "Personal"
 msgstr "Osobiste"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 msgid "Personal Account"
 msgstr "Konto osobiste"
 
+#: apps/remix/app/routes/_authenticated+/inbox.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/menu-switcher.tsx
+msgid "Personal Inbox"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
 msgid "Pick a number"
 msgstr "Wybierz numer"
@@ -4223,7 +4804,7 @@ msgstr "Proszę {recipientActionVerb} ten dokument utworzony przez Twój bezpoś
 msgid "Please {recipientActionVerb} your document"
 msgstr "Proszę {recipientActionVerb} Twój dokument"
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Please check the CSV file and make sure it is according to our format"
 msgstr "Proszę sprawdzić plik CSV i upewnić się, że jest zgodny z naszym formatem"
 
@@ -4256,6 +4837,10 @@ msgstr "Proszę potwierdzić swój adres email"
 msgid "Please contact support if you would like to revert this action."
 msgstr "Proszę skontaktować się z pomocą techniczną, jeśli chcesz cofnąć tę akcję."
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Please contact the site owner for further assistance."
+msgstr ""
+
 #: apps/remix/app/components/forms/token.tsx
 msgid "Please enter a meaningful name for your token. This will help you identify it later."
 msgstr "Wpisz nazwę tokena. Pomoże to później w jego identyfikacji."
@@ -4341,17 +4926,25 @@ msgstr "Wpisz {0}, aby potwierdzić"
 msgid "Please type <0>{0}</0> to confirm."
 msgstr "Wpisz <0>{0}</0>, aby potwierdzić."
 
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
+msgid "Please upload a logo"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
 msgid "Pre-formatted CSV template with example data."
 msgstr "Wstępnie sformatowany szablon CSV z przykładowymi danymi."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/components/general/settings-nav-mobile.tsx
+#: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Preview"
 msgstr "Podgląd"
 
@@ -4379,11 +4972,11 @@ msgstr "Kontynuuj"
 msgid "Profile"
 msgstr "Profil"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Profile is currently <0>hidden</0>."
 msgstr "Profil jest obecnie <0>ukryty</0>."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Profile is currently <0>visible</0>."
 msgstr "Profil jest obecnie <0>widoczny</0>."
 
@@ -4392,12 +4985,16 @@ msgstr "Profil jest obecnie <0>widoczny</0>."
 msgid "Profile updated"
 msgstr "Profil zaktualizowano"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Progress"
+msgstr ""
+
 #: apps/remix/app/components/tables/templates-table.tsx
 #: apps/remix/app/components/general/template/template-type.tsx
 msgid "Public"
 msgstr "Publiczny"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -4409,10 +5006,6 @@ msgstr "Profil publiczny"
 msgid "Public profile URL"
 msgstr "Adres URL profilu publicznego"
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Public profile username"
-msgstr "Nazwa użytkownika profilu publicznego"
-
 #: apps/remix/app/components/tables/templates-table.tsx
 msgid "Public templates are connected to your public profile. Any modifications to public templates will also appear in your public profile."
 msgstr "Szablony publiczne są powiązane z Twoim publicznym profilem. Wszelkie modyfikacje szablonów publicznych również pojawią się w Twoim publicznym profilu."
@@ -4482,6 +5075,7 @@ msgstr "Ostatnia aktywność"
 msgid "Recent documents"
 msgstr "Ostatnie dokumenty"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
@@ -4562,6 +5156,7 @@ msgstr "Odrzuć dokument"
 #: apps/remix/app/components/general/stack-avatars-with-tooltip.tsx
 #: apps/remix/app/components/general/document/document-status.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/document.ts
 msgid "Rejected"
 msgstr "Odrzucony"
@@ -4596,43 +5191,47 @@ msgstr "Przypomnienie: Proszę {recipientActionVerb} ten dokument"
 msgid "Reminder: Please {recipientActionVerb} your document"
 msgstr "Przypomnienie: Proszę {recipientActionVerb} Twój dokument"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-field-container.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: packages/ui/primitives/document-flow/field-item.tsx
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "Remove"
 msgstr "Usuń"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
+msgid "Remove organisation group"
+msgstr ""
+
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+msgid "Remove organisation member"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 msgid "Remove team email"
 msgstr "Usuń e-mail zespołu"
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "Remove team member"
 msgstr "Usuń użytkownika"
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Renews: {formattedDate}"
-msgstr "Odnawia się: {formattedDate}"
-
 #: apps/remix/app/components/forms/reset-password.tsx
 #: apps/remix/app/components/forms/password.tsx
 msgid "Repeat Password"
 msgstr "Potwierdź hasło"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Request transfer"
-msgstr "Zleć przeniesienie"
-
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/text-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx
@@ -4645,7 +5244,7 @@ msgstr "Wymagane pole"
 msgid "Reseal document"
 msgstr "Zapieczętuj ponownie dokument"
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Resend"
@@ -4661,6 +5260,7 @@ msgstr "Wyślij ponownie weryfikację"
 
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 msgid "Reset"
 msgstr "Resetuj"
 
@@ -4679,11 +5279,11 @@ msgstr "Zresetuj hasło"
 msgid "Resetting Password..."
 msgstr "Resetowanie hasła..."
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Resolve"
 msgstr "Rozwiąż"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Resolve payment"
 msgstr "Rozwiąż płatność"
 
@@ -4691,6 +5291,10 @@ msgstr "Rozwiąż płatność"
 msgid "Rest assured, your document is strictly confidential and will never be shared. Only your signing experience will be highlighted. Share your personalized signing card to showcase your signature!"
 msgstr "Możesz być spokojny, Twój dokument jest ściśle poufny i nigdy nie zostanie udostępniony. Tylko Twoje doświadczenie podpisywania będzie wyróżnione. Podziel się swoją spersonalizowaną kartą podpisu, aby zaprezentować swój podpis!"
 
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
+msgid "Restricted Access"
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Retention of Documents"
 msgstr "Przechowywanie dokumentów"
@@ -4701,16 +5305,12 @@ msgstr "Spróbuj ponownie"
 
 #: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Return"
 msgstr "Zwróć"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "Return to Dashboard"
-msgstr "Powrót do pulpitu"
-
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "Return to Home"
 msgstr "Powrót do strony głównej"
 
@@ -4727,13 +5327,17 @@ msgstr "Cofnij"
 msgid "Revoke access"
 msgstr "Cofnij dostęp"
 
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-groups-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
 msgid "Role"
 msgstr "Rola"
 
@@ -4764,13 +5368,23 @@ msgstr "Zapisz"
 msgid "Save Template"
 msgstr "Zapisz szablon"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.members.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
-#: apps/remix/app/components/tables/user-settings-teams-page-table.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
 #: apps/remix/app/components/tables/documents-table-sender-filter.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 msgid "Search"
 msgstr "Szukaj"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Search and manage all organisations"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Search by claim ID or name"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 msgid "Search by document title"
 msgstr "Szukaj tytułu dokumentu"
@@ -4780,6 +5394,10 @@ msgstr "Szukaj tytułu dokumentu"
 msgid "Search by name or email"
 msgstr "Szukaj nazwy lub adresu e-mail"
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations._index.tsx
+msgid "Search by organisation ID, name, customer ID or owner email"
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-search.tsx
 msgid "Search documents..."
 msgstr "Szukaj dokumentów..."
@@ -4788,7 +5406,6 @@ msgstr "Szukaj dokumentów..."
 msgid "Search languages..."
 msgstr "Szukaj języków..."
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Secret"
 msgstr "Sekret"
@@ -4813,18 +5430,17 @@ msgstr "Wybierz"
 msgid "Select a folder to move this document to."
 msgstr "Wybierz folder, do którego chcesz przenieść ten dokument."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Select a team"
-msgstr "Wybierz drużynę"
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Select a plan"
+msgstr ""
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "Select a team to move this document to. This action cannot be undone."
-msgstr "Wybierz drużynę, do której chcesz przenieść ten dokument. Ta akcja nie może być cofnięta."
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Select a plan to continue"
+msgstr ""
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Select a team to move this template to. This action cannot be undone."
-msgstr "Wybierz drużynę, do której chcesz przenieść ten szablon. Ta akcja nie może być cofnięta."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Select a team to view its dashboard"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Select a template you'd like to display on your public profile"
@@ -4834,22 +5450,70 @@ msgstr "Wybierz szablon, który chcesz wyświetlić w profilu publicznym"
 msgid "Select a template you'd like to display on your team's public profile"
 msgstr "Wybierz szablon, który chcesz wyświetlić w profilu publicznym zespołu"
 
+#: packages/ui/components/document/document-global-auth-access-select.tsx
+msgid "Select access methods"
+msgstr ""
+
 #: packages/ui/primitives/combobox.tsx
 msgid "Select an option"
 msgstr "Wybierz opcję"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+msgid "Select an organisation to view teams"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
 msgid "Select at least"
 msgstr "Wybierz co najmniej"
 
+#: packages/ui/components/recipient/recipient-action-auth-select.tsx
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "Select authentication methods"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-items-advanced-settings/dropdown-field.tsx
 msgid "Select default option"
 msgstr "Wybierz domyślną opcję"
 
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select groups"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select groups to add to this team"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Select members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Select members or groups of members to add to the team."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+msgid "Select members to add to this team"
+msgstr ""
+
 #: apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx
 msgid "Select passkey"
 msgstr "Wybierz klucz uwierzytelniający"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Select signature types"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "Select the members to add to this group"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Select the members to include in this group"
+msgstr ""
+
 #: apps/remix/app/components/general/webhook-multiselect-combobox.tsx
 #: apps/remix/app/components/general/webhook-multiselect-combobox.tsx
 msgid "Select triggers"
@@ -4898,7 +5562,7 @@ msgstr "Wyślij dokumenty w imieniu zespołu, używając adresu e-mail"
 msgid "Send documents to recipients immediately"
 msgstr "Wyślij dokumenty do odbiorców natychmiast"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
 msgid "Send on Behalf of Team"
 msgstr "Wyślij w imieniu zespołu"
 
@@ -4918,6 +5582,7 @@ msgstr "Wyślij e-mail z prośbą o podpisanie przez odbiorcę"
 msgid "Send reminder"
 msgstr "Wyślij przypomnienie"
 
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 msgid "Sender"
 msgstr "Nadawca"
@@ -4947,7 +5612,10 @@ msgstr "Skonfiguruj właściwości dokumentu i informacje o odbiorcach"
 msgid "Set up your template properties and recipient information"
 msgstr "Skonfiguruj właściwości szablonu i informacje o odbiorcach"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
 #: apps/remix/app/routes/_authenticated+/settings+/_layout.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
+#: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -4980,7 +5648,7 @@ msgstr "Udostępnij link"
 msgid "Share your signing experience!"
 msgstr "Podziel się swoim doświadczeniem podpisywania!"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Show"
 msgstr "Pokaż"
 
@@ -4993,15 +5661,12 @@ msgstr "Pokaż dodatkowe informacje"
 msgid "Show advanced settings"
 msgstr "Pokaż ustawienia zaawansowane"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Show templates in your public profile for your audience to sign and get started quickly"
 msgstr "Pokaż szablony w profilu publicznym, aby szybko podpisać dokument"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Show templates in your team public profile for your audience to sign and get started quickly"
-msgstr "Pokaż szablony w profilu publicznym zespołu, aby szybko podpisać dokument"
-
 #: apps/remix/app/routes/_profile+/p.$url.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/user-profile-timur.tsx
@@ -5010,6 +5675,7 @@ msgstr "Pokaż szablony w profilu publicznym zespołu, aby szybko podpisać doku
 #: apps/remix/app/components/general/document-signing/document-signing-name-field.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auto-sign.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 #: apps/remix/app/components/general/document/document-page-view-button.tsx
 #: packages/lib/constants/recipient-roles.ts
@@ -5030,6 +5696,7 @@ msgstr "Podpisz jako<0>{0} <1>({1})</1></0>"
 
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Sign document"
 msgstr "Podpisz dokument"
 
@@ -5038,6 +5705,11 @@ msgstr "Podpisz dokument"
 msgid "Sign Document"
 msgstr "Podpisz dokument"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Sign Documents"
+msgstr ""
+
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 msgid "Sign field"
 msgstr "Pole podpisu"
@@ -5053,9 +5725,11 @@ msgid "Sign In"
 msgstr "Zaloguj się"
 
 #: apps/remix/app/routes/_unauthenticated+/signin.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
 msgid "Sign in to your account"
 msgstr "Zaloguj się na swoje konto"
 
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 #: apps/remix/app/components/general/menu-switcher.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 msgid "Sign Out"
@@ -5063,6 +5737,7 @@ msgstr "Wyloguj"
 
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 msgid "Sign the document to complete the process."
 msgstr "Podpisz dokument, aby zakończyć proces."
 
@@ -5086,6 +5761,7 @@ msgstr "Zarejestruj się za pomocą OIDC"
 #: apps/remix/app/components/forms/profile.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx
 #: packages/ui/primitives/template-flow/add-template-fields.tsx
 #: packages/ui/primitives/document-flow/types.ts
 #: packages/ui/primitives/document-flow/add-fields.tsx
@@ -5208,24 +5884,25 @@ msgstr "Niektórzy sygnatariusze nie zostali przypisani do pola podpisu. Przypis
 
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
 #: apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/share-document-download-button.tsx
-#: apps/remix/app/components/general/billing-portal-button.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-page.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-account.tsx
 #: apps/remix/app/components/general/document/document-page-view-dropdown.tsx
@@ -5235,7 +5912,6 @@ msgstr "Niektórzy sygnatariusze nie zostali przypisani do pola podpisu. Przypis
 #: apps/remix/app/components/general/document/document-audit-log-download-button.tsx
 #: apps/remix/app/components/general/direct-template/direct-template-signing-auth-page.tsx
 #: apps/remix/app/components/general/direct-template/direct-template-page.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
 #: apps/remix/app/components/embed/embed-document-signing-page.tsx
 #: apps/remix/app/components/embed/embed-direct-template-client-page.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
@@ -5243,11 +5919,11 @@ msgstr "Niektórzy sygnatariusze nie zostali przypisani do pola podpisu. Przypis
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/template-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 #: apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
@@ -5255,11 +5931,6 @@ msgstr "Niektórzy sygnatariusze nie zostali przypisani do pola podpisu. Przypis
 msgid "Something went wrong"
 msgstr "Coś poszło nie tak"
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Something went wrong while attempting to transfer the ownership of team <0>{0}</0> to your. Please try again later or contact support."
-msgstr "Coś poszło nie tak podczas próby przeniesienia własności zespołu <0>{0}</0> do Ciebie. Proszę spróbować ponownie później lub skontaktować się z pomocą techniczną."
-
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "Something went wrong while attempting to verify your email address for <0>{0}</0>. Please try again later."
@@ -5282,7 +5953,8 @@ msgstr "Coś poszło nie tak podczas wysyłania e-maila potwierdzającego."
 msgid "Something went wrong while updating the team billing subscription, please contact support."
 msgstr "Coś poszło nie tak podczas aktualizacji subskrypcji płatniczej zespołu, prosimy o kontakt z pomocą techniczną."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Something went wrong!"
 msgstr "Coś poszło nie tak!"
 
@@ -5307,6 +5979,7 @@ msgstr "Nie mogliśmy pobrać dzienniku logów. Spróbuj ponownie później."
 msgid "Sorry, we were unable to download the certificate. Please try again later."
 msgstr "Przepraszamy, nie mogliśmy pobrać certyfikatu. Proszę spróbować ponownie później."
 
+#: apps/remix/app/components/tables/team-members-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Source"
 msgstr "Źródło"
@@ -5316,10 +5989,11 @@ msgid "Stats"
 msgstr "Statystyki"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 msgid "Status"
 msgstr "Stan"
@@ -5328,48 +6002,78 @@ msgstr "Stan"
 msgid "Step <0>{step} of {maxStep}</0>"
 msgstr "Krok <0>{step} z {maxStep}</0>"
 
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "Stripe"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Stripe customer created successfully"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Stripe Customer ID"
+msgstr ""
+
 #: apps/remix/app/components/embed/authoring/configure-document-advanced-settings.tsx
 #: packages/ui/primitives/template-flow/add-template-settings.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Subject <0>(Optional)</0>"
 msgstr "Temat <0>(Opcjonalnie)</0>"
 
+#: apps/remix/app/components/general/billing-plans.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
 msgid "Subscribe"
 msgstr "Subskrybuj"
 
-#: apps/remix/app/components/tables/admin-dashboard-users-table.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
 msgid "Subscription"
 msgstr "Subskrypcja"
 
-#: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
-msgid "Subscriptions"
-msgstr "Subskrypcje"
+#: apps/remix/app/components/dialogs/claim-create-dialog.tsx
+msgid "Subscription claim created successfully."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "Subscription claim deleted successfully."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Subscription claim updated successfully."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/claims.tsx
+msgid "Subscription Claims"
+msgstr ""
 
 #: apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx
 #: apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 #: apps/remix/app/components/general/verify-email-banner.tsx
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-#: apps/remix/app/components/general/teams/team-invitations.tsx
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 #: apps/remix/app/components/general/teams/team-email-dropdown.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 #: apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
@@ -5378,6 +6082,15 @@ msgstr "Subskrypcje"
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
 msgid "Success"
 msgstr "Sukces"
 
@@ -5401,8 +6114,9 @@ msgstr "Wymagania systemowe"
 msgid "System Theme"
 msgstr "Motyw systemowy"
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table.tsx
-#: apps/remix/app/components/tables/user-settings-current-teams-table.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/tables/organisation-teams-table.tsx
 msgid "Team"
 msgstr "Zespół"
 
@@ -5411,9 +6125,18 @@ msgstr "Zespół"
 msgid "Team \"{0}\" has been deleted on Documenso"
 msgstr "Zespół \"{0}\" został usunięty z Documenso"
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "Team checkout"
-msgstr "Zakupy zespołowe"
+#: packages/lib/constants/teams-translations.ts
+msgid "Team Admin"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Team Assignments"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/components/forms/subscription-claim-form.tsx
+msgid "Team Count"
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
@@ -5457,25 +6180,34 @@ msgstr "E-mail zespołu zweryfikowany!"
 msgid "Team email was updated."
 msgstr "E-mail zespołu został zaktualizowany."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "Team invitation"
-msgstr "Zaproszenie do zespołu"
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.groups.tsx
+msgid "Team Groups"
+msgstr ""
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "Team invitations have been sent."
-msgstr "Zaproszenia do zespołu zostały wysłane."
+#: packages/lib/constants/teams-translations.ts
+msgid "Team Manager"
+msgstr ""
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: packages/lib/constants/teams-translations.ts
 msgid "Team Member"
 msgstr "Użytkownik zespołu"
 
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.members.tsx
+msgid "Team Members"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Team members have been added."
+msgstr ""
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Team Name"
 msgstr "Nazwa zespołu"
 
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "Team not found"
 msgstr "Nie znaleziono zespołu"
@@ -5488,27 +6220,17 @@ msgstr "Tylko dla zespołu"
 msgid "Team only templates are not linked anywhere and are visible only to your team."
 msgstr "Szablony tylko dla zespołu nie są nigdzie linkowane i są widoczne tylko dla Twojego zespołu."
 
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transfer"
-msgstr "Przeniesienie własności zespołu"
-
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transfer already completed!"
-msgstr "Transfer własności zespołu został już zakończony!"
-
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "Team ownership transferred!"
-msgstr "Własność zespołu przeniesiona!"
-
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Team Preferences"
 msgstr "Preferencje zespołu"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Team Public Profile"
-msgstr "Profil publiczny zespołu"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Team Role"
+msgstr ""
 
-#: apps/remix/app/components/general/menu-switcher.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 msgid "Team settings"
 msgstr "Ustawienia zespołu"
 
@@ -5516,44 +6238,37 @@ msgstr "Ustawienia zespołu"
 msgid "Team Settings"
 msgstr "Ustawienia zespołu"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "Team templates"
-msgstr "Szablony zespołu"
-
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "Team transfer in progress"
-msgstr "Przeniesienie zespołu w toku"
-
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "Team transfer request expired"
-msgstr "Żądanie przeniesienia zespołu wygasło"
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "Team url"
+msgstr ""
 
 #: apps/remix/app/components/forms/team-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Team URL"
 msgstr "Adres URL zespołu"
 
-#: apps/remix/app/routes/_authenticated+/settings+/teams.tsx
-#: apps/remix/app/components/general/settings-nav-mobile.tsx
-#: apps/remix/app/components/general/settings-nav-desktop.tsx
-#: apps/remix/app/components/general/menu-switcher.tsx
-#: apps/remix/app/components/general/app-nav-mobile.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.teams.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+#: apps/remix/app/components/general/org-menu-switcher.tsx
 msgid "Teams"
 msgstr "Zespoły"
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-msgid "Teams restricted"
-msgstr "Zespoły ograniczone"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "Teams help you organise your work and collaborate with others. Create your first team to get started."
+msgstr ""
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id.edit.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "Teams that this organisation group is currently assigned to"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id.edit.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
 msgid "Template"
 msgstr "Szablon"
 
@@ -5586,14 +6301,9 @@ msgid "Template is using legacy field insertion"
 msgstr "Szablon używa starej metody wstawiania pól"
 
 #: apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
 msgid "Template moved"
 msgstr "Szablon przeniesiony"
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "Template not found or already associated with a team."
-msgstr "Szablon nie znaleziony lub już powiązany z zespołem."
-
 #: apps/remix/app/components/general/template/template-edit-form.tsx
 msgid "Template saved"
 msgstr "Szablon zapisany"
@@ -5606,10 +6316,10 @@ msgstr "Tytuł szablonu"
 msgid "Template updated successfully"
 msgstr "Szablon zaktualizowany pomyślnie"
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 #: apps/remix/app/components/general/app-nav-mobile.tsx
 #: apps/remix/app/components/general/app-nav-desktop.tsx
 #: apps/remix/app/components/general/app-command-menu.tsx
@@ -5641,6 +6351,10 @@ msgstr "Wyrównanie tekstu"
 msgid "Text Color"
 msgstr "Kolor tekstu"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "Thank you for completing the signing process."
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Thank you for using Documenso to perform your electronic document signing. The purpose of this disclosure is to inform you about the process, legality, and your rights regarding the use of electronic signatures on our platform. By opting to use an electronic signature, you are agreeing to the terms and conditions outlined below."
 msgstr "Dziękujemy za korzystanie z Documenso do wykonywania podpisu elektronicznego dokumentu. Celem tego ujawnienia jest poinformowanie Cię o procesie, legalności oraz Twoich prawach dotyczących korzystania z podpisów elektronicznych na naszej platformie. Decydując się na korzystanie z podpisu elektronicznego, zgadzasz się na warunki opisane poniżej."
@@ -5662,16 +6376,16 @@ msgid "The account has been enabled successfully."
 msgstr "Konto zostało pomyślnie włączone."
 
 #: packages/ui/components/recipient/recipient-action-auth-select.tsx
-msgid "The authentication required for recipients to sign fields"
-msgstr "Uwierzytelnianie wymagane dla odbiorców do podpisania pól"
+msgid "The authentication methods required for recipients to sign fields"
+msgstr ""
 
 #: packages/ui/components/document/document-global-auth-action-select.tsx
-msgid "The authentication required for recipients to sign the signature field."
-msgstr "Uwierzytelnianie wymagane dla odbiorców do podpisania pola podpisu."
+msgid "The authentication methods required for recipients to sign the signature field."
+msgstr ""
 
 #: packages/ui/components/document/document-global-auth-access-select.tsx
-msgid "The authentication required for recipients to view the document."
-msgstr "Uwierzytelnianie wymagane dla odbiorców do wyświetlenia dokumentu."
+msgid "The authentication methods required for recipients to view the document."
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx
 msgid "The content to show in the banner, HTML is allowed"
@@ -5687,10 +6401,6 @@ msgstr "Bezpośredni link został skopiowany do schowka"
 msgid "The document has been moved successfully."
 msgstr "Dokument został pomyślnie przeniesiony."
 
-#: apps/remix/app/components/dialogs/document-move-dialog.tsx
-msgid "The document has been successfully moved to the selected team."
-msgstr "Dokument został pomyślnie przeniesiony do wybranego zespołu."
-
 #: apps/remix/app/components/embed/authoring/configure-document-upload.tsx
 msgid "The document is already saved and cannot be changed."
 msgstr "Dokument jest już zapisany i nie można go zmienić."
@@ -5760,17 +6470,30 @@ msgid "The following errors occurred:"
 msgstr "Wystąpiły następujące błędy:"
 
 #: packages/email/templates/team-delete.tsx
-msgid "The following team has been deleted by its owner. You will no longer be able to access this team and its documents"
-msgstr "Następujący zespół został usunięty przez jego właściciela. Nie będziesz mógł już uzyskać dostępu do tego zespołu i jego dokumentów"
+msgid "The following team has been deleted. You will no longer be able to access this team and its documents"
+msgstr ""
 
-#: packages/email/templates/team-delete.tsx
-msgid "The following team has been deleted by you"
-msgstr "Następujący zespół został usunięty przez Ciebie"
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid ""
+"The organisation group you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "The ownership of team <0>{0}</0> has been successfully transferred to you."
-msgstr "Własność zespołu <0>{0}</0> została pomyślnie przeniesiona na Ciebie."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "The organisation role that will be applied to all members in this group."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid ""
+"The organisation you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid ""
+"The organisation you are looking for may have been removed, renamed or may have never\n"
+"                  existed."
+msgstr ""
 
 #: apps/remix/app/components/general/generic-error-layout.tsx
 msgid "The page you are looking for was moved, removed, renamed or might never have existed."
@@ -5820,10 +6543,6 @@ msgstr "Odbiorca musi podpisać dokument, aby mógł być zakończony."
 msgid "The recipient is required to view the document for it to be completed."
 msgstr "Odbiorca musi wyświetlić dokument, aby mógł być zakończony."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "The selected team member will receive an email which they must accept before the team is transferred"
-msgstr "Wybrany członek zespołu otrzyma e-mail, który musi zaakceptować przed przeniesieniem zespołu"
-
 #: packages/ui/components/document/document-share-button.tsx
 msgid "The sharing link could not be created at this time. Please try again."
 msgstr "Nie udało się utworzyć linku udostępnienia w tym czasie. Proszę spróbować ponownie."
@@ -5855,14 +6574,11 @@ msgstr "Baner strony to wiadomość, która jest wyświetlana u góry strony. Mo
 msgid "The team email <0>{teamEmail}</0> has been removed from the following team"
 msgstr "Email zespołowy <0>{teamEmail}</0> został usunięty z następującego zespołu"
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "The team transfer invitation has been successfully deleted."
-msgstr "Zaproszenie do przeniesienia zespołu zostało pomyślnie usunięte."
-
-#. placeholder {0}: transferVerification.name
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "The team transfer request to <0>{0}</0> has expired."
-msgstr "Prośba o przeniesienie zespołu do <0>{0}</0> wygasła."
+#: apps/remix/app/routes/_authenticated+/_layout.tsx
+msgid ""
+"The team you are looking for may have been removed, renamed or may have never\n"
+"                  existed."
+msgstr ""
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/_layout.tsx
 msgid "The team you are looking for may have been removed, renamed or may have never\n"
@@ -5873,10 +6589,6 @@ msgstr "Zespół, którego szukasz, mógł zostać usunięty, zmieniony na, albo
 msgid "The template has been moved successfully."
 msgstr "Szablon został pomyślnie przeniesiony."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "The template has been successfully moved to the selected team."
-msgstr "Szablon został pomyślnie przeniesiony do wybranego zespołu."
-
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "The template will be removed from your profile"
 msgstr "Szablon zostanie usunięty z Twojego profilu"
@@ -5902,17 +6614,21 @@ msgid "The types of signatures that recipients are allowed to use when signing t
 msgstr "Rodzaje podpisów, jakie odbiorcy mogą używać przy podpisywaniu dokumentu."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "The URL for Documenso to send webhook events to."
 msgstr "URL dla Documenso do wysyłania zdarzeń webhook."
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid ""
+"The user you are looking for may have been removed, renamed or may have never\n"
+"                    existed."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 msgid "The webhook has been successfully deleted."
 msgstr "Webhook został pomyślnie usunięty."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "The webhook has been updated successfully."
 msgstr "Webhook został pomyślnie zaktualizowany."
 
@@ -5932,6 +6648,14 @@ msgstr "Brak zakończonych dokumentów. Utworzone lub odebrane dokumentu pojawi
 msgid "There was an error uploading your file. Please try again."
 msgstr "Wystąpił błąd podczas przesyłania pliku. Proszę spróbować ponownie."
 
+#: packages/ui/components/document/document-global-auth-action-select.tsx
+msgid "These can be overriden by setting the authentication requirements directly on each recipient in the next step. Multiple methods can be selected."
+msgstr ""
+
+#: packages/ui/components/recipient/recipient-action-auth-select.tsx
+msgid "These will override any global settings. Multiple methods can be selected."
+msgstr ""
+
 #: apps/remix/app/components/general/teams/team-email-usage.tsx
 msgid "They have permission on your behalf to:"
 msgstr "Mają pozwolenie w Twoim imieniu na:"
@@ -5954,9 +6678,9 @@ msgstr "Ta akcja nie jest odwracalna. Proszę być pewnym."
 msgid "This action is reversible, but please be careful as the account may be affected permanently (e.g. their settings and contents not being restored properly)."
 msgstr "Ta akcja jest odwracalna, ale proszę być ostrożnym, ponieważ konto może zostać trwałe uszkodzone (np. ich ustawienia i zawartość mogą nie zostać prawidłowo przywrócone)."
 
-#: packages/ui/components/document/document-global-auth-action-select.tsx
-msgid "This can be overriden by setting the authentication requirements directly on each recipient in the next step."
-msgstr "To można nadpisać, ustawiając wymagania dotyczące uwierzytelniania bezpośrednio na każdym odbiorcy w następnym kroku."
+#: apps/remix/app/components/dialogs/claim-delete-dialog.tsx
+msgid "This claim is locked and cannot be deleted."
+msgstr ""
 
 #: packages/email/template-components/template-document-super-delete.tsx
 msgid "This document can not be recovered, if you would like to dispute the reason for future documents please contact support."
@@ -5990,13 +6714,11 @@ msgstr "Ten dokument został anulowany przez właściciela i nie jest już dost
 msgid "This document has been cancelled by the owner."
 msgstr "Ten dokument został anulowany przez właściciela."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document has been rejected by a recipient"
 msgstr "Dokument został odrzucony przez odbiorcę"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document has been signed by all recipients"
 msgstr "Ten dokument został podpisany przez wszystkich odbiorców"
 
@@ -6004,8 +6726,7 @@ msgstr "Ten dokument został podpisany przez wszystkich odbiorców"
 msgid "This document is available in your Documenso account. You can view more details, recipients, and audit logs there."
 msgstr "Ten dokument jest dostępny na Twoim koncie w Documenso. Możesz tam zobaczyć więcej szczegółów, odbiorców i dzienniki audytów."
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx
 msgid "This document is currently a draft and has not been sent"
 msgstr "Ten dokument jest obecnie szkicowany i nie został wysłany"
 
@@ -6062,14 +6783,22 @@ msgstr "Nazwa tego folderu jest już zajęta."
 msgid "This is how the document will reach the recipients once the document is ready for signing."
 msgstr "W ten sposób dokument dotrze do odbiorców, gdy tylko dokument będzie gotowy do podpisania."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "This is the claim that this organisation was initially created with. Any feature flag changes to this claim will be backported into this organisation."
+msgstr ""
+
 #: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "This link is invalid or has expired. Please contact your team to resend a transfer request."
-msgstr "Ten link jest nieprawidłowy lub wygasł. Proszę skontaktować się ze swoim zespołem, aby ponownie wysłać prośbę o transfer."
+msgid "This link is invalid or has expired."
+msgstr ""
 
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "This link is invalid or has expired. Please contact your team to resend a verification."
 msgstr "Ten link jest nieprawidłowy lub wygasł. Proszę skontaktować się ze swoim zespołem, aby ponownie wysłać weryfikację."
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.general.tsx
+msgid "This organisation, and any associated data will be permanently deleted."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "This passkey has already been registered."
 msgstr "Ten klucz dostępu został już zarejestrowany."
@@ -6078,10 +6807,6 @@ msgstr "Ten klucz dostępu został już zarejestrowany."
 msgid "This passkey is not configured for this application. Please login and add one in the user settings."
 msgstr "Ten klucz dostępu nie jest skonfigurowany dla tej aplikacji. Proszę zalogować się i dodać jeden w ustawieniach użytkownika."
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "This price includes minimum 5 seats."
-msgstr "Ta cena obejmuje co najmniej 5 miejsc."
-
 #: packages/ui/primitives/document-flow/add-fields.tsx
 msgid "This recipient can no longer be modified as they have signed a field, or completed the document."
 msgstr "Ten odbiorca nie może być już modyfikowany, ponieważ podpisał pole lub ukończył dokument."
@@ -6106,23 +6831,20 @@ msgstr "Ten szablon nie mógł zostać usunięty w tej chwili. Proszę spróbowa
 msgid "This template is using legacy field insertion, we recommend using the new field insertion method for more accurate results."
 msgstr "Ten szablon używa starej metody wstawiania pola, zalecamy nową metodę dla lepszych rezultatów."
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
 msgid "This token is invalid or has expired. No action is needed."
 msgstr "Ten token jest nieprawidłowy lub wygasł. Nie wymaga żadnej akcji."
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "This token is invalid or has expired. Please contact your team for a new invitation."
 msgstr "Ten token jest nieprawidłowy lub wygasł. Proszę skontaktować się ze swoim zespołem o nowe zaproszenie."
 
 #: apps/remix/app/components/forms/team-update-form.tsx
+#: apps/remix/app/components/forms/organisation-update-form.tsx
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "This URL is already in use."
 msgstr "Ten URL jest już używany."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "This username has already been taken"
-msgstr "Ta nazwa użytkownika została już zajęta"
-
 #: packages/ui/components/document/document-email-checkboxes.tsx
 msgid "This will be sent to all recipients if a pending document has been deleted."
 msgstr "To zostanie wysłane do wszystkich odbiorców, jeśli oczekujący dokument został usunięty."
@@ -6135,17 +6857,16 @@ msgstr "To zostanie wysłane do wszystkich odbiorców, gdy dokument będzie cał
 msgid "This will be sent to the document owner once the document has been fully completed."
 msgstr "To zostanie wysłane do właściciela dokumentu, gdy dokument zostanie w pełni ukończony."
 
-#: packages/ui/components/recipient/recipient-action-auth-select.tsx
-msgid "This will override any global settings."
-msgstr "To zastąpi wszystkie globalne ustawienia."
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "This will ONLY backport feature flags which are set to true, anything disabled in the initial claim will not be backported"
+msgstr ""
 
 #: apps/remix/app/components/tables/internal-audit-log-table.tsx
 #: apps/remix/app/components/tables/document-logs-table.tsx
 msgid "Time"
 msgstr "Czas"
 
-#: apps/remix/app/routes/_authenticated+/documents.f.$folderId.$id.logs.tsx
-#: apps/remix/app/routes/_authenticated+/documents.$id.logs.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx
 msgid "Time zone"
 msgstr "Strefa czasowa"
 
@@ -6158,6 +6879,7 @@ msgstr "Strefa czasowa"
 
 #: apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx
 #: apps/remix/app/components/tables/templates-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table.tsx
 #: apps/remix/app/components/general/template/template-page-view-documents-table.tsx
 #: apps/remix/app/components/embed/authoring/configure-document-view.tsx
@@ -6169,7 +6891,7 @@ msgstr "Tytuł"
 msgid "Title cannot be empty"
 msgstr "Tytuł nie może być pusty"
 
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
 msgid "To accept this invitation you must create an account."
 msgstr "Aby zaakceptować to zaproszenie, musisz założyć konto."
 
@@ -6190,10 +6912,6 @@ msgstr "Aby potwierdzić, proszę wpisać adres e-mail konta <0/>({0})."
 msgid "To confirm, please enter the reason"
 msgstr "Aby potwierdzić, proszę wpisać powód"
 
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "To decline this invitation you must create an account."
-msgstr "Aby odrzucić to zaproszenie, musisz założyć konto."
-
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "To enable two-factor authentication, scan the following QR code using your authenticator app."
 msgstr "Aby włączyć uwierzytelnianie dwuetapowe, zeskanuj poniższy kod QR za pomocą swojej aplikacji uwierzytelniającej."
@@ -6222,11 +6940,11 @@ msgstr "Aby skorzystać z naszej usługi podpisu elektronicznego, musisz mieć d
 msgid "To view this document you need to be signed into your account, please sign in to continue."
 msgstr "Aby zobaczyć ten dokument, musisz być zalogowany na swoje konto, proszę zaloguj się, aby kontynuować."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Toggle the switch to hide your profile from the public."
 msgstr "Przełącz przełącznik, aby ukryć swój profil przed publicznością."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "Toggle the switch to show your profile to the public."
 msgstr "Przełącz przełącznik, aby pokazać swój profil publicznie."
 
@@ -6246,7 +6964,7 @@ msgstr "Token został utworzony"
 msgid "Token deleted"
 msgstr "Token usunięty"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Token doesn't have an expiration date"
 msgstr "Token nie ma daty wygaśnięcia"
 
@@ -6282,26 +7000,7 @@ msgstr "Łączna liczba podpisujących, którzy się zarejestrowali"
 msgid "Total Users"
 msgstr "Łączna liczba użytkowników"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "transfer {teamName}"
-msgstr "przenieś {teamName}"
-
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Transfer ownership of this team to a selected team member."
-msgstr "Przenieś własność tego zespołu na wybranego członka zespołu."
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "Transfer team"
-msgstr "Przenieś zespół"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._index.tsx
-msgid "Transfer the ownership of the team to another team member."
-msgstr "Przenieś własność zespołu na innego członka zespołu."
-
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Triggers"
 msgstr "Wyzwalacze"
@@ -6368,11 +7067,11 @@ msgstr "Nie można skopiować tokena"
 msgid "Unable to create direct template access. Please try again later."
 msgstr "Nie można utworzyć bezpośredniego dostępu do szablonu. Proszę spróbować ponownie później."
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Unable to decline this team invitation at this time."
-msgstr "Nie można w tej chwili odrzucić zaproszenia do zespołu."
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Unable to decline this invitation at this time."
+msgstr ""
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Unable to delete invitation. Please try again."
 msgstr "Nie można usunąć zaproszenia. Proszę spróbować ponownie."
 
@@ -6384,9 +7083,9 @@ msgstr "Nie można usunąć zespołu"
 msgid "Unable to disable two-factor authentication"
 msgstr "Nie można wyłączyć uwierzytelniania dwuetapowego"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
-msgid "Unable to join this team at this time."
-msgstr "Nie można dołączyć do tego zespołu w tej chwili."
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
+msgid "Unable to join this organisation at this time."
+msgstr ""
 
 #: apps/remix/app/components/general/document/document-page-view-recent-activity.tsx
 #: apps/remix/app/components/general/document/document-history-sheet.tsx
@@ -6409,7 +7108,7 @@ msgstr "Nie można usunąć weryfikacji e-maila w tej chwili. Proszę spróbowa
 msgid "Unable to remove team email at this time. Please try again."
 msgstr "Nie można usunąć e-maila zespołu w tej chwili. Proszę spróbować ponownie."
 
-#: apps/remix/app/components/tables/team-settings-member-invites-table.tsx
+#: apps/remix/app/components/tables/organisation-member-invites-table.tsx
 msgid "Unable to resend invitation. Please try again."
 msgstr "Nie można ponownie wysłać zaproszenia. Proszę spróbować ponownie."
 
@@ -6431,7 +7130,10 @@ msgstr "Nie można skonfigurować uwierzytelniania dwuetapowego"
 msgid "Unable to sign in"
 msgstr "Nie można się zalogować"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 msgid "Unauthorized"
 msgstr "Nieautoryzowany"
@@ -6445,22 +7147,35 @@ msgstr "Niezakończony"
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
-msgid "Unpaid"
-msgstr "Nieopłacone"
+#: apps/remix/app/components/tables/admin-claims-table.tsx
+msgid "Unlimited"
+msgstr ""
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Unlimited documents, API and more"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "Untitled Group"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 #: apps/remix/app/components/tables/settings-public-profile-templates-table.tsx
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/tables/admin-claims-table.tsx
 #: apps/remix/app/components/forms/public-profile-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-email-update-dialog.tsx
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 #: packages/ui/primitives/document-flow/add-subject.tsx
 msgid "Update"
@@ -6470,10 +7185,31 @@ msgstr "Zaktualizuj"
 msgid "Update Banner"
 msgstr "Zaktualizuj baner"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+msgid "Update Billing"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Update Claim"
+msgstr ""
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Update current organisation"
+msgstr ""
+
 #: apps/remix/app/components/general/legacy-field-warning-popover.tsx
 msgid "Update Fields"
 msgstr "Zaktualizuj pola"
 
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Update organisation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "Update organisation member"
+msgstr ""
+
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "Update passkey"
 msgstr "Zaktualizuj klucz dostępu"
@@ -6492,10 +7228,16 @@ msgstr "Zaktualizuj profil"
 msgid "Update Recipient"
 msgstr "Zaktualizuj odbiorcę"
 
-#: apps/remix/app/components/tables/team-settings-members-table.tsx
+#: apps/remix/app/components/tables/team-members-table.tsx
+#: apps/remix/app/components/tables/team-groups-table.tsx
+#: apps/remix/app/components/tables/organisation-members-table.tsx
 msgid "Update role"
 msgstr "Zaktualizuj rolę"
 
+#: apps/remix/app/components/dialogs/claim-update-dialog.tsx
+msgid "Update Subscription Claim"
+msgstr ""
+
 #: apps/remix/app/components/forms/team-update-form.tsx
 msgid "Update team"
 msgstr "Zaktualizuj zespół"
@@ -6505,6 +7247,11 @@ msgstr "Zaktualizuj zespół"
 msgid "Update team email"
 msgstr "Zaktualizuj e-mail zespołu"
 
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "Update team group"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 msgid "Update team member"
@@ -6519,7 +7266,6 @@ msgid "Update user"
 msgstr "Zaktualizuj użytkownika"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Update webhook"
 msgstr "Zaktualizuj webhook"
 
@@ -6536,6 +7282,11 @@ msgstr "Aktualizacja Twoich informacji"
 msgid "Upgrade"
 msgstr "Ulepsz"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "Upgrade <0>{0}</0> to {planName}"
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
 msgid "Upgrade your plan to upload more documents"
 msgstr "Zaktualizuj swój plan, aby przesłać więcej dokumentów"
@@ -6583,7 +7334,7 @@ msgstr "Prześlij podpis"
 msgid "Upload Template Document"
 msgstr "Prześlij dokument szablonu"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Upload your brand logo (max 5MB, JPG, PNG, or WebP)"
 msgstr "Prześlij logo swojej marki (maks. 5MB, JPG, PNG lub WebP)"
 
@@ -6608,8 +7359,7 @@ msgstr "Przesłany plik nie jest dozwolonym typem pliku"
 msgid "Uploading document..."
 msgstr "Przesyłanie dokumentu..."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId.$id._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx
 msgid "Use"
 msgstr "Użyj"
 
@@ -6627,6 +7377,10 @@ msgstr "Użyj kodu zapasowego"
 msgid "Use Template"
 msgstr "Użyj szablonu"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-dialog.tsx
+msgid "Use your passkey for authentication"
+msgstr ""
+
 #: apps/remix/app/components/tables/internal-audit-log-table.tsx
 #: apps/remix/app/components/tables/document-logs-table.tsx
 msgid "User"
@@ -6636,9 +7390,9 @@ msgstr "Użytkownik"
 msgid "User has no password."
 msgstr "Użytkownik nie ma hasła."
 
-#: apps/remix/app/routes/_authenticated+/admin+/subscriptions.tsx
-msgid "User ID"
-msgstr "ID użytkownika"
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "User not found"
+msgstr ""
 
 #: apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx
 #: apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx
@@ -6646,6 +7400,10 @@ msgstr "ID użytkownika"
 msgid "User not found."
 msgstr "Nie znaleziono użytkownika."
 
+#: apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx
+msgid "User Organisations"
+msgstr ""
+
 #: apps/remix/app/components/forms/signup.tsx
 msgid "User profiles are here!"
 msgstr "Profile użytkowników są tutaj!"
@@ -6658,10 +7416,6 @@ msgstr "Ustawienia użytkownika"
 msgid "User with this email already exists. Please use a different email address."
 msgstr "Użytkownik z tym adresem e-mail już istnieje. Proszę użyć innego adresu e-mail."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "Username can only container alphanumeric characters and dashes."
-msgstr "Nazwa użytkownika może zawierać tylko znaki alfanumeryczne i myślniki."
-
 #: apps/remix/app/routes/_authenticated+/admin+/_layout.tsx
 msgid "Users"
 msgstr "Użytkownicy"
@@ -6709,12 +7463,15 @@ msgstr "Zweryfikuj swój adres e-mail zespołu"
 msgid "Version History"
 msgstr "Historia wersji"
 
-#: apps/remix/app/components/tables/team-settings-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/organisation-billing-invoices-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
+#: apps/remix/app/components/tables/inbox-table.tsx
 #: apps/remix/app/components/tables/documents-table-action-dropdown.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/tables/documents-table-action-button.tsx
 #: apps/remix/app/components/general/document/document-page-view-button.tsx
 #: apps/remix/app/components/forms/2fa/view-recovery-codes-dialog.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "View"
 msgstr "Widok"
@@ -6764,7 +7521,7 @@ msgstr "Wyświetl dokument"
 msgid "View documents associated with this email"
 msgstr "Wyświetl dokumenty powiązane z tym e-mailem"
 
-#: apps/remix/app/components/general/teams/team-invitations.tsx
+#: apps/remix/app/components/general/organisations/organisation-invitations.tsx
 msgid "View invites"
 msgstr "Wyświetl zaproszenia"
 
@@ -6772,10 +7529,18 @@ msgstr "Wyświetl zaproszenia"
 msgid "View more"
 msgstr "Zobacz więcej"
 
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "View next document"
+msgstr ""
+
 #: apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx
 msgid "View Original Document"
 msgstr "Wyświetl oryginalny dokument"
 
+#: apps/remix/app/components/tables/admin-organisations-table.tsx
+msgid "View owner"
+msgstr ""
+
 #: packages/email/template-components/template-document-self-signed.tsx
 msgid "View plans"
 msgstr "Zobacz plany"
@@ -6791,6 +7556,7 @@ msgstr "Wyświetl zespoły"
 
 #: apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx
 #: apps/remix/app/components/general/document/document-page-view-recipients.tsx
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
 #: packages/lib/constants/recipient-roles.ts
 msgid "Viewed"
 msgstr "Wyświetlono"
@@ -6845,9 +7611,8 @@ msgstr "Chcesz mieć profil publiczny?"
 msgid "Warning: Assistant as last signer"
 msgstr "Uwaga: Asystent jako ostatni sygnatariusz"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
-#: apps/remix/app/components/general/teams/team-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "We are unable to proceed to the billing portal at this time. Please try again, or contact support."
 msgstr "Nie możemy przejść do portalu rozliczeń w tej chwili. Proszę spróbuj ponownie lub skontaktuj się z pomocą techniczną."
 
@@ -6859,19 +7624,45 @@ msgstr "Nie możemy usunąć tego klucza zabezpieczeń w tej chwili. Proszę spr
 msgid "We are unable to update this passkey at the moment. Please try again later."
 msgstr "Nie możemy zaktualizować tego klucza zabezpieczeń w tej chwili. Proszę spróbuj ponownie później."
 
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "We couldn't create a Stripe customer. Please try again."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.groups.$id.tsx
+msgid "We couldn't update the group. Please try again."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+#: apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx
+msgid "We couldn't update the organisation. Please try again."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/template-direct-link-dialog.tsx
 msgid "We encountered an error while removing the direct template link. Please try again later."
 msgstr "Wystąpił błąd podczas usuwania bezpośredniego linku do szablonu. Proszę spróbować ponownie później."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "We encountered an error while updating the webhook. Please try again later."
 msgstr "Natknęliśmy się na błąd podczas aktualizacji webhooka. Proszę spróbuj ponownie później."
 
+#: apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to add team members. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-email-add-dialog.tsx
 msgid "We encountered an unknown error while attempting to add this email. Please try again later."
 msgstr "Natknęliśmy się na nieznany błąd podczas próby dodania tego e-maila. Proszę spróbuj ponownie później."
 
+#: apps/remix/app/components/dialogs/organisation-group-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to create a group. Please try again later."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "We encountered an unknown error while attempting to create a organisation. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "We encountered an unknown error while attempting to create a team. Please try again later."
 msgstr "Natknęliśmy się na nieznany błąd podczas próby utworzenia zespołu. Proszę spróbuj ponownie później."
@@ -6880,9 +7671,9 @@ msgstr "Natknęliśmy się na nieznany błąd podczas próby utworzenia zespołu
 msgid "We encountered an unknown error while attempting to delete it. Please try again later."
 msgstr "Natknęliśmy się na nieznany błąd podczas próby usunięcia tego. Proszę spróbuj ponownie później."
 
-#: apps/remix/app/components/tables/user-settings-pending-teams-table-actions.tsx
-msgid "We encountered an unknown error while attempting to delete the pending team. Please try again later."
-msgstr "Natknęliśmy się na nieznany błąd podczas próby usunięcia oczekującego zespołu. Proszę spróbuj ponownie później."
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "We encountered an unknown error while attempting to delete this organisation. Please try again later."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "We encountered an unknown error while attempting to delete this team. Please try again later."
@@ -6896,30 +7687,36 @@ msgstr "Natknęliśmy się na nieznany błąd podczas próby usunięcia tego tok
 msgid "We encountered an unknown error while attempting to delete your account. Please try again later."
 msgstr "Natknęliśmy się na nieznany błąd podczas próby usunięcia twojego konta. Proszę spróbuj ponownie później."
 
-#: apps/remix/app/components/dialogs/team-member-invite-dialog.tsx
-msgid "We encountered an unknown error while attempting to invite team members. Please try again later."
-msgstr "Natknęliśmy się na nieznany błąd podczas próby zaproszenia członków zespołu. Proszę spróbuj ponownie później."
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "We encountered an unknown error while attempting to disable access."
+msgstr ""
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "We encountered an unknown error while attempting to leave this team. Please try again later."
-msgstr "Natknęliśmy się na nieznany błąd podczas próby opuszczenia tego zespołu. Proszę spróbuj ponownie później."
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "We encountered an unknown error while attempting to enable access."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "We encountered an unknown error while attempting to invite organisation members. Please try again later."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "We encountered an unknown error while attempting to leave this organisation. Please try again later."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "We encountered an unknown error while attempting to remove this group. Please try again later."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "We encountered an unknown error while attempting to remove this template from your profile. Please try again later."
 msgstr "Natknęliśmy się na nieznany błąd podczas próby usunięcia tego szablonu z twojego profilu. Proszę spróbuj ponownie później."
 
-#: apps/remix/app/components/general/teams/team-transfer-status.tsx
-msgid "We encountered an unknown error while attempting to remove this transfer. Please try again or contact support."
-msgstr "Natknęliśmy się na nieznany błąd podczas próby usunięcia tego transferu. Proszę spróbuj ponownie lub skontaktuj się z pomocą techniczną."
-
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
 msgid "We encountered an unknown error while attempting to remove this user. Please try again later."
 msgstr "Natknęliśmy się na nieznany błąd podczas próby usunięcia tego użytkownika. Proszę spróbuj ponownie później."
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "We encountered an unknown error while attempting to request a transfer of this team. Please try again later."
-msgstr "Natknęliśmy się na nieznany błąd podczas próby zażądania transferu tego zespołu. Proszę spróbuj ponownie później."
-
 #: apps/remix/app/components/forms/reset-password.tsx
 msgid "We encountered an unknown error while attempting to reset your password. Please try again later."
 msgstr "Natknęliśmy się na nieznany błąd podczas próby zresetowania hasła. Proszę spróbuj ponownie później."
@@ -6946,10 +7743,19 @@ msgstr "Natknęliśmy się na nieznany błąd podczas próby zaktualizowania ban
 msgid "We encountered an unknown error while attempting to update the template. Please try again later."
 msgstr "Natknęliśmy się na nieznany błąd podczas próby zaktualizowania szablonu. Proszę spróbuj ponownie później."
 
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "We encountered an unknown error while attempting to update this organisation member. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
 msgid "We encountered an unknown error while attempting to update this team member. Please try again later."
 msgstr "Natknęliśmy się na nieznany błąd podczas próby zaktualizowania tego członka zespołu. Proszę spróbuj ponownie później."
 
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "We encountered an unknown error while attempting to update your organisation. Please try again later."
+msgstr ""
+
 #: apps/remix/app/components/forms/password.tsx
 #: apps/remix/app/components/forms/avatar-image.tsx
 msgid "We encountered an unknown error while attempting to update your password. Please try again later."
@@ -6975,10 +7781,6 @@ msgstr "Napotkaliśmy nieznany błąd podczas próby aktualizacji Twojego profil
 msgid "We have sent a confirmation email for verification."
 msgstr "Wysłaliśmy wiadomość e-mail z potwierdzeniem dla weryfikacji."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "We need a username to create your profile"
-msgstr "Potrzebujemy nazwy użytkownika, aby utworzyć Twój profil"
-
 #: apps/remix/app/components/forms/signup.tsx
 msgid "We need your signature to sign documents"
 msgstr "Potrzebujemy Twojego podpisu, aby podpisać dokumenty"
@@ -6991,10 +7793,6 @@ msgstr "Nie udało nam się skopiować tokena do schowka. Spróbuj ponownie."
 msgid "We were unable to copy your recovery code to your clipboard. Please try again."
 msgstr "Nie udało nam się skopiować twojego kodu odzyskiwania do schowka. Spróbuj ponownie."
 
-#: apps/remix/app/components/dialogs/team-checkout-create-dialog.tsx
-msgid "We were unable to create a checkout session. Please try again, or contact support"
-msgstr "Nie udało się utworzyć sesji zakupu. Proszę spróbuj ponownie lub skontaktuj się z pomocą techniczną"
-
 #: apps/remix/app/components/forms/signup.tsx
 msgid "We were unable to create your account. Please review the information you provided and try again."
 msgstr "Nie udało się utworzyć Twojego konta. Proszę sprawdzić podane informacje i spróbować ponownie."
@@ -7009,7 +7807,7 @@ msgstr "Nie udało nam się wyłączyć uwierzytelniania dwuskładnikowego dla t
 msgid "We were unable to log you out at this time."
 msgstr "Nie udało nam się wylogować w tej chwili."
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
 msgid "We were unable to set your public profile to public. Please try again."
 msgstr "Nie udało nam się ustawić twojego profilu publicznego na publiczny. Proszę spróbuj ponownie."
 
@@ -7024,14 +7822,17 @@ msgstr "Nie udało nam się skonfigurować uwierzytelniania dwuskładnikowego dl
 msgid "We were unable to submit this document at this time. Please try again later."
 msgstr "Nie udało nam się złożyć tego dokumentu w tej chwili. Proszę spróbuj ponownie później."
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "We were unable to update your branding preferences at this time, please try again later"
 msgstr "Nie udało nam się zaktualizować ustawień dotyczących marki w tym czasie, spróbuj ponownie później"
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "We were unable to update your document preferences at this time, please try again later"
 msgstr "Nie udało nam się zaktualizować preferencji dokumentu w tym czasie, spróbuj ponownie później"
 
+#: apps/remix/app/components/general/document-signing/document-signing-auth-password.tsx
 #: apps/remix/app/components/general/document-signing/document-signing-auth-2fa.tsx
 msgid "We were unable to verify your details. Please try again or contact support"
 msgstr "Nie udało się zweryfikować twoich danych. Proszę spróbuj ponownie lub skontaktuj się z pomocą techniczną"
@@ -7057,8 +7858,8 @@ msgstr "Wygenerujemy dla Ciebie linki do podpisania, które możesz wysłać do
 msgid "We won't send anything to notify recipients."
 msgstr "Nie wyślemy nic, aby powiadomić odbiorców."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
 #: apps/remix/app/components/tables/documents-table-empty-state.tsx
 msgid "We're all empty"
 msgstr "Pusto"
@@ -7084,17 +7885,14 @@ msgid "Webhook deleted"
 msgstr "Webhook usunięty"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks.$id.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 msgid "Webhook updated"
 msgstr "Webhook zaktualizowany"
 
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks.$id.tsx
 #: apps/remix/app/components/dialogs/webhook-create-dialog.tsx
 msgid "Webhook URL"
 msgstr "URL webhooka"
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 #: apps/remix/app/components/general/settings-nav-mobile.tsx
 #: apps/remix/app/components/general/settings-nav-desktop.tsx
 #: apps/remix/app/components/general/teams/team-settings-nav-mobile.tsx
@@ -7102,10 +7900,6 @@ msgstr "URL webhooka"
 msgid "Webhooks"
 msgstr "Webhooki"
 
-#: apps/remix/app/components/general/billing-plans.tsx
-msgid "Weekly"
-msgstr "Co tydzień"
-
 #: apps/remix/app/routes/_unauthenticated+/articles.signature-disclosure.tsx
 msgid "Welcome"
 msgstr "Witaj"
@@ -7114,6 +7908,10 @@ msgstr "Witaj"
 msgid "Welcome back, we are lucky to have you."
 msgstr "Witamy z powrotem, mamy szczęście, że mamy cię."
 
+#: apps/remix/app/routes/_authenticated+/dashboard.tsx
+msgid "Welcome back! Here's an overview of your account."
+msgstr ""
+
 #: packages/email/template-components/template-confirmation-email.tsx
 msgid "Welcome to Documenso!"
 msgstr "Witamy w Documenso!"
@@ -7122,6 +7920,10 @@ msgstr "Witamy w Documenso!"
 msgid "Were you trying to edit this document instead?"
 msgstr "Czy próbowałeś raczej edytować ten dokument?"
 
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "What you can do with teams:"
+msgstr ""
+
 #: apps/remix/app/components/embed/authoring/configure-document-recipients.tsx
 #: packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
 #: packages/ui/primitives/document-flow/add-signers.tsx
@@ -7144,6 +7946,10 @@ msgstr "Kiedy korzystasz z naszej platformy, aby przyczepić swój podpis elektr
 msgid "While waiting for them to do so you can create your own Documenso account and get started with document signing right away."
 msgstr "Czekając na ich działania możesz utworzyć własne konto Documenso i od razu rozpocząć podpisywanie dokumentów."
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Whitelabeling, unlimited members and more"
+msgstr ""
+
 #: apps/remix/app/components/dialogs/document-resend-dialog.tsx
 msgid "Who do you want to remind?"
 msgstr "Kogo chcesz przypomnieć?"
@@ -7153,18 +7959,19 @@ msgid "Withdrawing Consent"
 msgstr "Wycofanie zgody"
 
 #: apps/remix/app/components/forms/public-profile-form.tsx
-msgid "Write about the team"
-msgstr "Napisz o zespole"
+msgid "Write a description to display on your public profile"
+msgstr ""
 
-#: apps/remix/app/components/forms/public-profile-form.tsx
-msgid "Write about yourself"
-msgstr "Napisz o sobie"
-
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
 #: apps/remix/app/components/general/billing-plans.tsx
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
 msgid "Yearly"
 msgstr "Rocznie"
 
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+#: apps/remix/app/components/forms/document-preferences-form.tsx
+msgid "Yes"
+msgstr ""
+
 #: apps/remix/app/components/general/template/template-page-view-information.tsx
 #: apps/remix/app/components/general/document/document-page-view-information.tsx
 #: packages/lib/utils/document-audit-logs.ts
@@ -7175,17 +7982,42 @@ msgstr "Ty"
 msgid "You are about to delete <0>\"{documentTitle}\"</0>"
 msgstr "Zaraz usuniesz <0>\"{documentTitle}\"</0>"
 
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "You are about to delete <0>{0}</0>. All data related to this organisation such as teams, documents, and all other resources will be deleted. This action is irreversible."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-email-delete-dialog.tsx
 msgid "You are about to delete the following team email from <0>{teamName}</0>."
 msgstr "Zaraz usuniesz następujący e-mail zespołowy z <0>{teamName}</0>."
 
+#: apps/remix/app/components/dialogs/team-inherit-member-enable-dialog.tsx
+msgid "You are about to give all organisation members access to this team under their organisation role."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/document-delete-dialog.tsx
 msgid "You are about to hide <0>\"{documentTitle}\"</0>"
 msgstr "Zaraz ukryjesz <0>\"{documentTitle}\"</0>"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "You are about to leave the following team."
-msgstr "Zaraz opuścisz następujący zespół."
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "You are about to leave the following organisation."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-inherit-member-disable-dialog.tsx
+msgid "You are about to remove default access to this team for all organisation members. Any members not explicitly added to this team will no longer have access."
+msgstr ""
+
+#. placeholder {0}: team.name
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "You are about to remove the following group from <0>{0}</0>."
+msgstr ""
+
+#. placeholder {0}: organisation.name
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "You are about to remove the following user from <0>{0}</0>."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "You are about to remove the following user from <0>{teamName}</0>."
@@ -7201,21 +8033,38 @@ msgstr "Zaraz cofniesz dostęp dla zespołu <0>{0}</0> ({1}) do korzystania z tw
 msgid "You are about to send this document to the recipients. Are you sure you want to continue?"
 msgstr "Zaraz wyślesz ten dokument do odbiorców. Czy na pewno chcesz kontynuować?"
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "You are about to subscribe to the {planName}"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
 msgid "You are currently on the <0>Free Plan</0>."
 msgstr "Obecnie jesteś na <0>Planie darmowym</0>."
 
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-msgid "You are currently updating <0>{teamMemberName}.</0>"
-msgstr "Obecnie aktualizujesz <0>{teamMemberName}.</0>"
+msgid "You are currently updating <0>{memberName}.</0>"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You are currently updating <0>{organisationMemberName}.</0>"
+msgstr ""
 
 #: apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx
 msgid "You are currently updating the <0>{passkeyName}</0> passkey."
 msgstr "Obecnie aktualizujesz klucz zabezpieczeń <0>{passkeyName}</0>."
 
-#: apps/remix/app/components/dialogs/template-move-dialog.tsx
-msgid "You are not a member of this team."
-msgstr "Nie jesteś członkiem tego zespołu."
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You are currently updating the <0>{teamGroupName}</0> team group."
+msgstr ""
+
+#: apps/remix/app/components/general/billing-plans.tsx
+msgid "You are currently updating your \"Personal\" organisation to a plan where you can add multiple members. These members may have access to the documents, templates and other data in this organisation, including documents sent to you."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings._layout.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings._layout.tsx
+msgid "You are not authorized to access this page."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx
 msgid "You are not authorized to delete this user."
@@ -7233,18 +8082,18 @@ msgstr "Nie masz uprawnień, aby włączyć tego użytkownika."
 msgid "You can also copy and paste this link into your browser: {confirmationLink} (link expires in 1 hour)"
 msgstr "Możesz także skopiować i wkleić ten link do przeglądarki: {confirmationLink} (link wygasa za 1 godzinę)"
 
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You can choose to enable or disable your profile for public view."
-msgstr "Możesz wybrać, aby włączyć lub wyłączyć swój profil do publicznego widoku."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You can choose to enable or disable your team profile for public view."
-msgstr "Możesz wybrać, aby włączyć lub wyłączyć profil swojego zespołu do publicznego widoku."
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.public-profile.tsx
+msgid "You can choose to enable or disable the profile for public view."
+msgstr ""
 
 #: apps/remix/app/components/general/document/document-recipient-link-copy-dialog.tsx
 msgid "You can copy and share these links to recipients so they can action the document."
 msgstr "Możesz skopiować i udostępnić te linki odbiorcom, aby mogli wykonać dokument."
 
+#: apps/remix/app/components/general/teams/team-inherit-member-alert.tsx
+msgid "You can enable access to allow all organisation members to access this team by default."
+msgstr ""
+
 #: packages/email/templates/confirm-team-email.tsx
 msgid "You can revoke access at any time in your team settings on Documenso <0>here.</0>"
 msgstr "Możesz w każdej chwili cofnąć dostęp w ustawieniach zespołu na Documenso <0>tutaj.</0>"
@@ -7274,14 +8123,30 @@ msgstr "Możesz zobaczyć dokument i jego status, klikając przycisk poniżej."
 msgid "You cannot add assistants when signing order is disabled."
 msgstr "Nie można dodać asystentów, gdy kolejność podpisywania jest wyłączona."
 
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "You cannot delete a group which has a higher role than you."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/passkey-create-dialog.tsx
 msgid "You cannot have more than {MAXIMUM_PASSKEYS} passkeys."
 msgstr "Nie możesz mieć więcej niż {MAXIMUM_PASSKEYS} kluczy zabezpieczeń."
 
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You cannot modify a group which has a higher role than you."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You cannot modify a organisation member who has a higher role than you."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
 msgid "You cannot modify a team member who has a higher role than you."
 msgstr "Nie możesz modyfikować członka zespołu, który ma wyższą rolę niż ty."
 
+#: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
+msgid "You cannot remove members from this team if the inherit member feature is enabled."
+msgstr ""
+
 #: packages/ui/primitives/document-upload.tsx
 #: packages/ui/primitives/document-dropzone.tsx
 msgid "You cannot upload documents at this time."
@@ -7292,9 +8157,13 @@ msgstr "Nie możesz przesyłać dokumentów w tej chwili."
 msgid "You cannot upload encrypted PDFs"
 msgstr "Nie możesz przesyłać zaszyfrowanych plików PDF"
 
-#: apps/remix/app/components/general/billing-portal-button.tsx
-msgid "You do not currently have a customer record, this should not happen. Please contact support for assistance."
-msgstr "Obecnie nie masz rekordu klienta, nie powinno tak się dziać. Proszę skontaktuj się z pomocą techniczną."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "You currently have an inactive <0>{currentProductName}</0> subscription"
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl._index.tsx
+msgid "You currently have no access to any teams within this organisation. Please contact your organisation to request access."
+msgstr ""
 
 #: apps/remix/app/components/forms/token.tsx
 msgid "You do not have permission to create a token for this team"
@@ -7304,50 +8173,43 @@ msgstr "Nie masz uprawnień do utworzenia tokenu dla tego zespołu"
 msgid "You don't need to sign it anymore."
 msgstr "Nie musisz go już podpisywać."
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-msgid "You have accepted an invitation from <0>{0}</0> to join their team."
-msgstr "Zaakceptowałeś zaproszenie od <0>{0}</0>, aby dołączyć do ich zespołu."
-
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.verify.transfer.$token.tsx
-msgid "You have already completed the ownership transfer for <0>{0}</0>."
-msgstr "Już zakończyłeś transfer własności dla <0>{0}</0>."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "You have accepted an invitation from <0>{0}</0> to join their organisation."
+msgstr ""
 
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "You have already verified your email address for <0>{0}</0>."
 msgstr "Już zweryfikowałeś swój adres e-mail dla <0>{0}</0>."
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.invite.$token.tsx
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "You have been invited by <0>{0}</0> to join their team."
-msgstr "Zostałeś zaproszony przez <0>{0}</0>, aby dołączyć do ich zespołu."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx
+msgid "You have been invited by <0>{0}</0> to join their organisation."
+msgstr ""
 
-#. placeholder {0}: team.name
-#: packages/lib/server-only/team/create-team-member-invites.ts
+#. placeholder {0}: organisation.name
+#: packages/lib/server-only/organisation/create-organisation-member-invites.ts
 msgid "You have been invited to join {0} on Documenso"
 msgstr "Zostałeś zaproszony do dołączenia do {0} na Documenso"
 
-#: packages/email/templates/team-invite.tsx
-msgid "You have been invited to join the following team"
-msgstr "Zostałeś zaproszony do dołączenia do następującego zespołu"
+#: packages/email/templates/organisation-invite.tsx
+msgid "You have been invited to join the following organisation"
+msgstr ""
 
 #: packages/lib/server-only/recipient/set-document-recipients.ts
 #: packages/lib/server-only/recipient/delete-document-recipient.ts
 msgid "You have been removed from a document"
 msgstr "Zostałeś usunięty z dokumentu"
 
-#. placeholder {0}: team.name
-#: packages/lib/server-only/team/request-team-ownership-transfer.ts
-msgid "You have been requested to take ownership of team {0} on Documenso"
-msgstr "Poproszono Cię o przejęcie własności zespołu {0} na Documenso"
+#: apps/remix/app/components/embed/multisign/multi-sign-document-list.tsx
+msgid "You have been requested to sign the following documents. Review each document carefully and complete the signing process."
+msgstr ""
 
-#. placeholder {0}: data.teamName
-#: apps/remix/app/routes/_unauthenticated+/team.decline.$token.tsx
-msgid "You have declined the invitation from <0>{0}</0> to join their team."
-msgstr "Odrzuciłeś zaproszenie od <0>{0}</0>, aby dołączyć do ich zespołu."
+#. placeholder {0}: data.organisationName
+#: apps/remix/app/routes/_unauthenticated+/organisation.decline.$token.tsx
+msgid "You have declined the invitation from <0>{0}</0> to join their organisation."
+msgstr ""
 
 #. placeholder {0}: `"${document.title}"`
 #: packages/lib/server-only/document/resend-document.tsx
@@ -7356,12 +8218,11 @@ msgid "You have initiated the document {0} that requires you to {recipientAction
 msgstr "Rozpocząłeś dokument {0}, który wymaga, abyś go {recipientActionVerb}."
 
 #: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx
-#: apps/remix/app/routes/_authenticated+/settings+/webhooks._index.tsx
 msgid "You have no webhooks yet. Your webhooks will be shown here once you create them."
 msgstr "Nie masz jeszcze żadnych webhooków. Twoje webhooki będą tutaj widoczne, gdy je utworzysz."
 
-#: apps/remix/app/routes/_authenticated+/templates.f.$folderId._index.tsx
-#: apps/remix/app/routes/_authenticated+/templates._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.f.$folderId._index.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx
 msgid "You have not yet created any templates. To create a template please upload one."
 msgstr "Brak utworzonych szablonów. Prześlij, aby utworzyć."
 
@@ -7374,6 +8235,10 @@ msgstr "Brak utworzonych lub odebranych dokumentów. Prześlij, aby utworzyć."
 msgid "You have reached the maximum limit of {0} direct templates. <0>Upgrade your account to continue!</0>"
 msgstr "Osiągnąłeś maksymalny limit {0} bezpośrednich szablonów. <0>Ulepsz swoje konto, aby kontynuować!</0>"
 
+#: apps/remix/app/components/dialogs/team-create-dialog.tsx
+msgid "You have reached the maximum number of teams for your plan. Please contact sales at <0>support@documenso.com</0> if you would like to adjust your plan."
+msgstr ""
+
 #: apps/remix/app/components/general/document/document-upload.tsx
 #: apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx
 msgid "You have reached your document limit for this month. Please upgrade your plan."
@@ -7401,15 +8266,27 @@ msgstr "Odrzuciłeś ten dokument"
 msgid "You have signed “{documentName}”"
 msgstr "Podpisałeś „{documentName}”"
 
-#: apps/remix/app/components/dialogs/team-leave-dialog.tsx
-msgid "You have successfully left this team."
-msgstr "Sukces! Opuszczono ten zespół."
+#: apps/remix/app/components/dialogs/organisation-leave-dialog.tsx
+msgid "You have successfully left this organisation."
+msgstr ""
 
 #: apps/remix/app/components/general/claim-account.tsx
 #: apps/remix/app/components/forms/signup.tsx
 msgid "You have successfully registered. Please verify your account by clicking on the link you received in the email."
 msgstr "Rejestracja zakończona sukcesem. Zweryfikuj swoje konto, klikając w link, który otrzymałeś w e-mailu."
 
+#: apps/remix/app/components/dialogs/organisation-group-delete-dialog.tsx
+msgid "You have successfully removed this group from the organisation."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-delete-dialog.tsx
+msgid "You have successfully removed this group from the team."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-delete-dialog.tsx
+msgid "You have successfully removed this user from the organisation."
+msgstr ""
+
 #: apps/remix/app/components/dialogs/team-member-delete-dialog.tsx
 msgid "You have successfully removed this user from the team."
 msgstr "Sukces! Usunięto tego użytkownika z zespołu."
@@ -7423,38 +8300,35 @@ msgid "You have the right to withdraw your consent to use electronic signatures
 msgstr "Masz prawo do wycofania zgody na korzystanie z podpisów elektronicznych w dowolnym czasie przed zakończeniem procesu podpisywania. Aby wycofać zgodę, prosimy o kontakt z nadawcą dokumentu. Jeśli nie uda Ci się skontaktować z nadawcą, możesz skontaktować się z <0>{SUPPORT_EMAIL}</0> w celu uzyskania pomocy. Należy pamiętać, że wycofanie zgody może opóźnić lub zatrzymać zakończenie związanej z tym transakcji lub usługi."
 
 #: apps/remix/app/components/dialogs/team-member-update-dialog.tsx
-msgid "You have updated {teamMemberName}."
-msgstr "Zaktualizowałeś {teamMemberName}."
+msgid "You have updated {memberName}."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-update-dialog.tsx
+msgid "You have updated {organisationMemberName}."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/team-group-update-dialog.tsx
+msgid "You have updated the team group."
+msgstr ""
 
 #. placeholder {0}: data.teamName
 #: apps/remix/app/routes/_unauthenticated+/team.verify.email.$token.tsx
 msgid "You have verified your email address for <0>{0}</0>."
 msgstr "Zweryfikowałeś swój adres e-mail dla <0>{0}</0>."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "You must be an admin of this team to manage billing."
-msgstr "Musisz być administratorem tego zespołu, aby zarządzać płatnościami."
-
 #: apps/remix/app/components/dialogs/webhook-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/token-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
 msgid "You must enter '{deleteMessage}' to proceed"
 msgstr "Musisz wpisać '{deleteMessage}' aby kontynuować"
 
-#: apps/remix/app/components/dialogs/team-transfer-dialog.tsx
-msgid "You must have at least one other team member to transfer ownership."
-msgstr "Musisz mieć przynajmniej jednego innego członka zespołu, aby przenieść własność."
-
-#: apps/remix/app/routes/_authenticated+/settings+/public-profile.tsx
-msgid "You must set a profile URL before enabling your public profile."
-msgstr "Musisz ustawić URL profilu przed włączeniem swojego publicznego profilu."
-
 #: apps/remix/app/components/dialogs/template-folder-delete-dialog.tsx
 #: apps/remix/app/components/dialogs/folder-delete-dialog.tsx
 msgid "You must type '{deleteMessage}' to confirm"
 msgstr "Musisz wpisać '{deleteMessage}', by potwierdzić"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "You need to be an admin to manage API tokens."
 msgstr "Musisz być administratorem, aby zarządzać tokenami API."
 
@@ -7470,9 +8344,9 @@ msgstr "Musisz być zalogowany, aby zobaczyć tę stronę."
 msgid "You need to setup 2FA to mark this document as viewed."
 msgstr "Musisz skonfigurować 2FA, aby oznaczyć ten dokument jako przeczytany."
 
-#: apps/remix/app/components/forms/signup.tsx
-msgid "You will get notified & be able to set up your documenso public profile when we launch the feature."
-msgstr "Otrzymasz powiadomienie i będziesz mógł skonfigurować swój publiczny profil documenso, gdy uruchomimy tę funkcję."
+#: apps/remix/app/components/dialogs/admin-organisation-create-dialog.tsx
+msgid "You will need to configure any claims or subscription after creating this organisation"
+msgstr ""
 
 #: apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
 msgid "You will now be required to enter a code from your authenticator app when signing in."
@@ -7494,11 +8368,12 @@ msgstr "Awatar został zaktualizowany."
 msgid "Your banner has been updated successfully."
 msgstr "Twój banner został pomyślnie zaktualizowany."
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/components/forms/branding-preferences-form.tsx
 msgid "Your brand website URL"
 msgstr "Adres URL witryny Twojej marki"
 
-#: apps/remix/app/components/forms/team-branding-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Your branding preferences have been updated"
 msgstr "Preferencje dotyczące marki zostały zaktualizowane"
 
@@ -7510,9 +8385,17 @@ msgstr "Twoja masowa wysyłka została zainicjowana. Otrzymasz powiadomienie e-m
 msgid "Your bulk send operation for template \"{templateName}\" has completed."
 msgstr "Twoja operacja masowej wysyłki dla szablonu \"{templateName}\" została zakończona."
 
-#: apps/remix/app/routes/_authenticated+/settings+/billing.tsx
-msgid "Your current plan is past due. Please update your payment information."
-msgstr "Twój obecny plan jest przeterminowany. Zaktualizuj swoje informacje płatnicze."
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current {currentProductName} plan is past due. Please update your payment information."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current plan is inactive."
+msgstr ""
+
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.billing.tsx
+msgid "Your current plan is past due."
+msgstr ""
 
 #: apps/remix/app/components/dialogs/public-profile-template-manage-dialog.tsx
 msgid "Your direct signing templates"
@@ -7557,7 +8440,8 @@ msgstr "Twój dokument został pomyślnie załadowany."
 msgid "Your document has been uploaded successfully. You will be redirected to the template page."
 msgstr "Twój dokument został pomyślnie załadowany. Zostaniesz przekierowany na stronę szablonu."
 
-#: apps/remix/app/components/forms/team-document-preferences-form.tsx
+#: apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.preferences.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.preferences.tsx
 msgid "Your document preferences have been updated"
 msgstr "Preferencje dokumentu zostały zaktualizowane"
 
@@ -7579,7 +8463,7 @@ msgstr "Twój adres e-mail został pomyślnie potwierdzony! Możesz teraz korzys
 msgid "Your email is currently being used by team <0>{0}</0> ({1})."
 msgstr "Twój adres e-mail jest aktualnie używany przez zespół <0>{0}</0> ({1})."
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Your existing tokens"
 msgstr "Istniejące tokeny"
 
@@ -7588,6 +8472,18 @@ msgstr "Istniejące tokeny"
 msgid "Your new password cannot be the same as your old password."
 msgstr "Twoje nowe hasło nie może być takie samo jak stare hasło."
 
+#: apps/remix/app/components/dialogs/organisation-create-dialog.tsx
+msgid "Your organisation has been created."
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-delete-dialog.tsx
+msgid "Your organisation has been successfully deleted."
+msgstr ""
+
+#: apps/remix/app/components/forms/organisation-update-form.tsx
+msgid "Your organisation has been successfully updated."
+msgstr ""
+
 #: apps/remix/app/components/forms/reset-password.tsx
 #: apps/remix/app/components/forms/password.tsx
 msgid "Your password has been updated successfully."
@@ -7597,10 +8493,18 @@ msgstr "Hasło zostało zaktualizowane."
 msgid "Your password has been updated."
 msgstr "Hasło zostało zaktualizowane."
 
-#: apps/remix/app/components/general/teams/team-layout-billing-banner.tsx
+#: apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
 msgid "Your payment for teams is overdue. Please settle the payment to avoid any service disruptions."
 msgstr "Twoja płatność za zespoły jest przeterminowana. Proszę uregulować płatność, aby uniknąć zakłóceń w świadczeniu usług."
 
+#: apps/remix/app/components/tables/user-organisations-table.tsx
+msgid "Your personal organisation"
+msgstr ""
+
+#: apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
+msgid "Your plan does not support inviting members. Please upgrade or your plan or contact sales at <0>support@documenso.com</0> if you would like to discuss your options."
+msgstr ""
+
 #: apps/remix/app/components/forms/profile.tsx
 msgid "Your profile has been updated successfully."
 msgstr "Twój profil został pomyślnie zaktualizowany."
@@ -7622,19 +8526,10 @@ msgstr "Twój kod odzyskiwania został skopiowany do schowka."
 msgid "Your recovery codes are listed below. Please store them in a safe place."
 msgstr "Twoje kody odzyskiwania są wymienione poniżej. Proszę przechowywać je w bezpiecznym miejscu."
 
-#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
-msgid "Your subscription is currently active."
-msgstr "Twoja subskrypcja jest aktualnie aktywna."
-
 #: apps/remix/app/components/dialogs/team-create-dialog.tsx
 msgid "Your team has been created."
 msgstr "Twój zespół został utworzony."
 
-#: packages/email/templates/team-delete.tsx
-#: packages/email/templates/team-delete.tsx
-msgid "Your team has been deleted"
-msgstr "Twój zespół został usunięty"
-
 #: apps/remix/app/components/dialogs/team-delete-dialog.tsx
 msgid "Your team has been successfully deleted."
 msgstr "Twój zespół został pomyślnie usunięty."
@@ -7671,7 +8566,7 @@ msgstr "Twój token wygasł!"
 msgid "Your token was created successfully! Make sure to copy it because you won't be able to see it again!"
 msgstr "Twój token został pomyślnie utworzony! Upewnij się, że go skopiujesz, ponieważ nie będziesz mógł go zobaczyć ponownie!"
 
-#: apps/remix/app/routes/_authenticated+/settings+/tokens.tsx
+#: apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx
 msgid "Your tokens will be shown here once you create them."
 msgstr "Twoje tokeny będą tutaj wyświetlane po ich utworzeniu."
 
diff --git a/packages/lib/types/organisation.ts b/packages/lib/types/organisation.ts
new file mode 100644
index 000000000..64f7306bf
--- /dev/null
+++ b/packages/lib/types/organisation.ts
@@ -0,0 +1,45 @@
+import type { z } from 'zod';
+
+import OrganisationClaimSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationClaimSchema';
+import { OrganisationSchema } from '@documenso/prisma/generated/zod/modelSchema/OrganisationSchema';
+
+export const ZOrganisationSchema = OrganisationSchema.pick({
+  id: true,
+  createdAt: true,
+  updatedAt: true,
+  type: true,
+  name: true,
+  url: true,
+  avatarImageId: true,
+  customerId: true,
+  ownerUserId: true,
+}).extend({
+  organisationClaim: OrganisationClaimSchema.pick({
+    id: true,
+    createdAt: true,
+    updatedAt: true,
+    originalSubscriptionClaimId: true,
+    teamCount: true,
+    memberCount: true,
+    flags: true,
+  }),
+});
+
+export type TOrganisation = z.infer<typeof ZOrganisationSchema>;
+
+export const ZOrganisationLiteSchema = OrganisationSchema.pick({
+  id: true,
+  createdAt: true,
+  updatedAt: true,
+  type: true,
+  name: true,
+  url: true,
+  avatarImageId: true,
+  customerId: true,
+  ownerUserId: true,
+});
+
+/**
+ * A version of the organisation response schema when returning multiple organisations at once from a single API endpoint.
+ */
+export const ZOrganisationManySchema = ZOrganisationLiteSchema;
diff --git a/packages/lib/types/subscription.ts b/packages/lib/types/subscription.ts
new file mode 100644
index 000000000..34fc588ba
--- /dev/null
+++ b/packages/lib/types/subscription.ts
@@ -0,0 +1,177 @@
+import type { SubscriptionClaim } from '@prisma/client';
+import { z } from 'zod';
+
+import { ZOrganisationNameSchema } from '@documenso/trpc/server/organisation-router/create-organisation.types';
+
+/**
+ * README:
+ * - If you update this you MUST update the `backport-subscription-claims` schema as well.
+ */
+export const ZClaimFlagsSchema = z.object({
+  /**
+   * Allows disabling of Documenso branding for:
+   * - Certificates
+   * - Emails
+   * - Other?
+   */
+  allowCustomBranding: z.boolean().optional(),
+  hidePoweredBy: z.boolean().optional(),
+
+  unlimitedDocuments: z.boolean().optional(),
+
+  embedAuthoring: z.boolean().optional(),
+  embedAuthoringWhiteLabel: z.boolean().optional(),
+
+  embedSigning: z.boolean().optional(),
+  embedSigningWhiteLabel: z.boolean().optional(),
+
+  cfr21: z.boolean().optional(),
+});
+
+export type TClaimFlags = z.infer<typeof ZClaimFlagsSchema>;
+
+// When adding keys, update internal documentation with this.
+export const SUBSCRIPTION_CLAIM_FEATURE_FLAGS: Record<
+  keyof TClaimFlags,
+  {
+    label: string;
+    key: keyof TClaimFlags;
+  }
+> = {
+  unlimitedDocuments: {
+    key: 'unlimitedDocuments',
+    label: 'Unlimited documents',
+  },
+  allowCustomBranding: {
+    key: 'allowCustomBranding',
+    label: 'Branding',
+  },
+  hidePoweredBy: {
+    key: 'hidePoweredBy',
+    label: 'Hide Documenso branding by',
+  },
+  embedAuthoring: {
+    key: 'embedAuthoring',
+    label: 'Embed authoring',
+  },
+  embedSigning: {
+    key: 'embedSigning',
+    label: 'Embed signing',
+  },
+  embedAuthoringWhiteLabel: {
+    key: 'embedAuthoringWhiteLabel',
+    label: 'White label for embed authoring',
+  },
+  embedSigningWhiteLabel: {
+    key: 'embedSigningWhiteLabel',
+    label: 'White label for embed signing',
+  },
+  cfr21: {
+    key: 'cfr21',
+    label: '21 CFR',
+  },
+};
+
+export enum INTERNAL_CLAIM_ID {
+  FREE = 'free',
+  INDIVIDUAL = 'individual',
+  TEAM = 'team',
+  EARLY_ADOPTER = 'earlyAdopter',
+  PLATFORM = 'platform',
+  ENTERPRISE = 'enterprise',
+}
+
+export type InternalClaim = Omit<SubscriptionClaim, 'createdAt' | 'updatedAt'>;
+
+export type InternalClaims = {
+  [key in INTERNAL_CLAIM_ID]: InternalClaim;
+};
+
+export const internalClaims: InternalClaims = {
+  [INTERNAL_CLAIM_ID.FREE]: {
+    id: INTERNAL_CLAIM_ID.FREE,
+    name: 'Free',
+    teamCount: 1,
+    memberCount: 1,
+    locked: true,
+    flags: {},
+  },
+  [INTERNAL_CLAIM_ID.INDIVIDUAL]: {
+    id: INTERNAL_CLAIM_ID.INDIVIDUAL,
+    name: 'Individual',
+    teamCount: 1,
+    memberCount: 1,
+    locked: true,
+    flags: {
+      unlimitedDocuments: true,
+    },
+  },
+  [INTERNAL_CLAIM_ID.TEAM]: {
+    id: INTERNAL_CLAIM_ID.TEAM,
+    name: 'Teams',
+    teamCount: 1,
+    memberCount: 5,
+    locked: true,
+    flags: {
+      unlimitedDocuments: true,
+      allowCustomBranding: true,
+      embedSigning: true,
+    },
+  },
+  [INTERNAL_CLAIM_ID.PLATFORM]: {
+    id: INTERNAL_CLAIM_ID.PLATFORM,
+    name: 'Platform',
+    teamCount: 1,
+    memberCount: 0,
+    locked: true,
+    flags: {
+      unlimitedDocuments: true,
+      allowCustomBranding: true,
+      hidePoweredBy: true,
+      embedAuthoring: false,
+      embedAuthoringWhiteLabel: true,
+      embedSigning: false,
+      embedSigningWhiteLabel: true,
+    },
+  },
+  [INTERNAL_CLAIM_ID.ENTERPRISE]: {
+    id: INTERNAL_CLAIM_ID.ENTERPRISE,
+    name: 'Enterprise',
+    teamCount: 0,
+    memberCount: 0,
+    locked: true,
+    flags: {
+      unlimitedDocuments: true,
+      allowCustomBranding: true,
+      hidePoweredBy: true,
+      embedAuthoring: true,
+      embedAuthoringWhiteLabel: true,
+      embedSigning: true,
+      embedSigningWhiteLabel: true,
+      cfr21: true,
+    },
+  },
+  [INTERNAL_CLAIM_ID.EARLY_ADOPTER]: {
+    id: INTERNAL_CLAIM_ID.EARLY_ADOPTER,
+    name: 'Early Adopter',
+    teamCount: 0,
+    memberCount: 0,
+    locked: true,
+    flags: {
+      unlimitedDocuments: true,
+      allowCustomBranding: true,
+      hidePoweredBy: true,
+      embedSigning: true,
+      embedSigningWhiteLabel: true,
+    },
+  },
+} as const;
+
+export const ZStripeOrganisationCreateMetadataSchema = z.object({
+  organisationName: ZOrganisationNameSchema,
+  userId: z.number(),
+});
+
+export type StripeOrganisationCreateMetadata = z.infer<
+  typeof ZStripeOrganisationCreateMetadataSchema
+>;
diff --git a/packages/lib/universal/id.ts b/packages/lib/universal/id.ts
index e2f01b044..dbe159fbe 100644
--- a/packages/lib/universal/id.ts
+++ b/packages/lib/universal/id.ts
@@ -9,3 +9,16 @@ export const fancyId = customAlphabet('abcdefhiklmnorstuvwxyz', 16);
 export const prefixedId = (prefix: string, length = 16) => {
   return `${prefix}_${fancyId(length)}`;
 };
+
+type DatabaseIdPrefix =
+  | 'org'
+  | 'org_claim'
+  | 'org_group'
+  | 'org_setting'
+  | 'member'
+  | 'member_invite'
+  | 'group_member'
+  | 'team_group'
+  | 'team_setting';
+
+export const generateDatabaseId = (prefix: DatabaseIdPrefix) => prefixedId(prefix, 16);
diff --git a/packages/lib/utils/billing.ts b/packages/lib/utils/billing.ts
index eab117882..b11b7af3b 100644
--- a/packages/lib/utils/billing.ts
+++ b/packages/lib/utils/billing.ts
@@ -1,36 +1,39 @@
-import type { Subscription } from '@prisma/client';
-import { SubscriptionStatus } from '@prisma/client';
+import type { Subscription } from '@documenso/prisma/generated/zod/modelSchema/SubscriptionSchema';
+
+import { IS_BILLING_ENABLED } from '../constants/app';
+import { AppErrorCode } from '../errors/app-error';
+import { AppError } from '../errors/app-error';
+import type { StripeOrganisationCreateMetadata } from '../types/subscription';
+
+export const generateStripeOrganisationCreateMetadata = (
+  organisationName: string,
+  userId: number,
+) => {
+  const metadata: StripeOrganisationCreateMetadata = {
+    organisationName,
+    userId,
+  };
+
+  return {
+    organisationCreateData: JSON.stringify(metadata),
+  };
+};
 
 /**
- * Returns true if there is a subscription that is active and is one of the provided price IDs.
+ * Throws an error if billing is enabled and no subscription is found.
  */
-export const subscriptionsContainsActivePlan = (
-  subscriptions: Subscription[],
-  priceIds: string[],
-  allowPastDue?: boolean,
-) => {
-  const allowedSubscriptionStatuses: SubscriptionStatus[] = [SubscriptionStatus.ACTIVE];
+export const validateIfSubscriptionIsRequired = (subscription?: Subscription | null) => {
+  const isBillingEnabled = IS_BILLING_ENABLED();
 
-  if (allowPastDue) {
-    allowedSubscriptionStatuses.push(SubscriptionStatus.PAST_DUE);
+  if (!isBillingEnabled) {
+    return;
   }
 
-  return subscriptions.some(
-    (subscription) =>
-      allowedSubscriptionStatuses.includes(subscription.status) &&
-      priceIds.includes(subscription.priceId),
-  );
-};
+  if (isBillingEnabled && !subscription) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Subscription not found',
+    });
+  }
 
-/**
- * Returns true if there is a subscription that is active and is one of the provided product IDs.
- */
-export const subscriptionsContainsActiveProductId = (
-  subscriptions: Subscription[],
-  productId: string[],
-) => {
-  return subscriptions.some(
-    (subscription) =>
-      subscription.status === SubscriptionStatus.ACTIVE && productId.includes(subscription.planId),
-  );
+  return subscription;
 };
diff --git a/packages/lib/utils/i18n.ts b/packages/lib/utils/i18n.ts
index b2dd7e4f6..0e9305cac 100644
--- a/packages/lib/utils/i18n.ts
+++ b/packages/lib/utils/i18n.ts
@@ -1,5 +1,6 @@
 import type { I18n, MessageDescriptor } from '@lingui/core';
 import { i18n } from '@lingui/core';
+import type { MacroMessageDescriptor } from '@lingui/core/macro';
 
 import type { I18nLocaleData, SupportedLanguageCodes } from '../constants/i18n';
 import { APP_I18N_OPTIONS } from '../constants/i18n';
@@ -84,3 +85,10 @@ export const extractLocaleData = ({ headers }: ExtractLocaleDataOptions): I18nLo
 export const parseMessageDescriptor = (_: I18n['_'], value: string | MessageDescriptor) => {
   return typeof value === 'string' ? value : _(value);
 };
+
+export const parseMessageDescriptorMacro = (
+  t: (descriptor: MacroMessageDescriptor) => string,
+  value: string | MessageDescriptor,
+) => {
+  return typeof value === 'string' ? value : t(value);
+};
diff --git a/packages/lib/utils/organisations-claims.ts b/packages/lib/utils/organisations-claims.ts
new file mode 100644
index 000000000..76afac149
--- /dev/null
+++ b/packages/lib/utils/organisations-claims.ts
@@ -0,0 +1,14 @@
+import type { SubscriptionClaim } from '@prisma/client';
+
+export const generateDefaultSubscriptionClaim = (): Omit<
+  SubscriptionClaim,
+  'id' | 'organisation' | 'createdAt' | 'updatedAt' | 'originalSubscriptionClaimId'
+> => {
+  return {
+    name: '',
+    teamCount: 1,
+    memberCount: 1,
+    locked: false,
+    flags: {},
+  };
+};
diff --git a/packages/lib/utils/organisations.ts b/packages/lib/utils/organisations.ts
new file mode 100644
index 000000000..539db071b
--- /dev/null
+++ b/packages/lib/utils/organisations.ts
@@ -0,0 +1,128 @@
+import type { Organisation, OrganisationGlobalSettings, Prisma } from '@prisma/client';
+import {
+  DocumentVisibility,
+  type OrganisationGroup,
+  type OrganisationMemberRole,
+} from '@prisma/client';
+
+import type { ORGANISATION_MEMBER_ROLE_MAP } from '@documenso/lib/constants/organisations-translations';
+
+import {
+  LOWEST_ORGANISATION_ROLE,
+  ORGANISATION_MEMBER_ROLE_HIERARCHY,
+  ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP,
+} from '../constants/organisations';
+
+export const isPersonalLayout = (organisations: Pick<Organisation, 'type'>[]) => {
+  return organisations.length === 1 && organisations[0].type === 'PERSONAL';
+};
+
+/**
+ * Determines whether a team member can execute a given action.
+ *
+ * @param action The action the user is trying to execute.
+ * @param role The current role of the user.
+ * @returns Whether the user can execute the action.
+ */
+export const canExecuteOrganisationAction = (
+  action: keyof typeof ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP,
+  role: keyof typeof ORGANISATION_MEMBER_ROLE_MAP,
+) => {
+  return ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP[action].some((i) => i === role);
+};
+
+/**
+ * Compares the provided `currentUserRole` with the provided `roleToCheck` to determine
+ * whether the `currentUserRole` has permission to modify the `roleToCheck`.
+ *
+ * @param currentUserRole Role of the current user
+ * @param roleToCheck Role of another user to see if the current user can modify
+ * @returns True if the current user can modify the other user, false otherwise
+ */
+export const isOrganisationRoleWithinUserHierarchy = (
+  currentUserRole: keyof typeof ORGANISATION_MEMBER_ROLE_MAP,
+  roleToCheck: keyof typeof ORGANISATION_MEMBER_ROLE_MAP,
+) => {
+  return ORGANISATION_MEMBER_ROLE_HIERARCHY[currentUserRole].some((i) => i === roleToCheck);
+};
+
+export const getHighestOrganisationRoleInGroup = (
+  groups: Pick<OrganisationGroup, 'type' | 'organisationRole'>[],
+): OrganisationMemberRole => {
+  let highestOrganisationRole: OrganisationMemberRole = LOWEST_ORGANISATION_ROLE;
+
+  groups.forEach((group) => {
+    const currentRolePriority = ORGANISATION_MEMBER_ROLE_HIERARCHY[group.organisationRole].length;
+    const highestOrganisationRolePriority =
+      ORGANISATION_MEMBER_ROLE_HIERARCHY[highestOrganisationRole].length;
+
+    if (currentRolePriority > highestOrganisationRolePriority) {
+      highestOrganisationRole = group.organisationRole;
+    }
+  });
+
+  return highestOrganisationRole;
+};
+
+type BuildOrganisationWhereQueryOptions = {
+  organisationId: string | undefined;
+  userId: number;
+  roles?: OrganisationMemberRole[];
+};
+
+export const buildOrganisationWhereQuery = ({
+  organisationId,
+  userId,
+  roles,
+}: BuildOrganisationWhereQueryOptions): Prisma.OrganisationWhereInput => {
+  // Note: Not using inline ternary since typesafety breaks for some reason.
+  if (!roles) {
+    return {
+      id: organisationId,
+      members: {
+        some: {
+          userId,
+        },
+      },
+    };
+  }
+
+  return {
+    id: organisationId,
+    members: {
+      some: {
+        userId,
+        organisationGroupMembers: {
+          some: {
+            group: {
+              organisationRole: {
+                in: roles,
+              },
+            },
+          },
+        },
+      },
+    },
+  };
+};
+
+export const generateDefaultOrganisationSettings = (): Omit<
+  OrganisationGlobalSettings,
+  'id' | 'organisation'
+> => {
+  return {
+    documentVisibility: DocumentVisibility.EVERYONE,
+    documentLanguage: 'en',
+    includeSenderDetails: true,
+    includeSigningCertificate: true,
+
+    typedSignatureEnabled: true,
+    uploadSignatureEnabled: true,
+    drawSignatureEnabled: true,
+
+    brandingEnabled: false,
+    brandingLogo: '',
+    brandingUrl: '',
+    brandingCompanyDetails: '',
+  };
+};
diff --git a/packages/lib/utils/team-global-settings-to-branding.ts b/packages/lib/utils/team-global-settings-to-branding.ts
index 9463ab616..e6ba853bf 100644
--- a/packages/lib/utils/team-global-settings-to-branding.ts
+++ b/packages/lib/utils/team-global-settings-to-branding.ts
@@ -1,13 +1,33 @@
-import type { TeamGlobalSettings } from '@prisma/client';
+import type { OrganisationGlobalSettings } from '@prisma/client';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from '../constants/app';
 
-export const teamGlobalSettingsToBranding = (teamGlobalSettings: TeamGlobalSettings) => {
+export const teamGlobalSettingsToBranding = (
+  settings: Omit<OrganisationGlobalSettings, 'id'>,
+  teamId: number,
+  hidePoweredBy: boolean,
+) => {
   return {
-    ...teamGlobalSettings,
+    ...settings,
     brandingLogo:
-      teamGlobalSettings.brandingEnabled && teamGlobalSettings.brandingLogo
-        ? `${NEXT_PUBLIC_WEBAPP_URL()}/api/branding/logo/team/${teamGlobalSettings.teamId}`
+      settings.brandingEnabled && settings.brandingLogo
+        ? `${NEXT_PUBLIC_WEBAPP_URL()}/api/branding/logo/team/${teamId}`
         : '',
+    brandingHidePoweredBy: hidePoweredBy,
+  };
+};
+
+export const organisationGlobalSettingsToBranding = (
+  settings: Omit<OrganisationGlobalSettings, 'id'>,
+  organisationId: string,
+  hidePoweredBy: boolean,
+) => {
+  return {
+    ...settings,
+    brandingLogo:
+      settings.brandingEnabled && settings.brandingLogo
+        ? `${NEXT_PUBLIC_WEBAPP_URL()}/api/branding/logo/organisation/${organisationId}`
+        : '',
+    brandingHidePoweredBy: hidePoweredBy,
   };
 };
diff --git a/packages/lib/utils/teams.ts b/packages/lib/utils/teams.ts
index c6fb4e319..9e72c462c 100644
--- a/packages/lib/utils/teams.ts
+++ b/packages/lib/utils/teams.ts
@@ -1,7 +1,24 @@
+import type { OrganisationGlobalSettings, Prisma, TeamGlobalSettings } from '@prisma/client';
+
+import type { TeamGroup } from '@documenso/prisma/generated/types';
+import type { TeamMemberRole } from '@documenso/prisma/generated/types';
+
 import { NEXT_PUBLIC_WEBAPP_URL } from '../constants/app';
-import { DocumentSignatureType } from '../constants/document';
-import type { TEAM_MEMBER_ROLE_MAP } from '../constants/teams';
-import { TEAM_MEMBER_ROLE_HIERARCHY, TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../constants/teams';
+import {
+  LOWEST_TEAM_ROLE,
+  TEAM_MEMBER_ROLE_HIERARCHY,
+  TEAM_MEMBER_ROLE_PERMISSIONS_MAP,
+} from '../constants/teams';
+import type { TEAM_MEMBER_ROLE_MAP } from '../constants/teams-translations';
+
+/**
+ * Workaround for E2E tests to not import `msg`.
+ */
+export enum DocumentSignatureType {
+  DRAW = 'draw',
+  TYPE = 'type',
+  UPLOAD = 'upload',
+}
 
 export const formatTeamUrl = (teamUrl: string, baseUrl?: string) => {
   const formattedBaseUrl = (baseUrl ?? NEXT_PUBLIC_WEBAPP_URL()).replace(/https?:\/\//, '');
@@ -9,12 +26,12 @@ export const formatTeamUrl = (teamUrl: string, baseUrl?: string) => {
   return `${formattedBaseUrl}/t/${teamUrl}`;
 };
 
-export const formatDocumentsPath = (teamUrl?: string) => {
-  return teamUrl ? `/t/${teamUrl}/documents` : '/documents';
+export const formatDocumentsPath = (teamUrl: string) => {
+  return `/t/${teamUrl}/documents`;
 };
 
-export const formatTemplatesPath = (teamUrl?: string) => {
-  return teamUrl ? `/t/${teamUrl}/templates` : '/templates';
+export const formatTemplatesPath = (teamUrl: string) => {
+  return `/t/${teamUrl}/templates`;
 };
 
 /**
@@ -46,11 +63,26 @@ export const isTeamRoleWithinUserHierarchy = (
   return TEAM_MEMBER_ROLE_HIERARCHY[currentUserRole].some((i) => i === roleToCheck);
 };
 
+export const getHighestTeamRoleInGroup = (groups: TeamGroup[]): TeamMemberRole => {
+  let highestTeamRole: TeamMemberRole = LOWEST_TEAM_ROLE;
+
+  groups.forEach((group) => {
+    const currentRolePriority = TEAM_MEMBER_ROLE_HIERARCHY[group.teamRole].length;
+    const highestTeamRolePriority = TEAM_MEMBER_ROLE_HIERARCHY[highestTeamRole].length;
+
+    if (currentRolePriority > highestTeamRolePriority) {
+      highestTeamRole = group.teamRole;
+    }
+  });
+
+  return highestTeamRole;
+};
+
 export const extractTeamSignatureSettings = (
   settings?: {
-    typedSignatureEnabled: boolean;
-    drawSignatureEnabled: boolean;
-    uploadSignatureEnabled: boolean;
+    typedSignatureEnabled: boolean | null;
+    drawSignatureEnabled: boolean | null;
+    uploadSignatureEnabled: boolean | null;
   } | null,
 ) => {
   if (!settings) {
@@ -73,3 +105,103 @@ export const extractTeamSignatureSettings = (
 
   return signatureTypes;
 };
+
+type BuildTeamWhereQueryOptions = {
+  teamId: number | undefined;
+  userId: number;
+  roles?: TeamMemberRole[];
+};
+
+export const buildTeamWhereQuery = ({
+  teamId,
+  userId,
+  roles,
+}: BuildTeamWhereQueryOptions): Prisma.TeamWhereUniqueInput => {
+  // Note: Not using inline ternary since typesafety breaks for some reason.
+  if (!roles) {
+    return {
+      id: teamId,
+      teamGroups: {
+        some: {
+          organisationGroup: {
+            organisationGroupMembers: {
+              some: {
+                organisationMember: {
+                  userId,
+                },
+              },
+            },
+          },
+        },
+      },
+    };
+  }
+
+  return {
+    id: teamId,
+    teamGroups: {
+      some: {
+        organisationGroup: {
+          organisationGroupMembers: {
+            some: {
+              organisationMember: {
+                userId,
+              },
+            },
+          },
+        },
+        teamRole: {
+          in: roles,
+        },
+      },
+    },
+  };
+};
+
+/**
+ * Majority of these are null which lets us inherit from the organisation settings.
+ */
+export const generateDefaultTeamSettings = (): Omit<TeamGlobalSettings, 'id' | 'team'> => {
+  return {
+    documentVisibility: null,
+    documentLanguage: null,
+    includeSenderDetails: null,
+    includeSigningCertificate: null,
+
+    typedSignatureEnabled: null,
+    uploadSignatureEnabled: null,
+    drawSignatureEnabled: null,
+
+    brandingEnabled: null,
+    brandingLogo: null,
+    brandingUrl: null,
+    brandingCompanyDetails: null,
+  };
+};
+
+/**
+ * Derive the final settings for a team.
+ *
+ * @param organisationSettings The organisation settings to inherit values from
+ * @param teamSettings The team settings which can override the organisation settings
+ */
+export const extractDerivedTeamSettings = (
+  organisationSettings: Omit<OrganisationGlobalSettings, 'id'>,
+  teamSettings: Omit<TeamGlobalSettings, 'id'>,
+): Omit<OrganisationGlobalSettings, 'id'> => {
+  const derivedSettings: Omit<OrganisationGlobalSettings, 'id'> = {
+    ...organisationSettings,
+  };
+
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  for (const key of Object.keys(derivedSettings) as (keyof typeof derivedSettings)[]) {
+    const teamValue = teamSettings[key];
+
+    if (teamValue !== null) {
+      // @ts-expect-error Should work
+      derivedSettings[key] = teamValue;
+    }
+  }
+
+  return derivedSettings;
+};
diff --git a/packages/prisma/migrations/20250522054049_add_id_generator/migration.sql b/packages/prisma/migrations/20250522054049_add_id_generator/migration.sql
new file mode 100644
index 000000000..02a953ff0
--- /dev/null
+++ b/packages/prisma/migrations/20250522054049_add_id_generator/migration.sql
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2024 Viascom Ltd liab. Co
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+CREATE EXTENSION IF NOT EXISTS pgcrypto;
+
+-- The `nanoid()` function generates a compact, URL-friendly unique identifier.
+-- Based on the given size and alphabet, it creates a randomized string that's ideal for
+-- use-cases requiring small, unpredictable IDs (e.g., URL shorteners, generated file names, etc.).
+-- While it comes with a default configuration, the function is designed to be flexible,
+-- allowing for customization to meet specific needs.
+DROP FUNCTION IF EXISTS nanoid(int, text, float);
+CREATE OR REPLACE FUNCTION nanoid(
+    size int DEFAULT 21, -- The number of symbols in the NanoId String. Must be greater than 0.
+    alphabet text DEFAULT '_-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', -- The symbols used in the NanoId String. Must contain between 1 and 255 symbols.
+    additionalBytesFactor float DEFAULT 1.6 -- The additional bytes factor used for calculating the step size. Must be equal or greater then 1.
+)
+    RETURNS text -- A randomly generated NanoId String
+    LANGUAGE plpgsql
+    VOLATILE
+    PARALLEL SAFE
+    -- Uncomment the following line if you have superuser privileges
+    -- LEAKPROOF
+AS
+$$
+DECLARE
+    alphabetArray  text[];
+    alphabetLength int := 64;
+    mask           int := 63;
+    step           int := 34;
+BEGIN
+    IF size IS NULL OR size < 1 THEN
+        RAISE EXCEPTION 'The size must be defined and greater than 0!';
+    END IF;
+
+    IF alphabet IS NULL OR length(alphabet) = 0 OR length(alphabet) > 255 THEN
+        RAISE EXCEPTION 'The alphabet can''t be undefined, zero or bigger than 255 symbols!';
+    END IF;
+
+    IF additionalBytesFactor IS NULL OR additionalBytesFactor < 1 THEN
+        RAISE EXCEPTION 'The additional bytes factor can''t be less than 1!';
+    END IF;
+
+    alphabetArray := regexp_split_to_array(alphabet, '');
+    alphabetLength := array_length(alphabetArray, 1);
+    mask := (2 << cast(floor(log(alphabetLength - 1) / log(2)) as int)) - 1;
+    step := cast(ceil(additionalBytesFactor * mask * size / alphabetLength) AS int);
+
+    IF step > 1024 THEN
+        step := 1024; -- The step size % can''t be bigger then 1024!
+    END IF;
+
+    RETURN nanoid_optimized(size, alphabet, mask, step);
+END
+$$;
+
+-- Generates an optimized random string of a specified size using the given alphabet, mask, and step.
+-- This optimized version is designed for higher performance and lower memory overhead.
+-- No checks are performed! Use it only if you really know what you are doing.
+DROP FUNCTION IF EXISTS nanoid_optimized(int, text, int, int);
+CREATE OR REPLACE FUNCTION nanoid_optimized(
+    size int, -- The desired length of the generated string.
+    alphabet text, -- The set of characters to choose from for generating the string.
+    mask int, -- The mask used for mapping random bytes to alphabet indices. Should be `(2^n) - 1` where `n` is a power of 2 less than or equal to the alphabet size.
+    step int -- The number of random bytes to generate in each iteration. A larger value may speed up the function but increase memory usage.
+)
+    RETURNS text -- A randomly generated NanoId String
+    LANGUAGE plpgsql
+    VOLATILE
+    PARALLEL SAFE
+    -- Uncomment the following line if you have superuser privileges
+    -- LEAKPROOF
+AS
+$$
+DECLARE
+    idBuilder      text := '';
+    counter        int  := 0;
+    bytes          bytea;
+    alphabetIndex  int;
+    alphabetArray  text[];
+    alphabetLength int  := 64;
+BEGIN
+    alphabetArray := regexp_split_to_array(alphabet, '');
+    alphabetLength := array_length(alphabetArray, 1);
+
+    LOOP
+        bytes := gen_random_bytes(step);
+        FOR counter IN 0..step - 1
+            LOOP
+                alphabetIndex := (get_byte(bytes, counter) & mask) + 1;
+                IF alphabetIndex <= alphabetLength THEN
+                    idBuilder := idBuilder || alphabetArray[alphabetIndex];
+                    IF length(idBuilder) = size THEN
+                        RETURN idBuilder;
+                    END IF;
+                END IF;
+            END LOOP;
+    END LOOP;
+END
+$$;
+
+-- CUSTOM FUNCTION FOR GENERIC PREFIXED IDS
+CREATE OR REPLACE FUNCTION generate_prefix_id(prefix TEXT)
+RETURNS TEXT AS $$
+BEGIN
+  RETURN prefix || '_' || nanoid(16, 'abcdefhiklmnorstuvwxyz');
+END;
+$$ LANGUAGE plpgsql VOLATILE;
+
+-- CUSTOM FUNCTION FOR GENERIC IDS
+CREATE OR REPLACE FUNCTION generate_id()
+RETURNS TEXT AS $$
+BEGIN
+  RETURN nanoid(16, 'abcdefhiklmnorstuvwxyz');
+END;
+$$ LANGUAGE plpgsql VOLATILE;
diff --git a/packages/prisma/migrations/20250522054050_add_organisations/migration.sql b/packages/prisma/migrations/20250522054050_add_organisations/migration.sql
new file mode 100644
index 000000000..b31e52b64
--- /dev/null
+++ b/packages/prisma/migrations/20250522054050_add_organisations/migration.sql
@@ -0,0 +1,894 @@
+/*
+ * Organisation migration
+ *
+ * High level summary:
+ * 1. Create a personal organisation for all users and move their personal entities (documents/templates/etc) into it
+ * 2. Create an organisation for each user subscription, group teams with no subscriptions into these organisations
+ * 3. Create an organisation for all teams with subscriptions
+ *
+ * Search "CUSTOM_CHANGE" to find areas where custom changes to the migration have occurred.
+ *
+ * POST MIGRATION REQUIREMENTS:
+ * - Move individual subscriptions into personal organisations and delete the original organisation
+ * - Set claims for all organisations
+ * - Todo: orgs check for anything else.
+ */
+
+/*
+ * Clean up subscriptions prior to full migration:
+ * - Ensure each user has a maximum of 1 subscription tied to the "User" table
+ * - Move the customerId from the teams/users into the subscription itself
+ */
+-- [CUSTOM_CHANGE_START]
+WITH subscriptions_to_delete AS (
+  SELECT
+    id,
+    ROW_NUMBER() OVER (
+      PARTITION BY "userId"
+      ORDER BY
+        (status = 'ACTIVE') DESC,  -- Prioritize active subscriptions
+        "updatedAt" DESC          -- Then by most recently updated
+    ) AS rn
+  FROM "Subscription" s
+  WHERE s."userId" IS NOT NULL
+),
+to_delete AS (
+  SELECT id
+  FROM subscriptions_to_delete
+  WHERE rn > 1
+)
+DELETE FROM "Subscription"
+WHERE id IN (SELECT id FROM to_delete);
+
+-- Add customerId to Subscription
+ALTER TABLE "Subscription" ADD COLUMN "customerId" TEXT;
+
+-- Move customerId from User to Subscription
+UPDATE "Subscription" s
+SET "customerId" = u."customerId"
+FROM "User" u
+WHERE s."userId" = u."id";
+
+-- Move customerId from Team to Subscription
+UPDATE "Subscription" s
+SET "customerId" = t."customerId"
+FROM "Team" t
+WHERE s."teamId" = t."id";
+
+-- Remove any subscriptions with missing customerId
+DELETE FROM "Subscription"
+WHERE "customerId" IS NULL;
+
+-- Make customerId not null
+ALTER TABLE "Subscription" ALTER COLUMN "customerId" SET NOT NULL;
+
+-- [CUSTOM_CHANGE_END]
+
+-- DropForeignKey
+ALTER TABLE "Subscription" DROP CONSTRAINT "Subscription_teamId_fkey";
+ALTER TABLE "Subscription" DROP CONSTRAINT "Subscription_userId_fkey";
+
+-- DropIndex
+DROP INDEX "Subscription_teamId_key";
+DROP INDEX "Subscription_userId_idx";
+
+-- DropConstraints
+ALTER TABLE "Subscription" DROP CONSTRAINT "teamid_or_userid_check";
+
+/*
+ * Before starting the real migration, we want to do the following:
+ * - Give every user a team with their personal entities (documents, templates, webhooks, profile, apiTokens)
+ * - The team is temporary and tagged with a "isPersonal" boolean
+*/
+-- [CUSTOM_CHANGE_START]
+
+-- 1. Ensure all users have a URL by setting a default CUID
+UPDATE "User"
+SET "url" = generate_id()
+WHERE "url" IS NULL;
+
+-- 2. Make User URL required
+ALTER TABLE "User" ALTER COLUMN "url" SET NOT NULL;
+
+-- 3. Add temp isPersonal boolean to Team table with default false
+ALTER TABLE "Team" ADD COLUMN "isPersonal" BOOLEAN NOT NULL DEFAULT false;
+
+-- 4. Create a personal team for every user
+INSERT INTO "Team" ("name", "url", "createdAt", "ownerUserId", "avatarImageId", "isPersonal")
+SELECT
+'Personal Team',
+"url", -- Use the user's URL directly
+NOW(),
+"id",
+"avatarImageId",
+true -- Set isPersonal to true for these personal teams
+FROM "User" u;
+
+-- 5. Add each user as an ADMIN member of their own team
+INSERT INTO "TeamMember" ("teamId", "userId", "role", "createdAt")
+SELECT t."id", u."id", 'ADMIN', NOW()
+FROM "User" u
+JOIN "Team" t ON t."ownerUserId" = u."id"
+WHERE t."isPersonal" = true;
+
+-- 6. Migrate user's documents to their personal team
+UPDATE "Document"
+SET
+"teamId" = t."id"
+FROM "Team" t, "TeamMember" tm
+WHERE tm."teamId" = t."id"
+AND tm."userId" = "Document"."userId"
+AND "Document"."userId" = t."ownerUserId"
+AND "Document"."teamId" IS NULL
+AND t."isPersonal" = true;
+
+-- 7. Migrate user's templates to their team
+UPDATE "Template"
+SET
+"teamId" = t."id"
+FROM "Team" t, "TeamMember" tm
+WHERE tm."teamId" = t."id"
+AND tm."userId" = "Template"."userId"
+AND "Template"."userId" = t."ownerUserId"
+AND "Template"."teamId" IS NULL
+AND t."isPersonal" = true;
+
+-- 8. Migrate user's folders to their team
+UPDATE "Folder" f
+SET "teamId" = t."id"
+FROM "Team" t
+WHERE f."userId" = t."ownerUserId" AND f."teamId" IS NULL AND t."isPersonal" = true;
+
+-- 9. Migrate user's webhooks to their team
+UPDATE "Webhook" w
+SET "teamId" = t."id"
+FROM "Team" t
+WHERE w."userId" = t."ownerUserId" AND w."teamId" IS NULL AND t."isPersonal" = true;
+
+-- 10. Migrate user's API tokens to their team
+UPDATE "ApiToken" apiToken
+SET "teamId" = t."id"
+FROM "Team" t
+WHERE apiToken."userId" = t."ownerUserId" AND apiToken."teamId" IS NULL AND t."isPersonal" = true;
+
+-- 11. Migrate user's team profiles to their team
+INSERT INTO "TeamProfile" ("id", "enabled", "bio", "teamId")
+SELECT
+  gen_random_uuid(),
+  up."enabled",
+  up."bio",
+  t."id" AS teamId
+FROM "UserProfile" up
+JOIN "User" u ON u."id" = up."userId"
+JOIN "Team" t ON t."ownerUserId" = u."id" AND t."isPersonal" = TRUE;
+
+-- [CUSTOM_CHANGE_END]
+
+-- CreateEnum
+CREATE TYPE "OrganisationGroupType" AS ENUM ('INTERNAL_ORGANISATION', 'INTERNAL_TEAM', 'CUSTOM');
+
+-- CreateEnum
+CREATE TYPE "OrganisationMemberRole" AS ENUM ('ADMIN', 'MANAGER', 'MEMBER');
+
+-- CreateEnum
+CREATE TYPE "OrganisationMemberInviteStatus" AS ENUM ('ACCEPTED', 'PENDING', 'DECLINED');
+
+-- CreateEnum
+CREATE TYPE "OrganisationType" AS ENUM ('PERSONAL', 'ORGANISATION');
+
+-- DropForeignKey
+ALTER TABLE "Document" DROP CONSTRAINT "Document_teamId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "Team" DROP CONSTRAINT "Team_ownerUserId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "TeamGlobalSettings" DROP CONSTRAINT "TeamGlobalSettings_teamId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "TeamMemberInvite" DROP CONSTRAINT "TeamMemberInvite_teamId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "TeamPending" DROP CONSTRAINT "TeamPending_ownerUserId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "TeamTransferVerification" DROP CONSTRAINT "TeamTransferVerification_teamId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "UserProfile" DROP CONSTRAINT "UserProfile_userId_fkey";
+
+-- DropIndex
+DROP INDEX "Team_customerId_key";
+
+-- DropIndex
+DROP INDEX "TeamGlobalSettings_teamId_key";
+
+-- DropIndex
+DROP INDEX "User_customerId_key";
+
+-- DropIndex
+DROP INDEX "User_url_key";
+
+-- DropTable
+DROP TABLE "UserProfile";
+
+-- AlterTable
+ALTER TABLE "Folder" ALTER COLUMN "teamId" SET NOT NULL;
+
+-- AlterTable
+ALTER TABLE "Webhook" ALTER COLUMN "teamId" SET NOT NULL;
+
+-- AlterTable
+ALTER TABLE "ApiToken" ALTER COLUMN "teamId" SET NOT NULL;
+
+-- AlterTable
+ALTER TABLE "Document" ALTER COLUMN "teamId" SET NOT NULL;
+
+-- AlterTable
+ALTER TABLE "Subscription" ADD COLUMN     "organisationId" TEXT; -- [CUSTOM_CHANGE] This is supposed to be NOT NULL (we reapply it at the end)
+
+-- AlterTable
+ALTER TABLE "Team" DROP COLUMN "customerId",
+ADD COLUMN     "organisationId" TEXT, -- [CUSTOM_CHANGE] This is supposed to be NOT NULL (we reapply it at the end)
+ADD COLUMN     "teamGlobalSettingsId" TEXT; -- [CUSTOM_CHANGE] This is supposed to be NOT NULL (we reapply it at the end)
+
+-- AlterTable
+ALTER TABLE "TeamGlobalSettings" DROP COLUMN "allowEmbeddedAuthoring",
+DROP COLUMN "brandingHidePoweredBy",
+ADD COLUMN     "id" TEXT, -- [CUSTOM_CHANGE] Supposed to be NOT NULL but we apply it after generating default IDs
+ALTER COLUMN "documentVisibility" DROP NOT NULL,
+ALTER COLUMN "documentVisibility" DROP DEFAULT,
+ALTER COLUMN "includeSenderDetails" DROP NOT NULL,
+ALTER COLUMN "includeSenderDetails" DROP DEFAULT,
+ALTER COLUMN "brandingCompanyDetails" DROP NOT NULL,
+ALTER COLUMN "brandingCompanyDetails" DROP DEFAULT,
+ALTER COLUMN "brandingEnabled" DROP NOT NULL,
+ALTER COLUMN "brandingEnabled" DROP DEFAULT,
+ALTER COLUMN "brandingLogo" DROP NOT NULL,
+ALTER COLUMN "brandingLogo" DROP DEFAULT,
+ALTER COLUMN "brandingUrl" DROP NOT NULL,
+ALTER COLUMN "brandingUrl" DROP DEFAULT,
+ALTER COLUMN "documentLanguage" DROP NOT NULL,
+ALTER COLUMN "documentLanguage" DROP DEFAULT,
+ALTER COLUMN "typedSignatureEnabled" DROP NOT NULL,
+ALTER COLUMN "typedSignatureEnabled" DROP DEFAULT,
+ALTER COLUMN "includeSigningCertificate" DROP NOT NULL,
+ALTER COLUMN "includeSigningCertificate" DROP DEFAULT,
+ALTER COLUMN "drawSignatureEnabled" DROP NOT NULL,
+ALTER COLUMN "drawSignatureEnabled" DROP DEFAULT,
+ALTER COLUMN "uploadSignatureEnabled" DROP NOT NULL,
+ALTER COLUMN "uploadSignatureEnabled" DROP DEFAULT;
+
+-- [CUSTOM_CHANGE] Generate IDs for existing TeamGlobalSettings records. We link it later.
+UPDATE "TeamGlobalSettings" SET "id" = generate_prefix_id('team_setting') WHERE "id" IS NULL;
+
+-- [CUSTOM_CHANGE] Make the id column NOT NULL and add primary key
+ALTER TABLE "TeamGlobalSettings"
+ALTER COLUMN "id" SET NOT NULL,
+ADD CONSTRAINT "TeamGlobalSettings_pkey" PRIMARY KEY ("id");
+
+-- AlterTable
+ALTER TABLE "Template" ALTER COLUMN "teamId" SET NOT NULL;
+
+-- AlterTable
+ALTER TABLE "User" DROP COLUMN "customerId";
+
+-- DropTable
+DROP TABLE "TeamMemberInvite";
+
+-- DropTable
+DROP TABLE "TeamPending";
+
+-- DropTable
+DROP TABLE "TeamTransferVerification";
+
+-- DropEnum
+DROP TYPE "TeamMemberInviteStatus";
+
+-- CreateTable
+CREATE TABLE "SubscriptionClaim" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "name" TEXT NOT NULL,
+    "locked" BOOLEAN NOT NULL DEFAULT false,
+    "teamCount" INTEGER NOT NULL,
+    "memberCount" INTEGER NOT NULL,
+    "flags" JSONB NOT NULL,
+
+    CONSTRAINT "SubscriptionClaim_pkey" PRIMARY KEY ("id")
+);
+
+-- Todo: orgs validate prior to release
+-- [CUSTOM_CHANGE] Insert default subscription claims
+INSERT INTO "SubscriptionClaim" ("id", "name", "locked", "teamCount", "memberCount", "flags", "createdAt", "updatedAt")
+VALUES
+  ('free', 'Free', true, 1, 1, '{}'::jsonb, NOW(), NOW()),
+  ('individual', 'Individual', true, 1, 1, '{"unlimitedDocuments": true}'::jsonb, NOW(), NOW()),
+  ('team', 'Teams', true, 1, 5, '{"unlimitedDocuments": true, "allowCustomBranding": true, "embedSigning": true}'::jsonb, NOW(), NOW()),
+  ('platform', 'Platform', true, 1, 0, '{"unlimitedDocuments": true, "allowCustomBranding": true, "hidePoweredBy": true, "embedAuthoring": false, "embedAuthoringWhiteLabel": true, "embedSigning": false, "embedSigningWhiteLabel": true}'::jsonb, NOW(), NOW()),
+  ('enterprise', 'Enterprise', true, 0, 0, '{"unlimitedDocuments": true, "allowCustomBranding": true, "hidePoweredBy": true, "embedAuthoring": true, "embedAuthoringWhiteLabel": true, "embedSigning": true, "embedSigningWhiteLabel": true, "cfr21": true}'::jsonb, NOW(), NOW()),
+  ('earlyAdopter', 'Early Adopter', true, 0, 0, '{"unlimitedDocuments": true, "allowCustomBranding": true, "hidePoweredBy": true, "embedSigning": true, "embedSigningWhiteLabel": true}'::jsonb, NOW(), NOW());
+
+-- CreateTable
+CREATE TABLE "OrganisationClaim" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "originalSubscriptionClaimId" TEXT,
+    "teamCount" INTEGER NOT NULL,
+    "memberCount" INTEGER NOT NULL,
+    "flags" JSONB NOT NULL,
+
+    CONSTRAINT "OrganisationClaim_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "Organisation" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "type" "OrganisationType" NOT NULL,
+    "name" TEXT NOT NULL,
+    "url" TEXT NOT NULL,
+    "avatarImageId" TEXT,
+    "customerId" TEXT,
+    "ownerUserId" INTEGER NOT NULL,
+    "organisationClaimId" TEXT, -- [CUSTOM_CHANGE] Is supposed to be NOT NULL (we reapply it at the end)
+    "organisationGlobalSettingsId" TEXT, -- [CUSTOM_CHANGE] Is supposed to be NOT NULL (we reapply it at the end)
+    "teamId" INTEGER, -- [CUSTOM_CHANGE] This is a temporary column for migration purposes.
+
+    CONSTRAINT "Organisation_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "OrganisationMember" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "userId" INTEGER NOT NULL,
+    "organisationId" TEXT NOT NULL,
+
+    CONSTRAINT "OrganisationMember_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "OrganisationMemberInvite" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "email" TEXT NOT NULL,
+    "token" TEXT NOT NULL,
+    "status" "OrganisationMemberInviteStatus" NOT NULL DEFAULT 'PENDING',
+    "organisationId" TEXT NOT NULL,
+    "organisationRole" "OrganisationMemberRole" NOT NULL,
+
+    CONSTRAINT "OrganisationMemberInvite_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "OrganisationGroup" (
+    "id" TEXT NOT NULL,
+    "name" TEXT,
+    "type" "OrganisationGroupType" NOT NULL,
+    "organisationRole" "OrganisationMemberRole" NOT NULL,
+    "organisationId" TEXT NOT NULL,
+
+    CONSTRAINT "OrganisationGroup_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "OrganisationGroupMember" (
+    "id" TEXT NOT NULL,
+    "groupId" TEXT NOT NULL,
+    "organisationMemberId" TEXT NOT NULL,
+
+    CONSTRAINT "OrganisationGroupMember_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "TeamGroup" (
+    "id" TEXT NOT NULL,
+    "organisationGroupId" TEXT NOT NULL,
+    "teamRole" "TeamMemberRole" NOT NULL,
+    "teamId" INTEGER NOT NULL,
+
+    CONSTRAINT "TeamGroup_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "OrganisationGlobalSettings" (
+    "id" TEXT NOT NULL,
+    "documentVisibility" "DocumentVisibility" NOT NULL DEFAULT 'EVERYONE',
+    "documentLanguage" TEXT NOT NULL DEFAULT 'en',
+    "includeSenderDetails" BOOLEAN NOT NULL DEFAULT true,
+    "includeSigningCertificate" BOOLEAN NOT NULL DEFAULT true,
+    "typedSignatureEnabled" BOOLEAN NOT NULL DEFAULT true,
+    "uploadSignatureEnabled" BOOLEAN NOT NULL DEFAULT true,
+    "drawSignatureEnabled" BOOLEAN NOT NULL DEFAULT true,
+    "brandingEnabled" BOOLEAN NOT NULL DEFAULT false,
+    "brandingLogo" TEXT NOT NULL DEFAULT '',
+    "brandingUrl" TEXT NOT NULL DEFAULT '',
+    "brandingCompanyDetails" TEXT NOT NULL DEFAULT '',
+    "organisationId" TEXT, -- [CUSTOM_CHANGE] This is a temporary column for migration purposes.
+
+    CONSTRAINT "OrganisationGlobalSettings_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Organisation_url_key" ON "Organisation"("url");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Organisation_customerId_key" ON "Organisation"("customerId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Organisation_organisationClaimId_key" ON "Organisation"("organisationClaimId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Organisation_organisationGlobalSettingsId_key" ON "Organisation"("organisationGlobalSettingsId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "OrganisationMember_userId_organisationId_key" ON "OrganisationMember"("userId", "organisationId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "OrganisationMemberInvite_token_key" ON "OrganisationMemberInvite"("token");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "OrganisationGroupMember_organisationMemberId_groupId_key" ON "OrganisationGroupMember"("organisationMemberId", "groupId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "TeamGroup_teamId_organisationGroupId_key" ON "TeamGroup"("teamId", "organisationGroupId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Subscription_organisationId_key" ON "Subscription"("organisationId");
+
+-- CreateIndex
+CREATE INDEX "Subscription_organisationId_idx" ON "Subscription"("organisationId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Team_teamGlobalSettingsId_key" ON "Team"("teamGlobalSettingsId");
+
+-- CreateIndex
+CREATE INDEX "Template_userId_idx" ON "Template"("userId");
+
+-- AddForeignKey
+ALTER TABLE "Subscription" ADD CONSTRAINT "Subscription_organisationId_fkey" FOREIGN KEY ("organisationId") REFERENCES "Organisation"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Document" ADD CONSTRAINT "Document_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Organisation" ADD CONSTRAINT "Organisation_organisationClaimId_fkey" FOREIGN KEY ("organisationClaimId") REFERENCES "OrganisationClaim"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Organisation" ADD CONSTRAINT "Organisation_avatarImageId_fkey" FOREIGN KEY ("avatarImageId") REFERENCES "AvatarImage"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Organisation" ADD CONSTRAINT "Organisation_ownerUserId_fkey" FOREIGN KEY ("ownerUserId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Organisation" ADD CONSTRAINT "Organisation_organisationGlobalSettingsId_fkey" FOREIGN KEY ("organisationGlobalSettingsId") REFERENCES "OrganisationGlobalSettings"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "OrganisationMember" ADD CONSTRAINT "OrganisationMember_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "OrganisationMember" ADD CONSTRAINT "OrganisationMember_organisationId_fkey" FOREIGN KEY ("organisationId") REFERENCES "Organisation"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "OrganisationMemberInvite" ADD CONSTRAINT "OrganisationMemberInvite_organisationId_fkey" FOREIGN KEY ("organisationId") REFERENCES "Organisation"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "OrganisationGroup" ADD CONSTRAINT "OrganisationGroup_organisationId_fkey" FOREIGN KEY ("organisationId") REFERENCES "Organisation"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "OrganisationGroupMember" ADD CONSTRAINT "OrganisationGroupMember_groupId_fkey" FOREIGN KEY ("groupId") REFERENCES "OrganisationGroup"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "OrganisationGroupMember" ADD CONSTRAINT "OrganisationGroupMember_organisationMemberId_fkey" FOREIGN KEY ("organisationMemberId") REFERENCES "OrganisationMember"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "TeamGroup" ADD CONSTRAINT "TeamGroup_organisationGroupId_fkey" FOREIGN KEY ("organisationGroupId") REFERENCES "OrganisationGroup"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "TeamGroup" ADD CONSTRAINT "TeamGroup_teamId_fkey" FOREIGN KEY ("teamId") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Team" ADD CONSTRAINT "Team_organisationId_fkey" FOREIGN KEY ("organisationId") REFERENCES "Organisation"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Team" ADD CONSTRAINT "Team_teamGlobalSettingsId_fkey" FOREIGN KEY ("teamGlobalSettingsId") REFERENCES "TeamGlobalSettings"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- [CUSTOM_CHANGE] FROM HERE ON IT'S ALL CUSTOM
+
+/*
+ * The current state of the migration is that:
+ * - All users have a team with their personal entities excluding subscriptions
+ * - All entities should be tied into teams
+ *
+ * Our goal is now to migrate organisations
+ *
+ * If subscription is attached to user account, that means it is either:
+ * - Individual
+ * - Platform
+ * - Enterprise
+ * - Early Adopter
+ *
+ * If subscription is attached to a team, that means it is:
+ * - Team
+ *
+ * Note: We will handle moving Individual plans into personal organisations as a part of a
+ * secondary migration script since we need the Stripe price IDs
+ *
+*/
+
+/*
+ * Handle creating free personal organisations
+ *
+ * Criteria for "personal team":
+ * - Team is "isPersonal" is true
+ */
+WITH personal_organisations AS (
+  INSERT INTO "Organisation" (
+    "id", "createdAt", "updatedAt", "type", "name", "url", "avatarImageId", "ownerUserId", "teamId", "customerId"
+  )
+  SELECT
+    generate_prefix_id('org'),
+    t."createdAt",
+    NOW(),
+    'PERSONAL'::"OrganisationType",
+    'Personal Organisation',
+    u."url",
+    t."avatarImageId",
+    t."ownerUserId",
+    t."id",
+    s."customerId"
+  FROM "Team" t
+  JOIN "User" u ON u."id" = t."ownerUserId"
+  LEFT JOIN "Subscription" s ON s."teamId" = t."id"
+  WHERE t."isPersonal"
+  RETURNING "id", "ownerUserId", "teamId", "customerId"
+)
+UPDATE "Team" t
+SET "organisationId" = o."id"
+FROM personal_organisations o
+WHERE o."teamId" = t."id";
+
+/*
+ * Handle creating organisations for teams with "teams plan" subscriptions
+ *
+ * Criteria for "teams plan" team:
+ * - Team has a subscription
+ */
+WITH team_plan_organisations AS (
+  INSERT INTO "Organisation" (
+    "id", "createdAt", "updatedAt", "type", "name", "url", "avatarImageId", "ownerUserId", "teamId", "customerId"
+  )
+  SELECT
+    generate_prefix_id('org'),
+    t."createdAt",
+    NOW(),
+    'ORGANISATION'::"OrganisationType",
+    t."name",
+    generate_id(),
+    t."avatarImageId",
+    t."ownerUserId",
+    t."id",
+    s."customerId"
+  FROM "Team" t
+  LEFT JOIN "Subscription" s ON s."teamId" = t."id"
+  WHERE s."teamId" IS NOT NULL
+  RETURNING "id", "ownerUserId", "teamId", "customerId"
+)
+UPDATE "Team" t
+SET "organisationId" = o."id"
+FROM team_plan_organisations o
+WHERE o."teamId" = t."id";
+
+/*
+ * Handle account level subscriptions
+ *
+ * Goal:
+ * - Create a single organisation for each user subscription
+ * - Move all non personal teams without subscriptions into the newly created organisation
+ * - Move user subscription to the organisation
+ *
+ * Plan:
+ * 1. Create organisation for every user who still has a subscription attached to the user
+ * 2. Find all teams that are not yet linked to an organisation
+ * 3. Link the team into the organisation of the owner which is NOT personal
+ *
+ */
+WITH users_to_migrate AS (
+  SELECT u."id" AS user_id, s."customerId" AS customer_id
+  FROM "User" u
+  JOIN "Subscription" s ON s."userId" = u."id"
+),
+new_orgs AS (
+  INSERT INTO "Organisation" (
+    "id", "createdAt", "updatedAt", "type", "name", "url", "ownerUserId", "customerId"
+  )
+  SELECT
+    generate_prefix_id('org'),
+    NOW(),
+    NOW(),
+    'ORGANISATION'::"OrganisationType",
+    'Organisation Name',
+    generate_id(),
+    u.user_id,
+    u.customer_id
+  FROM users_to_migrate u
+  RETURNING "id", "ownerUserId", "customerId"
+),
+update_teams AS (
+  UPDATE "Team" t
+  SET "organisationId" = o."id"
+  FROM new_orgs o
+  WHERE
+    t."ownerUserId" = o."ownerUserId"
+    AND t."organisationId" IS NULL
+    AND t."isPersonal" = FALSE
+)
+UPDATE "Subscription" s
+SET "organisationId" = o."id"
+FROM new_orgs o
+WHERE s."userId" = o."ownerUserId";
+
+-- Create 3 internal groups for each organisation (ADMIN, MANAGER, MEMBER)
+WITH org_groups AS (
+  SELECT
+    o.id as org_id,
+    unnest(ARRAY[
+      'ADMIN'::"OrganisationMemberRole",
+      'MANAGER'::"OrganisationMemberRole",
+      'MEMBER'::"OrganisationMemberRole"
+    ]) as role
+  FROM "Organisation" o
+)
+INSERT INTO "OrganisationGroup" ("id", "type", "organisationRole", "organisationId")
+SELECT
+  generate_prefix_id('org_group'),
+  'INTERNAL_ORGANISATION'::"OrganisationGroupType",
+  og.role,
+  og.org_id
+FROM org_groups og;
+
+-- Create TeamGlobalSettings for all teams that do not have a teamGlobalSettingsId
+INSERT INTO "TeamGlobalSettings" ("id", "teamId")
+SELECT
+  generate_prefix_id('team_setting'),
+  t."id"
+FROM "Team" t
+WHERE t."teamGlobalSettingsId" IS NULL;
+
+-- Update teams with their corresponding teamGlobalSettingsId
+UPDATE "Team" t
+SET "teamGlobalSettingsId" = tgs."id"
+FROM "TeamGlobalSettings" tgs
+WHERE tgs."teamId" = t."id" AND t."teamGlobalSettingsId" IS NULL;
+
+-- Create default OrganisationGlobalSettings for all organisations
+INSERT INTO "OrganisationGlobalSettings" ("id", "organisationId")
+SELECT
+  generate_prefix_id('org_setting'),
+  o."id"
+FROM "Organisation" o
+WHERE o."organisationGlobalSettingsId" IS NULL;
+
+-- Update organisations with their corresponding organisationGlobalSettingsId
+UPDATE "Organisation" o
+SET "organisationGlobalSettingsId" = ogs."id"
+FROM "OrganisationGlobalSettings" ogs
+WHERE ogs."organisationId" = o."id" AND o."organisationGlobalSettingsId" IS NULL;
+
+-- Create TeamGlobalSettings for all teams missing it
+WITH teams_to_update AS (
+  SELECT "id" AS team_id, generate_prefix_id('team_setting') AS settings_id
+  FROM "Team"
+  WHERE "teamGlobalSettingsId" IS NULL
+),
+new_team_settings AS (
+  INSERT INTO "TeamGlobalSettings" ("id")
+  SELECT settings_id FROM teams_to_update
+  RETURNING "id"
+)
+UPDATE "Team" t
+SET "teamGlobalSettingsId" = ttu.settings_id
+FROM teams_to_update ttu
+WHERE t."id" = ttu.team_id;
+
+-- Create OrganisationClaim for every organisation, use the default "FREE" claim
+WITH orgs_to_update AS (
+  SELECT "id" AS org_id, generate_prefix_id('org_claim') AS claim_id
+  FROM "Organisation"
+  WHERE "organisationClaimId" IS NULL
+),
+new_claims AS (
+  INSERT INTO "OrganisationClaim" (
+    "id",
+    "createdAt",
+    "updatedAt",
+    "originalSubscriptionClaimId",
+    "teamCount",
+    "memberCount",
+    "flags"
+  )
+  SELECT
+    claim_id,
+    now(),
+    now(),
+    'free',
+    1,
+    1,
+    '{}'::jsonb
+  FROM orgs_to_update
+  RETURNING "id" AS claim_id
+)
+UPDATE "Organisation" o
+SET "organisationClaimId" = otu.claim_id
+FROM orgs_to_update otu
+WHERE o."id" = otu.org_id;
+
+-- Create 2 TeamGroups to assign the internal Organisation Admin/Manager groups to teams
+WITH org_internal_groups AS (
+  SELECT
+    og.id as group_id,
+    og."organisationId",
+    og."organisationRole",
+    t.id as team_id
+  FROM "OrganisationGroup" og
+  JOIN "Team" t ON t."organisationId" = og."organisationId"
+  WHERE og.type = 'INTERNAL_ORGANISATION'
+  AND og."organisationRole" IN ('ADMIN', 'MANAGER')
+)
+INSERT INTO "TeamGroup" ("id", "teamId", "organisationGroupId", "teamRole")
+SELECT
+  generate_prefix_id('team_group'),
+  oig.team_id,
+  oig.group_id,
+  'ADMIN'::"TeamMemberRole" -- Org Admins/Managers will be Team ADMINS
+FROM org_internal_groups oig;
+
+-- Temp columns for the following procedure
+ALTER TABLE "OrganisationGroup" ADD COLUMN temp_team_id INT;
+ALTER TABLE "OrganisationGroup" ADD COLUMN temp_team_role TEXT;
+
+WITH team_internal_groups AS (
+  -- Step 1: Create all team+role combinations
+  SELECT
+      t.id as team_id,
+      t."organisationId",
+      unnest(ARRAY[
+        'ADMIN'::"TeamMemberRole",
+        'MANAGER'::"TeamMemberRole",
+        'MEMBER'::"TeamMemberRole"
+      ]) as team_role
+  FROM "Team" t
+),
+created_org_groups AS (
+  -- Step 2: Create OrganisationGroups with temp data
+  INSERT INTO "OrganisationGroup" (
+    "id",
+    "type",
+    "organisationRole",
+    "organisationId",
+    temp_team_id,
+    temp_team_role
+  )
+  SELECT
+    generate_prefix_id('org_group'),
+    'INTERNAL_TEAM'::"OrganisationGroupType",
+    'MEMBER'::"OrganisationMemberRole",
+    tig."organisationId",
+    tig.team_id,
+    tig.team_role::TEXT
+  FROM team_internal_groups tig
+  RETURNING "id", temp_team_id, temp_team_role
+)
+-- Step 3: Create TeamGroups using the temp data
+INSERT INTO "TeamGroup" ("id", "organisationGroupId", "teamRole", "teamId")
+SELECT
+  generate_prefix_id('team_group'),
+  cog."id",
+  cog.temp_team_role::"TeamMemberRole",
+  cog.temp_team_id
+FROM created_org_groups cog;
+
+-- Clean up temp columns
+ALTER TABLE "OrganisationGroup" DROP COLUMN temp_team_id;
+ALTER TABLE "OrganisationGroup" DROP COLUMN temp_team_role;
+
+-- Create OrganisationMembers for each unique user-organisation combination
+-- This ensures only one OrganisationMember per user per organisation, even if they belong to multiple teams
+INSERT INTO "OrganisationMember" ("id", "createdAt", "updatedAt", "userId", "organisationId")
+SELECT DISTINCT
+  generate_prefix_id('member'),
+  MIN(tm."createdAt"),
+  NOW(),
+  tm."userId",
+  t."organisationId"
+FROM "TeamMember" tm
+JOIN "Team" t ON t."id" = tm."teamId"
+GROUP BY tm."userId", t."organisationId";
+
+-- Create OrganisationMembers for Organisations with 0 members
+-- This can only occur for platform/enterprise/earlyAdopter/individual plans where they have 0 teams
+-- So we create an OrganisationMember for the owner user
+INSERT INTO "OrganisationMember" ("id", "createdAt", "updatedAt", "userId", "organisationId")
+SELECT
+  generate_prefix_id('member'),
+  NOW(),
+  NOW(),
+  o."ownerUserId",
+  o."id"
+FROM "Organisation" o
+WHERE o."id" NOT IN (SELECT "organisationId" FROM "OrganisationMember");
+
+-- Add users to the appropriate INTERNAL_TEAM groups based on their team membership and role
+-- This creates OrganisationGroupMember records to link users to their team-specific groups
+-- Skip organisation owners as they are handled separately
+INSERT INTO "OrganisationGroupMember" ("id", "groupId", "organisationMemberId")
+SELECT
+  generate_prefix_id('group_member'),
+  og."id",
+  om."id"
+FROM "TeamMember" tm
+JOIN "Team" t ON t."id" = tm."teamId"
+JOIN "Organisation" o ON o."id" = t."organisationId"
+JOIN "OrganisationMember" om ON om."userId" = tm."userId" AND om."organisationId" = t."organisationId"
+JOIN "TeamGroup" tg ON tg."teamId" = t."id" AND tg."teamRole" = tm."role"
+JOIN "OrganisationGroup" og ON og."id" = tg."organisationGroupId" AND og."type" = 'INTERNAL_TEAM'::"OrganisationGroupType"
+WHERE tm."userId" != o."ownerUserId";
+
+-- Add organisation owners to the INTERNAL_ORGANISATION ADMIN group
+INSERT INTO "OrganisationGroupMember" ("id", "groupId", "organisationMemberId")
+SELECT
+  generate_prefix_id('group_member'),
+  og."id",
+  om."id"
+FROM "Organisation" o
+JOIN "OrganisationMember" om ON om."organisationId" = o."id" AND om."userId" = o."ownerUserId"
+JOIN "OrganisationGroup" og ON og."organisationId" = o."id"
+  AND og."type" = 'INTERNAL_ORGANISATION'::"OrganisationGroupType"
+  AND og."organisationRole" = 'ADMIN'::"OrganisationMemberRole";
+
+-- Add all other organisation members to the INTERNAL_ORGANISATION MEMBER group
+INSERT INTO "OrganisationGroupMember" ("id", "groupId", "organisationMemberId")
+SELECT
+  generate_prefix_id('group_member'),
+  og."id",
+  om."id"
+FROM "Organisation" o
+JOIN "OrganisationMember" om ON om."organisationId" = o."id" AND om."userId" != o."ownerUserId"
+JOIN "OrganisationGroup" og ON og."organisationId" = o."id"
+  AND og."type" = 'INTERNAL_ORGANISATION'::"OrganisationGroupType"
+  AND og."organisationRole" = 'MEMBER'::"OrganisationMemberRole";
+
+-- Migrate team subscriptions to the organisation level
+UPDATE "Subscription" s
+SET "organisationId" = t."organisationId"
+FROM "Team" t
+WHERE s."teamId" = t."id" AND s."teamId" IS NOT NULL;
+
+-- Drop team member related entities (DropForeignKey/DropTable)
+ALTER TABLE "TeamMember" DROP CONSTRAINT "TeamMember_teamId_fkey";
+ALTER TABLE "TeamMember" DROP CONSTRAINT "TeamMember_userId_fkey";
+DROP TABLE "TeamMember";
+
+-- Drop temp columns
+ALTER TABLE "Organisation" DROP COLUMN "teamId";
+ALTER TABLE "Team" DROP COLUMN "isPersonal";
+ALTER TABLE "TeamGlobalSettings" DROP COLUMN "teamId";
+ALTER TABLE "OrganisationGlobalSettings" DROP COLUMN "organisationId";
+
+-- REAPPLY NOT NULL to any temporary nullable columns
+ALTER TABLE "Team" ALTER COLUMN "organisationId" SET NOT NULL;
+ALTER TABLE "Team" ALTER COLUMN "teamGlobalSettingsId" SET NOT NULL;
+ALTER TABLE "Subscription" ALTER COLUMN "organisationId" SET NOT NULL;
+ALTER TABLE "Organisation" ALTER COLUMN "organisationClaimId" SET NOT NULL;
+ALTER TABLE "Organisation" ALTER COLUMN "organisationGlobalSettingsId" SET NOT NULL;
+
+-- Drop columns
+ALTER TABLE "Team" DROP COLUMN "ownerUserId";
+ALTER TABLE "User" DROP COLUMN "url";
+ALTER TABLE "Subscription" DROP COLUMN "teamId";
+ALTER TABLE "Subscription" DROP COLUMN "userId";
diff --git a/packages/prisma/migrations/migration_lock.toml b/packages/prisma/migrations/migration_lock.toml
index fbffa92c2..044d57cdb 100644
--- a/packages/prisma/migrations/migration_lock.toml
+++ b/packages/prisma/migrations/migration_lock.toml
@@ -1,3 +1,3 @@
 # Please do not edit this file manually
-# It should be added in your version-control system (i.e. Git)
-provider = "postgresql"
\ No newline at end of file
+# It should be added in your version-control system (e.g., Git)
+provider = "postgresql"
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index 56558ad6c..d16fcd13d 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -39,7 +39,6 @@ enum Role {
 model User {
   id               Int              @id @default(autoincrement())
   name             String?
-  customerId       String?          @unique
   email            String           @unique
   emailVerified    DateTime?
   password         String? // Todo: (RR7) Remove after RR7 migration.
@@ -53,24 +52,23 @@ model User {
   avatarImageId    String?
   disabled         Boolean          @default(false)
 
-  accounts             Account[]
-  sessions             Session[]
-  documents            Document[]
-  folders              Folder[]
-  subscriptions        Subscription[]
-  passwordResetTokens  PasswordResetToken[]
-  ownedTeams           Team[]
-  ownedPendingTeams    TeamPending[]
-  teamMembers          TeamMember[]
-  twoFactorSecret      String?
-  twoFactorEnabled     Boolean              @default(false)
-  twoFactorBackupCodes String?
-  url                  String?              @unique
+  accounts            Account[]
+  sessions            Session[]
+  passwordResetTokens PasswordResetToken[]
+
+  ownedOrganisations Organisation[]
+  organisationMember OrganisationMember[]
+
+  twoFactorSecret      String?
+  twoFactorEnabled     Boolean @default(false)
+  twoFactorBackupCodes String?
+
+  folders   Folder[]
+  documents Document[]
+  templates Template[]
 
-  profile            UserProfile?
   verificationTokens VerificationToken[]
   apiTokens          ApiToken[]
-  templates          Template[]
   securityAuditLogs  UserSecurityAuditLog[]
   webhooks           Webhook[]
   siteSettings       SiteSettings[]
@@ -80,15 +78,6 @@ model User {
   @@index([email])
 }
 
-model UserProfile {
-  id      String  @id @default(cuid())
-  enabled Boolean @default(false)
-  userId  Int     @unique
-  bio     String?
-
-  User User? @relation(fields: [userId], references: [id], onDelete: Cascade)
-}
-
 model TeamProfile {
   id      String  @id @default(cuid())
   enabled Boolean @default(false)
@@ -191,8 +180,8 @@ model Webhook {
   updatedAt     DateTime               @default(now()) @updatedAt
   userId        Int
   user          User                   @relation(fields: [userId], references: [id], onDelete: Cascade)
-  teamId        Int?
-  team          Team?                  @relation(fields: [teamId], references: [id], onDelete: Cascade)
+  teamId        Int
+  team          Team                   @relation(fields: [teamId], references: [id], onDelete: Cascade)
   webhookCalls  WebhookCall[]
 }
 
@@ -228,8 +217,8 @@ model ApiToken {
   createdAt DateTime          @default(now())
   userId    Int?
   user      User?             @relation(fields: [userId], references: [id], onDelete: Cascade)
-  teamId    Int?
-  team      Team?             @relation(fields: [teamId], references: [id], onDelete: Cascade)
+  teamId    Int
+  team      Team              @relation(fields: [teamId], references: [id], onDelete: Cascade)
 }
 
 enum SubscriptionStatus {
@@ -244,16 +233,46 @@ model Subscription {
   planId            String             @unique
   priceId           String
   periodEnd         DateTime?
-  userId            Int?
-  teamId            Int?               @unique
   createdAt         DateTime           @default(now())
   updatedAt         DateTime           @updatedAt
   cancelAtPeriodEnd Boolean            @default(false)
 
-  team Team? @relation(fields: [teamId], references: [id], onDelete: Cascade)
-  user User? @relation(fields: [userId], references: [id], onDelete: Cascade)
+  customerId String
 
-  @@index([userId])
+  organisationId String       @unique
+  organisation   Organisation @relation(fields: [organisationId], references: [id], onDelete: Cascade)
+
+  @@index([organisationId])
+}
+
+/// @zod.import(["import { ZClaimFlagsSchema } from '@documenso/lib/types/subscription';"])
+model SubscriptionClaim {
+  id        String   @id @default(cuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  name   String
+  locked Boolean @default(false)
+
+  teamCount   Int
+  memberCount Int
+
+  flags Json /// [ClaimFlags] @zod.custom.use(ZClaimFlagsSchema)
+}
+
+/// @zod.import(["import { ZClaimFlagsSchema } from '@documenso/lib/types/subscription';"])
+model OrganisationClaim {
+  id        String   @id
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  originalSubscriptionClaimId String?
+  organisation                Organisation?
+
+  teamCount   Int
+  memberCount Int
+
+  flags Json /// [ClaimFlags] @zod.custom.use(ZClaimFlagsSchema)
 }
 
 model Account {
@@ -323,8 +342,8 @@ model Folder {
   name       String
   userId     Int
   user       User               @relation(fields: [userId], references: [id], onDelete: Cascade)
-  teamId     Int?
-  team       Team?              @relation(fields: [teamId], references: [id], onDelete: Cascade)
+  teamId     Int
+  team       Team               @relation(fields: [teamId], references: [id], onDelete: Cascade)
   pinned     Boolean            @default(false)
   parentId   String?
   parent     Folder?            @relation("FolderToFolder", fields: [parentId], references: [id], onDelete: Cascade)
@@ -344,11 +363,16 @@ model Folder {
 
 /// @zod.import(["import { ZDocumentAuthOptionsSchema } from '@documenso/lib/types/document-auth';", "import { ZDocumentFormValuesSchema } from '@documenso/lib/types/document-form-values';"])
 model Document {
-  id             Int                 @id @default(autoincrement())
-  qrToken        String? /// @zod.string.describe("The token for viewing the document using the QR code on the certificate.")
-  externalId     String? /// @zod.string.describe("A custom external ID you can use to identify the document.")
-  userId         Int /// @zod.number.describe("The ID of the user that created this document.")
-  user           User                @relation(fields: [userId], references: [id], onDelete: Cascade)
+  id         Int     @id @default(autoincrement())
+  qrToken    String? /// @zod.string.describe("The token for viewing the document using the QR code on the certificate.")
+  externalId String? /// @zod.string.describe("A custom external ID you can use to identify the document.")
+
+  userId Int /// @zod.number.describe("The ID of the user that created this document.")
+  user   User @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  teamId Int
+  team   Team @relation(fields: [teamId], references: [id], onDelete: Cascade)
+
   authOptions    Json? /// [DocumentAuthOptions] @zod.custom.use(ZDocumentAuthOptionsSchema)
   formValues     Json? /// [DocumentFormValues] @zod.custom.use(ZDocumentFormValuesSchema)
   visibility     DocumentVisibility  @default(EVERYONE)
@@ -363,14 +387,12 @@ model Document {
   updatedAt      DateTime            @default(now()) @updatedAt
   completedAt    DateTime?
   deletedAt      DateTime?
-  teamId         Int?
   templateId     Int?
   source         DocumentSource
 
   useLegacyFieldInsertion Boolean @default(false)
 
   documentData DocumentData @relation(fields: [documentDataId], references: [id], onDelete: Cascade)
-  team         Team?        @relation(fields: [teamId], references: [id])
   template     Template?    @relation(fields: [templateId], references: [id], onDelete: SetNull)
 
   auditLogs DocumentAuditLog[]
@@ -569,20 +591,141 @@ model DocumentShareLink {
   @@unique([documentId, email])
 }
 
+enum OrganisationType {
+  PERSONAL
+  ORGANISATION
+}
+
+model Organisation {
+  id        String   @id
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  type          OrganisationType
+  name          String
+  url           String           @unique
+  avatarImageId String?
+
+  customerId   String?       @unique
+  subscription Subscription?
+
+  organisationClaimId String            @unique
+  organisationClaim   OrganisationClaim @relation(fields: [organisationClaimId], references: [id])
+
+  members OrganisationMember[]
+  invites OrganisationMemberInvite[]
+  groups  OrganisationGroup[]
+
+  teams Team[]
+
+  avatarImage AvatarImage? @relation(fields: [avatarImageId], references: [id], onDelete: SetNull)
+
+  ownerUserId Int
+  owner       User @relation(fields: [ownerUserId], references: [id], onDelete: Cascade)
+
+  organisationGlobalSettingsId String                     @unique
+  organisationGlobalSettings   OrganisationGlobalSettings @relation(fields: [organisationGlobalSettingsId], references: [id])
+}
+
+model OrganisationMember {
+  id        String   @id
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  userId Int
+  user   User @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  organisationId String
+  organisation   Organisation @relation(fields: [organisationId], references: [id], onDelete: Cascade)
+
+  organisationGroupMembers OrganisationGroupMember[]
+
+  @@unique([userId, organisationId])
+}
+
+model OrganisationMemberInvite {
+  id        String   @id
+  createdAt DateTime @default(now())
+
+  email String
+  token String @unique
+
+  status OrganisationMemberInviteStatus @default(PENDING)
+
+  organisationId   String
+  organisation     Organisation           @relation(fields: [organisationId], references: [id], onDelete: Cascade)
+  organisationRole OrganisationMemberRole
+}
+
+model OrganisationGroup {
+  id   String  @id
+  name String?
+
+  type             OrganisationGroupType
+  organisationRole OrganisationMemberRole
+
+  organisationId String
+  organisation   Organisation @relation(fields: [organisationId], references: [id], onDelete: Cascade)
+
+  organisationGroupMembers OrganisationGroupMember[]
+
+  teamGroups TeamGroup[]
+}
+
+model OrganisationGroupMember {
+  id String @id
+
+  groupId String
+  group   OrganisationGroup @relation(fields: [groupId], references: [id], onDelete: Cascade)
+
+  organisationMember   OrganisationMember @relation(fields: [organisationMemberId], references: [id], onDelete: Cascade)
+  organisationMemberId String
+
+  @@unique([organisationMemberId, groupId])
+}
+
+model TeamGroup {
+  id String @id
+
+  organisationGroupId String
+  organisationGroup   OrganisationGroup @relation(fields: [organisationGroupId], references: [id], onDelete: Cascade)
+
+  teamRole TeamMemberRole
+
+  teamId Int
+  team   Team @relation(fields: [teamId], references: [id], onDelete: Cascade)
+
+  @@unique([teamId, organisationGroupId])
+}
+
+enum OrganisationGroupType {
+  INTERNAL_ORGANISATION
+  INTERNAL_TEAM
+  CUSTOM
+}
+
+enum OrganisationMemberRole {
+  ADMIN
+  MANAGER
+  MEMBER
+}
+
 enum TeamMemberRole {
   ADMIN
   MANAGER
   MEMBER
 }
 
-enum TeamMemberInviteStatus {
+enum OrganisationMemberInviteStatus {
   ACCEPTED
   PENDING
   DECLINED
 }
 
-model TeamGlobalSettings {
-  teamId                    Int                @unique
+model OrganisationGlobalSettings {
+  id           String        @id
+  organisation Organisation?
+
   documentVisibility        DocumentVisibility @default(EVERYONE)
   documentLanguage          String             @default("en")
   includeSenderDetails      Boolean            @default(true)
@@ -596,11 +739,25 @@ model TeamGlobalSettings {
   brandingLogo           String  @default("")
   brandingUrl            String  @default("")
   brandingCompanyDetails String  @default("")
-  brandingHidePoweredBy  Boolean @default(false)
+}
 
-  allowEmbeddedAuthoring Boolean @default(false)
+model TeamGlobalSettings {
+  id   String @id
+  team Team?
 
-  team Team @relation(fields: [teamId], references: [id], onDelete: Cascade)
+  documentVisibility        DocumentVisibility?
+  documentLanguage          String?
+  includeSenderDetails      Boolean?
+  includeSigningCertificate Boolean?
+
+  typedSignatureEnabled  Boolean?
+  uploadSignatureEnabled Boolean?
+  drawSignatureEnabled   Boolean?
+
+  brandingEnabled        Boolean?
+  brandingLogo           String?
+  brandingUrl            String?
+  brandingCompanyDetails String?
 }
 
 model Team {
@@ -609,49 +766,25 @@ model Team {
   url           String   @unique
   createdAt     DateTime @default(now())
   avatarImageId String?
-  customerId    String?  @unique
-  ownerUserId   Int
 
-  members              TeamMember[]
-  invites              TeamMemberInvite[]
-  teamEmail            TeamEmail?
-  emailVerification    TeamEmailVerification?
-  transferVerification TeamTransferVerification?
-  teamGlobalSettings   TeamGlobalSettings?
-  avatarImage          AvatarImage?              @relation(fields: [avatarImageId], references: [id], onDelete: SetNull)
+  teamEmail         TeamEmail?
+  emailVerification TeamEmailVerification?
+  avatarImage       AvatarImage?           @relation(fields: [avatarImageId], references: [id], onDelete: SetNull)
 
-  profile      TeamProfile?
-  owner        User          @relation(fields: [ownerUserId], references: [id], onDelete: Cascade)
-  subscription Subscription?
+  profile TeamProfile?
 
-  documents Document[]
-  templates Template[]
-  folders   Folder[]
-  apiTokens ApiToken[]
-  webhooks  Webhook[]
-}
+  documents  Document[]
+  templates  Template[]
+  folders    Folder[]
+  apiTokens  ApiToken[]
+  webhooks   Webhook[]
+  teamGroups TeamGroup[]
 
-model TeamPending {
-  id          Int      @id @default(autoincrement())
-  name        String
-  url         String   @unique
-  createdAt   DateTime @default(now())
-  customerId  String   @unique
-  ownerUserId Int
+  organisationId String
+  organisation   Organisation @relation(fields: [organisationId], references: [id], onDelete: Cascade)
 
-  owner User @relation(fields: [ownerUserId], references: [id], onDelete: Cascade)
-}
-
-model TeamMember {
-  id        Int            @id @default(autoincrement())
-  teamId    Int
-  createdAt DateTime       @default(now())
-  role      TeamMemberRole
-  userId    Int
-  user      User           @relation(fields: [userId], references: [id], onDelete: Cascade)
-  team      Team           @relation(fields: [teamId], references: [id], onDelete: Cascade)
-
-  @@unique([userId, teamId])
+  teamGlobalSettingsId String             @unique
+  teamGlobalSettings   TeamGlobalSettings @relation(fields: [teamGlobalSettingsId], references: [id], onDelete: Cascade)
 }
 
 model TeamEmail {
@@ -674,33 +807,6 @@ model TeamEmailVerification {
   team Team @relation(fields: [teamId], references: [id], onDelete: Cascade)
 }
 
-model TeamTransferVerification {
-  teamId              Int      @id @unique
-  userId              Int
-  name                String
-  email               String
-  token               String   @unique
-  completed           Boolean  @default(false)
-  expiresAt           DateTime
-  createdAt           DateTime @default(now())
-  clearPaymentMethods Boolean  @default(false)
-
-  team Team @relation(fields: [teamId], references: [id], onDelete: Cascade)
-}
-
-model TeamMemberInvite {
-  id        Int                    @id @default(autoincrement())
-  teamId    Int
-  createdAt DateTime               @default(now())
-  email     String
-  status    TeamMemberInviteStatus @default(PENDING)
-  role      TeamMemberRole
-  token     String                 @unique
-  team      Team                   @relation(fields: [teamId], references: [id], onDelete: Cascade)
-
-  @@unique([teamId, email])
-}
-
 enum TemplateType {
   PUBLIC
   PRIVATE
@@ -735,8 +841,6 @@ model Template {
   externalId             String?
   type                   TemplateType       @default(PRIVATE)
   title                  String
-  userId                 Int
-  teamId                 Int?
   visibility             DocumentVisibility @default(EVERYONE)
   authOptions            Json? /// [DocumentAuthOptions] @zod.custom.use(ZDocumentAuthOptionsSchema)
   templateMeta           TemplateMeta?
@@ -748,17 +852,24 @@ model Template {
 
   useLegacyFieldInsertion Boolean @default(false)
 
-  team                 Team?               @relation(fields: [teamId], references: [id], onDelete: Cascade)
-  templateDocumentData DocumentData        @relation(fields: [templateDocumentDataId], references: [id], onDelete: Cascade)
-  user                 User                @relation(fields: [userId], references: [id], onDelete: Cascade)
-  recipients           Recipient[]
-  fields               Field[]
-  directLink           TemplateDirectLink?
-  documents            Document[]
-  folder               Folder?             @relation(fields: [folderId], references: [id], onDelete: Cascade)
-  folderId             String?
+  userId Int
+  user   User @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  teamId Int
+  team   Team @relation(fields: [teamId], references: [id], onDelete: Cascade)
+
+  templateDocumentData DocumentData @relation(fields: [templateDocumentDataId], references: [id], onDelete: Cascade)
+
+  recipients Recipient[]
+  fields     Field[]
+  directLink TemplateDirectLink?
+  documents  Document[]
+
+  folder   Folder? @relation(fields: [folderId], references: [id], onDelete: Cascade)
+  folderId String?
 
   @@unique([templateDocumentDataId])
+  @@index([userId])
 }
 
 model TemplateDirectLink {
@@ -836,6 +947,7 @@ model AvatarImage {
   id    String @id @default(cuid())
   bytes String
 
-  team Team[]
-  user User[]
+  team         Team[]
+  user         User[]
+  organisation Organisation[]
 }
diff --git a/packages/prisma/seed/documents.ts b/packages/prisma/seed/documents.ts
index 6fe7958d9..4acda4662 100644
--- a/packages/prisma/seed/documents.ts
+++ b/packages/prisma/seed/documents.ts
@@ -27,6 +27,7 @@ const examplePdf = fs
 
 type DocumentToSeed = {
   sender: User;
+  teamId: number;
   recipients: (User | string)[];
   type: DocumentStatus;
   documentOptions?: Partial<Prisma.DocumentUncheckedCreateInput>;
@@ -38,19 +39,19 @@ export const seedDocuments = async (documents: DocumentToSeed[]) => {
     documents.map(async (document, i) =>
       match(document.type)
         .with(DocumentStatus.DRAFT, async () =>
-          seedDraftDocument(document.sender, document.recipients, {
+          seedDraftDocument(document.sender, document.teamId, document.recipients, {
             key: i,
             createDocumentOptions: document.documentOptions,
           }),
         )
         .with(DocumentStatus.PENDING, async () =>
-          seedPendingDocument(document.sender, document.recipients, {
+          seedPendingDocument(document.sender, document.teamId, document.recipients, {
             key: i,
             createDocumentOptions: document.documentOptions,
           }),
         )
         .with(DocumentStatus.COMPLETED, async () =>
-          seedCompletedDocument(document.sender, document.recipients, {
+          seedCompletedDocument(document.sender, document.teamId, document.recipients, {
             key: i,
             createDocumentOptions: document.documentOptions,
           }),
@@ -59,7 +60,11 @@ export const seedDocuments = async (documents: DocumentToSeed[]) => {
   );
 };
 
-export const seedBlankDocument = async (owner: User, options: CreateDocumentOptions = {}) => {
+export const seedBlankDocument = async (
+  owner: User,
+  teamId: number,
+  options: CreateDocumentOptions = {},
+) => {
   const { key, createDocumentOptions = {} } = options;
 
   const documentData = await prisma.documentData.create({
@@ -73,6 +78,7 @@ export const seedBlankDocument = async (owner: User, options: CreateDocumentOpti
   return await prisma.document.create({
     data: {
       source: DocumentSource.DOCUMENT,
+      teamId,
       title: `[TEST] Document ${key} - Draft`,
       status: DocumentStatus.DRAFT,
       documentDataId: documentData.id,
@@ -99,8 +105,23 @@ export const seedTeamDocumentWithMeta = async (team: Team) => {
     },
   });
 
+  const { organisation } = await prisma.team.findFirstOrThrow({
+    where: {
+      id: team.id,
+    },
+    include: {
+      organisation: {
+        include: {
+          owner: true,
+        },
+      },
+    },
+  });
+
+  const ownerUser = organisation.owner;
+
   const document = await createDocument({
-    userId: team.ownerUserId,
+    userId: ownerUser.id,
     teamId: team.id,
     title: `[TEST] Document ${nanoid(8)} - Draft`,
     documentDataId: documentData.id,
@@ -112,12 +133,6 @@ export const seedTeamDocumentWithMeta = async (team: Team) => {
     },
   });
 
-  const owner = await prisma.user.findFirstOrThrow({
-    where: {
-      id: team.ownerUserId,
-    },
-  });
-
   await prisma.document.update({
     where: {
       id: document.id,
@@ -129,8 +144,8 @@ export const seedTeamDocumentWithMeta = async (team: Team) => {
 
   await prisma.recipient.create({
     data: {
-      email: owner.email,
-      name: owner.name ?? '',
+      email: ownerUser.email,
+      name: ownerUser.name ?? '',
       token: nanoid(),
       readStatus: ReadStatus.OPENED,
       sendStatus: SendStatus.SENT,
@@ -176,23 +191,32 @@ export const seedTeamTemplateWithMeta = async (team: Team) => {
     },
   });
 
+  const { organisation } = await prisma.team.findFirstOrThrow({
+    where: {
+      id: team.id,
+    },
+    include: {
+      organisation: {
+        include: {
+          owner: true,
+        },
+      },
+    },
+  });
+
+  const ownerUser = organisation.owner;
+
   const template = await createTemplate({
     title: `[TEST] Template ${nanoid(8)} - Draft`,
-    userId: team.ownerUserId,
+    userId: ownerUser.id,
     teamId: team.id,
     templateDocumentDataId: documentData.id,
   });
 
-  const owner = await prisma.user.findFirstOrThrow({
-    where: {
-      id: team.ownerUserId,
-    },
-  });
-
   await prisma.recipient.create({
     data: {
-      email: owner.email,
-      name: owner.name ?? '',
+      email: ownerUser.email,
+      name: ownerUser.name ?? '',
       token: nanoid(),
       readStatus: ReadStatus.OPENED,
       sendStatus: SendStatus.SENT,
@@ -231,6 +255,7 @@ export const seedTeamTemplateWithMeta = async (team: Team) => {
 
 export const seedDraftDocument = async (
   sender: User,
+  teamId: number,
   recipients: (User | string)[],
   options: CreateDocumentOptions = {},
 ) => {
@@ -247,6 +272,7 @@ export const seedDraftDocument = async (
   const document = await prisma.document.create({
     data: {
       source: DocumentSource.DOCUMENT,
+      teamId,
       title: `[TEST] Document ${key} - Draft`,
       status: DocumentStatus.DRAFT,
       documentDataId: documentData.id,
@@ -300,6 +326,7 @@ type CreateDocumentOptions = {
 
 export const seedPendingDocument = async (
   sender: User,
+  teamId: number,
   recipients: (User | string)[],
   options: CreateDocumentOptions = {},
 ) => {
@@ -316,6 +343,7 @@ export const seedPendingDocument = async (
   const document = await prisma.document.create({
     data: {
       source: DocumentSource.DOCUMENT,
+      teamId,
       title: `[TEST] Document ${key} - Pending`,
       status: DocumentStatus.PENDING,
       documentDataId: documentData.id,
@@ -372,13 +400,15 @@ export const seedPendingDocument = async (
 export const seedPendingDocumentNoFields = async ({
   owner,
   recipients,
+  teamId,
   updateDocumentOptions,
 }: {
   owner: User;
   recipients: (User | string)[];
+  teamId: number;
   updateDocumentOptions?: Partial<Prisma.DocumentUncheckedUpdateInput>;
 }) => {
-  const document: Document = await seedBlankDocument(owner);
+  const document: Document = await seedBlankDocument(owner, teamId);
 
   for (const recipient of recipients) {
     const email = typeof recipient === 'string' ? recipient : recipient.email;
@@ -432,14 +462,16 @@ export const seedPendingDocumentWithFullFields = async ({
   recipientsCreateOptions,
   updateDocumentOptions,
   fields = [FieldType.DATE, FieldType.EMAIL, FieldType.NAME, FieldType.SIGNATURE, FieldType.TEXT],
+  teamId,
 }: {
   owner: User;
   recipients: (User | string)[];
   recipientsCreateOptions?: Partial<Prisma.RecipientCreateInput>[];
   updateDocumentOptions?: Partial<Prisma.DocumentUncheckedUpdateInput>;
   fields?: FieldType[];
+  teamId: number;
 }) => {
-  const document: Document = await seedBlankDocument(owner);
+  const document: Document = await seedBlankDocument(owner, teamId);
 
   for (const [recipientIndex, recipient] of recipients.entries()) {
     const email = typeof recipient === 'string' ? recipient : recipient.email;
@@ -509,6 +541,7 @@ export const seedPendingDocumentWithFullFields = async ({
 
 export const seedCompletedDocument = async (
   sender: User,
+  teamId: number,
   recipients: (User | string)[],
   options: CreateDocumentOptions = {},
 ) => {
@@ -525,6 +558,7 @@ export const seedCompletedDocument = async (
   const document = await prisma.document.create({
     data: {
       source: DocumentSource.DOCUMENT,
+      teamId,
       title: `[TEST] Document ${key} - Completed`,
       status: DocumentStatus.COMPLETED,
       documentDataId: documentData.id,
@@ -597,7 +631,7 @@ export const seedCompletedDocument = async (
  * - 5 All
  */
 export const seedTeamDocuments = async () => {
-  const team = await seedTeam({
+  const { team, owner, organisation } = await seedTeam({
     createTeamMembers: 4,
   });
 
@@ -605,17 +639,17 @@ export const seedTeamDocuments = async () => {
     teamId: team.id,
   };
 
-  const teamMember1 = team.members[1].user;
-  const teamMember2 = team.members[2].user;
-  const teamMember3 = team.members[3].user;
-  const teamMember4 = team.members[4].user;
+  const teamMember1 = organisation.members[1].user;
+  const teamMember2 = organisation.members[2].user;
+  const teamMember3 = organisation.members[3].user;
+  const teamMember4 = organisation.members[4].user;
 
-  const [testUser1, testUser2, testUser3, testUser4] = await Promise.all([
-    seedUser(),
-    seedUser(),
-    seedUser(),
-    seedUser(),
-  ]);
+  const [
+    { user: testUser1, team: testUser1Team },
+    { user: testUser2, team: testUser2Team },
+    { user: testUser3, team: testUser3Team },
+    { user: testUser4, team: testUser4Team },
+  ] = await Promise.all([seedUser(), seedUser(), seedUser(), seedUser()]);
 
   await seedDocuments([
     /**
@@ -623,30 +657,35 @@ export const seedTeamDocuments = async () => {
      */
     {
       sender: teamMember1,
+      teamId: team.id,
       recipients: [testUser1, testUser2],
       type: DocumentStatus.COMPLETED,
       documentOptions,
     },
     {
       sender: teamMember2,
+      teamId: team.id,
       recipients: [testUser1],
       type: DocumentStatus.PENDING,
       documentOptions,
     },
     {
       sender: teamMember2,
+      teamId: team.id,
       recipients: [testUser1, testUser2, testUser3, testUser4],
       type: DocumentStatus.PENDING,
       documentOptions,
     },
     {
       sender: teamMember2,
+      teamId: team.id,
       recipients: [testUser1, testUser2, teamMember1],
       type: DocumentStatus.DRAFT,
       documentOptions,
     },
     {
-      sender: team.owner,
+      sender: owner,
+      teamId: team.id,
       recipients: [testUser1, testUser2],
       type: DocumentStatus.DRAFT,
       documentOptions,
@@ -656,16 +695,19 @@ export const seedTeamDocuments = async () => {
      */
     {
       sender: teamMember1,
+      teamId: testUser3Team.id, // Not sure.
       recipients: [testUser1, testUser2],
       type: DocumentStatus.COMPLETED,
     },
     {
       sender: teamMember2,
+      teamId: testUser3Team.id, // Not sure.
       recipients: [testUser1],
       type: DocumentStatus.PENDING,
     },
     {
       sender: teamMember3,
+      teamId: testUser3Team.id, // Not sure.
       recipients: [testUser1, testUser2],
       type: DocumentStatus.DRAFT,
     },
@@ -674,16 +716,19 @@ export const seedTeamDocuments = async () => {
      */
     {
       sender: testUser1,
+      teamId: testUser1Team.id,
       recipients: [teamMember1, teamMember2],
       type: DocumentStatus.COMPLETED,
     },
     {
       sender: testUser2,
+      teamId: testUser2Team.id,
       recipients: [teamMember1],
       type: DocumentStatus.PENDING,
     },
     {
       sender: testUser3,
+      teamId: testUser3Team.id,
       recipients: [teamMember1, teamMember2],
       type: DocumentStatus.DRAFT,
     },
@@ -691,6 +736,7 @@ export const seedTeamDocuments = async () => {
 
   return {
     team,
+    teamOwner: owner,
     teamMember1,
     teamMember2,
     teamMember3,
diff --git a/packages/prisma/seed/folders.ts b/packages/prisma/seed/folders.ts
index d388eaca9..837ede0f6 100644
--- a/packages/prisma/seed/folders.ts
+++ b/packages/prisma/seed/folders.ts
@@ -1,33 +1,26 @@
 import type { User } from '@prisma/client';
-import { DocumentStatus, FolderType } from '@prisma/client';
+import { FolderType } from '@prisma/client';
 
 import { prisma } from '..';
 import type { Prisma } from '../client';
-import { seedDocuments } from './documents';
 
 type CreateFolderOptions = {
   type?: string;
   createFolderOptions?: Partial<Prisma.FolderUncheckedCreateInput>;
 };
 
-export const seedBlankFolder = async (user: User, options: CreateFolderOptions = {}) => {
+export const seedBlankFolder = async (
+  user: User,
+  teamId: number,
+  options: CreateFolderOptions = {},
+) => {
   return await prisma.folder.create({
     data: {
       name: 'My folder',
       userId: user.id,
+      teamId,
       type: FolderType.DOCUMENT,
       ...options.createFolderOptions,
     },
   });
 };
-
-export const seedFolderWithDocuments = async (user: User, options: CreateFolderOptions = {}) => {
-  const folder = await seedBlankFolder(user, options);
-  await seedDocuments([
-    {
-      sender: user,
-      recipients: [user],
-      type: DocumentStatus.DRAFT,
-    },
-  ]);
-};
diff --git a/packages/prisma/seed/initial-seed.ts b/packages/prisma/seed/initial-seed.ts
index 158b68475..cb99ef416 100644
--- a/packages/prisma/seed/initial-seed.ts
+++ b/packages/prisma/seed/initial-seed.ts
@@ -1,12 +1,11 @@
 import fs from 'node:fs';
 import path from 'node:path';
 
-import { hashSync } from '@documenso/lib/server-only/auth/hash';
-
 import { prisma } from '..';
-import { DocumentDataType, DocumentSource, Role, TeamMemberRole } from '../client';
+import { DocumentDataType, DocumentSource } from '../client';
 import { seedPendingDocument } from './documents';
 import { seedDirectTemplate, seedTemplate } from './templates';
+import { seedUser } from './users';
 
 const createDocumentData = async ({ documentData }: { documentData: string }) => {
   return prisma.documentData.create({
@@ -23,32 +22,31 @@ export const seedDatabase = async () => {
     .readFileSync(path.join(__dirname, '../../../assets/example.pdf'))
     .toString('base64');
 
-  const exampleUser = await prisma.user.upsert({
+  const exampleUserExists = await prisma.user.findFirst({
     where: {
       email: 'example@documenso.com',
     },
-    create: {
-      name: 'Example User',
-      email: 'example@documenso.com',
-      emailVerified: new Date(),
-      password: hashSync('password'),
-      roles: [Role.USER],
-    },
-    update: {},
   });
 
-  const adminUser = await prisma.user.upsert({
+  const adminUserExists = await prisma.user.findFirst({
     where: {
       email: 'admin@documenso.com',
     },
-    create: {
-      name: 'Admin User',
-      email: 'admin@documenso.com',
-      emailVerified: new Date(),
-      password: hashSync('password'),
-      roles: [Role.USER, Role.ADMIN],
-    },
-    update: {},
+  });
+
+  if (exampleUserExists || adminUserExists) {
+    return;
+  }
+
+  const exampleUser = await seedUser({
+    name: 'Example User',
+    email: 'example@documenso.com',
+  });
+
+  const adminUser = await seedUser({
+    name: 'Admin User',
+    email: 'admin@documenso.com',
+    isAdmin: true,
   });
 
   for (let i = 1; i <= 4; i++) {
@@ -59,11 +57,12 @@ export const seedDatabase = async () => {
         source: DocumentSource.DOCUMENT,
         title: `Example Document ${i}`,
         documentDataId: documentData.id,
-        userId: exampleUser.id,
+        userId: exampleUser.user.id,
+        teamId: exampleUser.team.id,
         recipients: {
           create: {
-            name: String(adminUser.name),
-            email: adminUser.email,
+            name: String(adminUser.user.name),
+            email: adminUser.user.email,
             token: Math.random().toString(36).slice(2, 9),
           },
         },
@@ -79,11 +78,12 @@ export const seedDatabase = async () => {
         source: DocumentSource.DOCUMENT,
         title: `Document ${i}`,
         documentDataId: documentData.id,
-        userId: adminUser.id,
+        userId: adminUser.user.id,
+        teamId: adminUser.team.id,
         recipients: {
           create: {
-            name: String(exampleUser.name),
-            email: exampleUser.email,
+            name: String(exampleUser.user.name),
+            email: exampleUser.user.email,
             token: Math.random().toString(36).slice(2, 9),
           },
         },
@@ -91,14 +91,14 @@ export const seedDatabase = async () => {
     });
   }
 
-  await seedPendingDocument(exampleUser, [adminUser], {
+  await seedPendingDocument(exampleUser.user, exampleUser.team.id, [adminUser.user], {
     key: 'example-pending',
     createDocumentOptions: {
       title: 'Pending Document',
     },
   });
 
-  await seedPendingDocument(adminUser, [exampleUser], {
+  await seedPendingDocument(adminUser.user, adminUser.team.id, [exampleUser.user], {
     key: 'admin-pending',
     createDocumentOptions: {
       title: 'Pending Document',
@@ -108,80 +108,24 @@ export const seedDatabase = async () => {
   await Promise.all([
     seedTemplate({
       title: 'Template 1',
-      userId: exampleUser.id,
+      userId: exampleUser.user.id,
+      teamId: exampleUser.team.id,
     }),
     seedDirectTemplate({
       title: 'Direct Template 1',
-      userId: exampleUser.id,
+      userId: exampleUser.user.id,
+      teamId: exampleUser.team.id,
     }),
 
     seedTemplate({
       title: 'Template 1',
-      userId: adminUser.id,
+      userId: adminUser.user.id,
+      teamId: adminUser.team.id,
     }),
     seedDirectTemplate({
       title: 'Direct Template 1',
-      userId: adminUser.id,
+      userId: adminUser.user.id,
+      teamId: adminUser.team.id,
     }),
   ]);
-
-  const testUsers = [
-    'test@documenso.com',
-    'test2@documenso.com',
-    'test3@documenso.com',
-    'test4@documenso.com',
-  ];
-
-  const createdUsers = [];
-
-  for (const email of testUsers) {
-    const testUser = await prisma.user.upsert({
-      where: {
-        email: email,
-      },
-      create: {
-        name: 'Test User',
-        email: email,
-        emailVerified: new Date(),
-        password: hashSync('password'),
-        roles: [Role.USER],
-      },
-      update: {},
-    });
-
-    createdUsers.push(testUser);
-  }
-
-  const team1 = await prisma.team.create({
-    data: {
-      name: 'Team 1',
-      url: 'team1',
-      ownerUserId: createdUsers[0].id,
-    },
-  });
-
-  const team2 = await prisma.team.create({
-    data: {
-      name: 'Team 2',
-      url: 'team2',
-      ownerUserId: createdUsers[1].id,
-    },
-  });
-
-  for (const team of [team1, team2]) {
-    await prisma.teamMember.createMany({
-      data: [
-        {
-          teamId: team.id,
-          userId: createdUsers[1].id,
-          role: TeamMemberRole.ADMIN,
-        },
-        {
-          teamId: team.id,
-          userId: createdUsers[2].id,
-          role: TeamMemberRole.MEMBER,
-        },
-      ],
-    });
-  }
 };
diff --git a/packages/prisma/seed/organisations.ts b/packages/prisma/seed/organisations.ts
new file mode 100644
index 000000000..89ece9960
--- /dev/null
+++ b/packages/prisma/seed/organisations.ts
@@ -0,0 +1,101 @@
+import type { OrganisationMemberRole, OrganisationType } from '@prisma/client';
+import { OrganisationMemberInviteStatus, type User } from '@prisma/client';
+import { nanoid } from 'nanoid';
+
+import { hashSync } from '@documenso/lib/server-only/auth/hash';
+import { acceptOrganisationInvitation } from '@documenso/lib/server-only/organisation/accept-organisation-invitation';
+import { prefixedId } from '@documenso/lib/universal/id';
+
+import { prisma } from '..';
+import { seedTestEmail } from './users';
+
+export const seedOrganisationMembers = async ({
+  members,
+  organisationId,
+}: {
+  members: {
+    email?: string;
+    name?: string;
+    organisationRole: OrganisationMemberRole;
+  }[];
+  organisationId: string;
+}) => {
+  const membersToInvite: {
+    email: string;
+    organisationRole: OrganisationMemberRole;
+  }[] = [];
+
+  const createdMembers: User[] = [];
+
+  for (const member of members) {
+    const email = member.email ?? seedTestEmail();
+
+    let newUser = await prisma.user.findFirst({
+      where: {
+        email: email.toLowerCase(),
+      },
+    });
+
+    if (!newUser) {
+      newUser = await prisma.user.create({
+        data: {
+          name: member.name ?? 'Test user',
+          email: email.toLowerCase(),
+          password: hashSync('password'),
+          emailVerified: new Date(),
+        },
+      });
+    }
+
+    createdMembers.push(newUser);
+
+    membersToInvite.push({
+      email: newUser.email,
+      organisationRole: member.organisationRole,
+    });
+  }
+
+  await prisma.organisationMemberInvite.createMany({
+    data: membersToInvite.map((invite) => ({
+      id: prefixedId('member_invite'),
+      email: invite.email,
+      organisationId,
+      organisationRole: invite.organisationRole,
+      token: nanoid(32),
+    })),
+  });
+
+  const invites = await prisma.organisationMemberInvite.findMany({
+    where: {
+      organisationId,
+      status: OrganisationMemberInviteStatus.PENDING,
+    },
+  });
+
+  await Promise.all(
+    invites.map(async (invite) => {
+      await acceptOrganisationInvitation({
+        token: invite.token,
+      });
+    }),
+  );
+
+  return createdMembers;
+};
+
+export const setOrganisationType = async ({
+  organisationId,
+  type,
+}: {
+  organisationId: string;
+  type: OrganisationType;
+}) => {
+  await prisma.organisation.update({
+    where: {
+      id: organisationId,
+    },
+    data: {
+      type,
+    },
+  });
+};
diff --git a/packages/prisma/seed/subscriptions.ts b/packages/prisma/seed/subscriptions.ts
deleted file mode 100644
index 8e237299f..000000000
--- a/packages/prisma/seed/subscriptions.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { prisma } from '..';
-
-export const seedTestEmail = () => `user-${Date.now()}@test.documenso.com`;
-
-type SeedSubscriptionOptions = {
-  userId: number;
-  priceId: string;
-};
-
-export const seedUserSubscription = async ({ userId, priceId }: SeedSubscriptionOptions) => {
-  return await prisma.subscription.create({
-    data: {
-      userId,
-      planId: Date.now().toString(),
-      priceId,
-      status: 'ACTIVE',
-    },
-  });
-};
diff --git a/packages/prisma/seed/teams.ts b/packages/prisma/seed/teams.ts
index 503e5b3cf..707f1edbf 100644
--- a/packages/prisma/seed/teams.ts
+++ b/packages/prisma/seed/teams.ts
@@ -1,8 +1,11 @@
 import { customAlphabet } from 'nanoid';
 
+import { createTeamMembers } from '@documenso/trpc/server/team-router/create-team-members';
+
 import { prisma } from '..';
 import type { Prisma } from '../client';
-import { TeamMemberInviteStatus, TeamMemberRole } from '../client';
+import { OrganisationMemberRole, TeamMemberRole } from '../client';
+import { seedOrganisationMembers } from './organisations';
 import { seedUser } from './users';
 
 const EMAIL_DOMAIN = `test.documenso.com`;
@@ -19,63 +22,54 @@ export const seedTeam = async ({
   createTeamEmail,
   createTeamOptions = {},
 }: SeedTeamOptions = {}) => {
-  const teamUrl = `team-${nanoid()}`;
-  const teamEmail = createTeamEmail === true ? `${teamUrl}@${EMAIL_DOMAIN}` : createTeamEmail;
-
-  const teamOwner = await seedUser({
-    name: `${teamUrl}-original-owner`,
-    email: `${teamUrl}-original-owner@${EMAIL_DOMAIN}`,
+  const {
+    user: owner,
+    team: seededTeam,
+    organisation: seededOrganisation,
+  } = await seedUser({
+    name: 'Owner',
+    teamEmail: createTeamEmail === true ? `${nanoid()}@${EMAIL_DOMAIN}` : createTeamEmail,
   });
 
-  const teamMembers = await Promise.all(
-    Array.from({ length: createTeamMembers }).map(async (_, i) => {
-      return seedUser({
-        name: `${teamUrl}-member-${i + 1}`,
-        email: `${teamUrl}-member-${i + 1}@${EMAIL_DOMAIN}`,
-      });
-    }),
-  );
+  const teamUrl = seededTeam.url;
 
-  const team = await prisma.team.create({
-    data: {
-      name: teamUrl,
-      url: teamUrl,
-      ownerUserId: teamOwner.id,
-      members: {
-        createMany: {
-          data: [teamOwner, ...teamMembers].map((user) => ({
-            userId: user.id,
-            role: user === teamOwner ? TeamMemberRole.ADMIN : TeamMemberRole.MEMBER,
-          })),
-        },
-      },
-      teamEmail: teamEmail
-        ? {
-            create: {
-              email: teamEmail,
-              name: teamEmail,
-            },
-          }
-        : undefined,
-      ...createTeamOptions,
-    },
+  await seedOrganisationMembers({
+    members: Array.from({ length: createTeamMembers }).map((_, i) => ({
+      name: `${teamUrl}-member-${i + 1}`,
+      email: `${teamUrl}-member-${i + 1}@${EMAIL_DOMAIN}`,
+      organisationRole: OrganisationMemberRole.MEMBER,
+    })),
+    organisationId: seededOrganisation.id,
   });
 
-  return await prisma.team.findFirstOrThrow({
+  const team = await prisma.team.findFirstOrThrow({
     where: {
-      id: team.id,
+      id: seededTeam.id,
+    },
+    include: {
+      teamEmail: true,
+      teamGlobalSettings: true,
+    },
+  });
+
+  const organisation = await prisma.organisation.findFirstOrThrow({
+    where: {
+      id: seededOrganisation.id,
     },
     include: {
-      owner: true,
       members: {
         include: {
           user: true,
         },
       },
-      teamEmail: true,
-      teamGlobalSettings: true,
     },
   });
+
+  return {
+    owner,
+    team,
+    organisation,
+  };
 };
 
 export const unseedTeam = async (teamUrl: string) => {
@@ -83,9 +77,6 @@ export const unseedTeam = async (teamUrl: string) => {
     where: {
       url: teamUrl,
     },
-    include: {
-      members: true,
-    },
   });
 
   if (!team) {
@@ -97,14 +88,6 @@ export const unseedTeam = async (teamUrl: string) => {
       url: teamUrl,
     },
   });
-
-  await prisma.user.deleteMany({
-    where: {
-      id: {
-        in: team.members.map((member) => member.userId),
-      },
-    },
-  });
 };
 
 type SeedTeamMemberOptions = {
@@ -118,48 +101,49 @@ export const seedTeamMember = async ({
   name,
   role = TeamMemberRole.ADMIN,
 }: SeedTeamMemberOptions) => {
-  const user = await seedUser({ name });
+  const { user } = await seedUser({ name });
 
-  await prisma.teamMember.create({
-    data: {
-      teamId,
-      role,
-      userId: user.id,
+  const team = await prisma.team.findFirstOrThrow({
+    where: {
+      id: teamId,
     },
+    include: {
+      organisation: true,
+    },
+  });
+
+  await seedOrganisationMembers({
+    members: [
+      {
+        name: user.name ?? '',
+        email: user.email,
+        organisationRole: OrganisationMemberRole.MEMBER,
+      },
+    ],
+    organisationId: team.organisationId,
+  });
+
+  const { id: organisationMemberId } = await prisma.organisationMember.findFirstOrThrow({
+    where: {
+      userId: user.id,
+      organisationId: team.organisationId,
+    },
+  });
+
+  await createTeamMembers({
+    userId: team.organisation.ownerUserId,
+    teamId,
+    membersToCreate: [
+      {
+        organisationMemberId,
+        teamRole: role,
+      },
+    ],
   });
 
   return user;
 };
 
-type UnseedTeamMemberOptions = {
-  teamId: number;
-  userId: number;
-};
-
-export const unseedTeamMember = async ({ teamId, userId }: UnseedTeamMemberOptions) => {
-  await prisma.teamMember.delete({
-    where: {
-      userId_teamId: {
-        userId,
-        teamId,
-      },
-    },
-  });
-};
-
-export const seedTeamTransfer = async (options: { newOwnerUserId: number; teamId: number }) => {
-  return await prisma.teamTransferVerification.create({
-    data: {
-      teamId: options.teamId,
-      token: Date.now().toString(),
-      expiresAt: new Date(Date.now() + 1000 * 60 * 60 * 24),
-      userId: options.newOwnerUserId,
-      name: '',
-      email: '',
-    },
-  });
-};
-
 export const seedTeamEmail = async ({ email, teamId }: { email: string; teamId: number }) => {
   return await prisma.teamEmail.create({
     data: {
@@ -178,26 +162,6 @@ export const unseedTeamEmail = async ({ teamId }: { teamId: number }) => {
   });
 };
 
-export const seedTeamInvite = async ({
-  email,
-  teamId,
-  role = TeamMemberRole.ADMIN,
-}: {
-  email: string;
-  teamId: number;
-  role?: TeamMemberRole;
-}) => {
-  return await prisma.teamMemberInvite.create({
-    data: {
-      email,
-      teamId,
-      role,
-      status: TeamMemberInviteStatus.PENDING,
-      token: Date.now().toString(),
-    },
-  });
-};
-
 export const seedTeamEmailVerification = async ({
   email,
   teamId,
diff --git a/packages/prisma/seed/templates.ts b/packages/prisma/seed/templates.ts
index 33d61442c..ebd17826b 100644
--- a/packages/prisma/seed/templates.ts
+++ b/packages/prisma/seed/templates.ts
@@ -17,7 +17,7 @@ const examplePdf = fs
 type SeedTemplateOptions = {
   title?: string;
   userId: number;
-  teamId?: number;
+  teamId: number;
   createTemplateOptions?: Partial<Prisma.TemplateCreateInput>;
 };
 
@@ -26,7 +26,11 @@ type CreateTemplateOptions = {
   createTemplateOptions?: Partial<Prisma.TemplateUncheckedCreateInput>;
 };
 
-export const seedBlankTemplate = async (owner: User, options: CreateTemplateOptions = {}) => {
+export const seedBlankTemplate = async (
+  owner: User,
+  teamId: number,
+  options: CreateTemplateOptions = {},
+) => {
   const { key, createTemplateOptions = {} } = options;
 
   const documentData = await prisma.documentData.create({
@@ -40,6 +44,7 @@ export const seedBlankTemplate = async (owner: User, options: CreateTemplateOpti
   return await prisma.template.create({
     data: {
       title: `[TEST] Template ${key}`,
+      teamId,
       templateDocumentDataId: documentData.id,
       userId: owner.id,
       ...createTemplateOptions,
@@ -82,15 +87,11 @@ export const seedTemplate = async (options: SeedTemplateOptions) => {
           role: RecipientRole.SIGNER,
         },
       },
-      ...(teamId
-        ? {
-            team: {
-              connect: {
-                id: teamId,
-              },
-            },
-          }
-        : {}),
+      team: {
+        connect: {
+          id: teamId,
+        },
+      },
     },
   });
 };
@@ -126,15 +127,11 @@ export const seedDirectTemplate = async (options: SeedTemplateOptions) => {
           token: Math.random().toString().slice(2, 7),
         },
       },
-      ...(teamId
-        ? {
-            team: {
-              connect: {
-                id: teamId,
-              },
-            },
-          }
-        : {}),
+      team: {
+        connect: {
+          id: teamId,
+        },
+      },
       ...options.createTemplateOptions,
     },
     include: {
diff --git a/packages/prisma/seed/users.ts b/packages/prisma/seed/users.ts
index 73f1cb157..7776fcff8 100644
--- a/packages/prisma/seed/users.ts
+++ b/packages/prisma/seed/users.ts
@@ -1,14 +1,22 @@
+import { OrganisationType, Role } from '@prisma/client';
 import { customAlphabet } from 'nanoid';
 
 import { hashSync } from '@documenso/lib/server-only/auth/hash';
+import { createPersonalOrganisation } from '@documenso/lib/server-only/organisation/create-organisation';
 
 import { prisma } from '..';
+import { setOrganisationType } from './organisations';
 
 type SeedUserOptions = {
   name?: string;
   email?: string;
   password?: string;
   verified?: boolean;
+  setTeamEmailAsOwner?: boolean;
+  teamEmail?: string;
+  inheritMembers?: boolean;
+  isAdmin?: boolean;
+  isPersonalOrganisation?: boolean;
 };
 
 const nanoid = customAlphabet('1234567890abcdef', 10);
@@ -16,33 +24,77 @@ const nanoid = customAlphabet('1234567890abcdef', 10);
 export const seedTestEmail = () => `${nanoid()}@test.documenso.com`;
 
 export const seedUser = async ({
-  name,
+  name = nanoid(),
   email,
   password = 'password',
   verified = true,
+  setTeamEmailAsOwner = false,
+  teamEmail = '',
+  inheritMembers = true,
+  isAdmin = false,
+  isPersonalOrganisation = false,
 }: SeedUserOptions = {}) => {
-  let url = name;
-
-  if (name) {
-    url = nanoid();
-  } else {
-    name = nanoid();
-    url = name;
-  }
-
   if (!email) {
     email = `${nanoid()}@test.documenso.com`;
   }
 
-  return await prisma.user.create({
+  const user = await prisma.user.create({
     data: {
       name,
-      email,
+      email: email.toLowerCase(),
       password: hashSync(password),
       emailVerified: verified ? new Date() : undefined,
-      url,
+      roles: isAdmin ? [Role.USER, Role.ADMIN] : [Role.USER],
     },
   });
+
+  await createPersonalOrganisation({
+    userId: user.id,
+    inheritMembers,
+    type: isPersonalOrganisation ? OrganisationType.PERSONAL : OrganisationType.ORGANISATION,
+  });
+
+  const organisation = await prisma.organisation.findFirstOrThrow({
+    where: {
+      ownerUserId: user.id,
+    },
+    include: {
+      teams: true,
+    },
+  });
+
+  if (setTeamEmailAsOwner) {
+    await prisma.teamEmail.create({
+      data: {
+        name: '',
+        teamId: organisation.teams[0].id,
+        email: user.email,
+      },
+    });
+  }
+
+  if (teamEmail) {
+    await prisma.teamEmail.create({
+      data: {
+        name: '',
+        teamId: organisation.teams[0].id,
+        email: teamEmail,
+      },
+    });
+  }
+
+  if (!isPersonalOrganisation) {
+    await setOrganisationType({
+      organisationId: organisation.id,
+      type: OrganisationType.ORGANISATION,
+    });
+  }
+
+  return {
+    user,
+    organisation,
+    team: organisation.teams[0],
+  };
 };
 
 export const unseedUser = async (userId: number) => {
diff --git a/packages/prisma/types/types.d.ts b/packages/prisma/types/types.d.ts
index 4cdd6278b..3b12e3efc 100644
--- a/packages/prisma/types/types.d.ts
+++ b/packages/prisma/types/types.d.ts
@@ -6,12 +6,15 @@ import type {
 import type { TDocumentEmailSettings } from '@documenso/lib/types/document-email';
 import type { TDocumentFormValues } from '@documenso/lib/types/document-form-values';
 import type { TFieldMetaNotOptionalSchema } from '@documenso/lib/types/field-meta';
+import type { TClaimFlags } from '@documenso/lib/types/subscription';
 
 /**
  * Global types for Prisma.Json instances.
  */
 declare global {
   namespace PrismaJson {
+    type ClaimFlags = TClaimFlags;
+
     type DocumentFormValues = TDocumentFormValues;
     type DocumentAuthOptions = TDocumentAuthOptions;
     type DocumentEmailSettings = TDocumentEmailSettings;
diff --git a/packages/trpc/server/admin-router/create-admin-organisation.ts b/packages/trpc/server/admin-router/create-admin-organisation.ts
new file mode 100644
index 000000000..1b7c4660d
--- /dev/null
+++ b/packages/trpc/server/admin-router/create-admin-organisation.ts
@@ -0,0 +1,28 @@
+import { OrganisationType } from '@prisma/client';
+
+import { createOrganisation } from '@documenso/lib/server-only/organisation/create-organisation';
+import { internalClaims } from '@documenso/lib/types/subscription';
+
+import { adminProcedure } from '../trpc';
+import {
+  ZCreateAdminOrganisationRequestSchema,
+  ZCreateAdminOrganisationResponseSchema,
+} from './create-admin-organisation.types';
+
+export const createAdminOrganisationRoute = adminProcedure
+  .input(ZCreateAdminOrganisationRequestSchema)
+  .output(ZCreateAdminOrganisationResponseSchema)
+  .mutation(async ({ input }) => {
+    const { ownerUserId, data } = input;
+
+    const organisation = await createOrganisation({
+      userId: ownerUserId,
+      name: data.name,
+      type: OrganisationType.ORGANISATION,
+      claim: internalClaims.free,
+    });
+
+    return {
+      organisationId: organisation.id,
+    };
+  });
diff --git a/packages/trpc/server/admin-router/create-admin-organisation.types.ts b/packages/trpc/server/admin-router/create-admin-organisation.types.ts
new file mode 100644
index 000000000..7c142bba6
--- /dev/null
+++ b/packages/trpc/server/admin-router/create-admin-organisation.types.ts
@@ -0,0 +1,16 @@
+import { z } from 'zod';
+
+import { ZOrganisationNameSchema } from '../organisation-router/create-organisation.types';
+
+export const ZCreateAdminOrganisationRequestSchema = z.object({
+  ownerUserId: z.number(),
+  data: z.object({
+    name: ZOrganisationNameSchema,
+  }),
+});
+
+export const ZCreateAdminOrganisationResponseSchema = z.object({
+  organisationId: z.string(),
+});
+
+export type TCreateAdminOrganisationRequest = z.infer<typeof ZCreateAdminOrganisationRequestSchema>;
diff --git a/packages/trpc/server/admin-router/create-stripe-customer.ts b/packages/trpc/server/admin-router/create-stripe-customer.ts
new file mode 100644
index 000000000..7e68e6eaa
--- /dev/null
+++ b/packages/trpc/server/admin-router/create-stripe-customer.ts
@@ -0,0 +1,50 @@
+import { createCustomer } from '@documenso/ee/server-only/stripe/create-customer';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { prisma } from '@documenso/prisma';
+
+import { adminProcedure } from '../trpc';
+import {
+  ZCreateStripeCustomerRequestSchema,
+  ZCreateStripeCustomerResponseSchema,
+} from './create-stripe-customer.types';
+
+export const createStripeCustomerRoute = adminProcedure
+  .input(ZCreateStripeCustomerRequestSchema)
+  .output(ZCreateStripeCustomerResponseSchema)
+  .mutation(async ({ input }) => {
+    const { organisationId } = input;
+
+    const organisation = await prisma.organisation.findUnique({
+      where: {
+        id: organisationId,
+      },
+      include: {
+        owner: {
+          select: {
+            email: true,
+            name: true,
+          },
+        },
+      },
+    });
+
+    if (!organisation) {
+      throw new AppError(AppErrorCode.NOT_FOUND);
+    }
+
+    await prisma.$transaction(async (tx) => {
+      const stripeCustomer = await createCustomer({
+        name: organisation.name,
+        email: organisation.owner.email,
+      });
+
+      await tx.organisation.update({
+        where: {
+          id: organisationId,
+        },
+        data: {
+          customerId: stripeCustomer.id,
+        },
+      });
+    });
+  });
diff --git a/packages/trpc/server/admin-router/create-stripe-customer.types.ts b/packages/trpc/server/admin-router/create-stripe-customer.types.ts
new file mode 100644
index 000000000..1904bca26
--- /dev/null
+++ b/packages/trpc/server/admin-router/create-stripe-customer.types.ts
@@ -0,0 +1,9 @@
+import { z } from 'zod';
+
+export const ZCreateStripeCustomerRequestSchema = z.object({
+  organisationId: z.string().describe('The organisation to attach the customer to'),
+});
+
+export const ZCreateStripeCustomerResponseSchema = z.void();
+
+export type TCreateStripeCustomerRequest = z.infer<typeof ZCreateStripeCustomerRequestSchema>;
diff --git a/packages/trpc/server/admin-router/create-subscription-claim.ts b/packages/trpc/server/admin-router/create-subscription-claim.ts
new file mode 100644
index 000000000..92fcbe0f5
--- /dev/null
+++ b/packages/trpc/server/admin-router/create-subscription-claim.ts
@@ -0,0 +1,23 @@
+import { prisma } from '@documenso/prisma';
+
+import { adminProcedure } from '../trpc';
+import {
+  ZCreateSubscriptionClaimRequestSchema,
+  ZCreateSubscriptionClaimResponseSchema,
+} from './create-subscription-claim.types';
+
+export const createSubscriptionClaimRoute = adminProcedure
+  .input(ZCreateSubscriptionClaimRequestSchema)
+  .output(ZCreateSubscriptionClaimResponseSchema)
+  .mutation(async ({ input }) => {
+    const { name, teamCount, memberCount, flags } = input;
+
+    await prisma.subscriptionClaim.create({
+      data: {
+        name,
+        teamCount,
+        memberCount,
+        flags,
+      },
+    });
+  });
diff --git a/packages/trpc/server/admin-router/create-subscription-claim.types.ts b/packages/trpc/server/admin-router/create-subscription-claim.types.ts
new file mode 100644
index 000000000..779e7e58a
--- /dev/null
+++ b/packages/trpc/server/admin-router/create-subscription-claim.types.ts
@@ -0,0 +1,14 @@
+import { z } from 'zod';
+
+import { ZClaimFlagsSchema } from '@documenso/lib/types/subscription';
+
+export const ZCreateSubscriptionClaimRequestSchema = z.object({
+  name: z.string().min(1),
+  teamCount: z.number().int().min(0),
+  memberCount: z.number().int().min(0),
+  flags: ZClaimFlagsSchema,
+});
+
+export const ZCreateSubscriptionClaimResponseSchema = z.void();
+
+export type TCreateSubscriptionClaimRequest = z.infer<typeof ZCreateSubscriptionClaimRequestSchema>;
diff --git a/packages/trpc/server/admin-router/delete-subscription-claim.ts b/packages/trpc/server/admin-router/delete-subscription-claim.ts
new file mode 100644
index 000000000..41a3b93a8
--- /dev/null
+++ b/packages/trpc/server/admin-router/delete-subscription-claim.ts
@@ -0,0 +1,37 @@
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { prisma } from '@documenso/prisma';
+
+import { adminProcedure } from '../trpc';
+import {
+  ZDeleteSubscriptionClaimRequestSchema,
+  ZDeleteSubscriptionClaimResponseSchema,
+} from './delete-subscription-claim.types';
+
+export const deleteSubscriptionClaimRoute = adminProcedure
+  .input(ZDeleteSubscriptionClaimRequestSchema)
+  .output(ZDeleteSubscriptionClaimResponseSchema)
+  .mutation(async ({ input }) => {
+    const { id } = input;
+
+    const existingClaim = await prisma.subscriptionClaim.findFirst({
+      where: {
+        id,
+      },
+    });
+
+    if (!existingClaim) {
+      throw new AppError(AppErrorCode.NOT_FOUND, { message: 'Subscription claim not found' });
+    }
+
+    if (existingClaim.locked) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'Cannot delete locked subscription claim',
+      });
+    }
+
+    await prisma.subscriptionClaim.delete({
+      where: {
+        id,
+      },
+    });
+  });
diff --git a/packages/trpc/server/admin-router/delete-subscription-claim.types.ts b/packages/trpc/server/admin-router/delete-subscription-claim.types.ts
new file mode 100644
index 000000000..122be091a
--- /dev/null
+++ b/packages/trpc/server/admin-router/delete-subscription-claim.types.ts
@@ -0,0 +1,9 @@
+import { z } from 'zod';
+
+export const ZDeleteSubscriptionClaimRequestSchema = z.object({
+  id: z.string().cuid(),
+});
+
+export const ZDeleteSubscriptionClaimResponseSchema = z.void();
+
+export type TDeleteSubscriptionClaimRequest = z.infer<typeof ZDeleteSubscriptionClaimRequestSchema>;
diff --git a/packages/trpc/server/admin-router/find-admin-organisations.ts b/packages/trpc/server/admin-router/find-admin-organisations.ts
new file mode 100644
index 000000000..e1a47566c
--- /dev/null
+++ b/packages/trpc/server/admin-router/find-admin-organisations.ts
@@ -0,0 +1,160 @@
+import { Prisma } from '@prisma/client';
+
+import type { FindResultResponse } from '@documenso/lib/types/search-params';
+import { prisma } from '@documenso/prisma';
+
+import { adminProcedure } from '../trpc';
+import {
+  ZFindAdminOrganisationsRequestSchema,
+  ZFindAdminOrganisationsResponseSchema,
+} from './find-admin-organisations.types';
+
+export const findAdminOrganisationsRoute = adminProcedure
+  .input(ZFindAdminOrganisationsRequestSchema)
+  .output(ZFindAdminOrganisationsResponseSchema)
+  .query(async ({ input }) => {
+    const { query, page, perPage, ownerUserId, memberUserId } = input;
+
+    return await findAdminOrganisations({
+      query,
+      page,
+      perPage,
+      ownerUserId,
+      memberUserId,
+    });
+  });
+
+type FindAdminOrganisationsOptions = {
+  query?: string;
+  page?: number;
+  perPage?: number;
+  ownerUserId?: number;
+  memberUserId?: number;
+};
+
+export const findAdminOrganisations = async ({
+  query,
+  page = 1,
+  perPage = 10,
+  ownerUserId,
+  memberUserId,
+}: FindAdminOrganisationsOptions) => {
+  let whereClause: Prisma.OrganisationWhereInput = {};
+
+  if (query) {
+    whereClause = {
+      OR: [
+        {
+          id: {
+            contains: query,
+            mode: Prisma.QueryMode.insensitive,
+          },
+        },
+        {
+          owner: {
+            email: {
+              contains: query,
+              mode: Prisma.QueryMode.insensitive,
+            },
+          },
+        },
+        {
+          customerId: {
+            contains: query,
+            mode: Prisma.QueryMode.insensitive,
+          },
+        },
+        {
+          name: {
+            contains: query,
+            mode: Prisma.QueryMode.insensitive,
+          },
+        },
+      ],
+    };
+  }
+
+  if (query && query.startsWith('claim:')) {
+    whereClause = {
+      organisationClaim: {
+        originalSubscriptionClaimId: {
+          contains: query.slice(6),
+          mode: Prisma.QueryMode.insensitive,
+        },
+      },
+    };
+  }
+
+  if (query && query.startsWith('org_')) {
+    whereClause = {
+      OR: [
+        {
+          id: {
+            equals: query,
+            mode: Prisma.QueryMode.insensitive,
+          },
+        },
+        {
+          url: {
+            equals: query,
+            mode: Prisma.QueryMode.insensitive,
+          },
+        },
+      ],
+    };
+  }
+
+  if (ownerUserId) {
+    whereClause = {
+      ...whereClause,
+      ownerUserId,
+    };
+  }
+
+  if (memberUserId) {
+    whereClause = {
+      ...whereClause,
+      members: {
+        some: { userId: memberUserId },
+      },
+    };
+  }
+
+  const [data, count] = await Promise.all([
+    prisma.organisation.findMany({
+      where: whereClause,
+      skip: Math.max(page - 1, 0) * perPage,
+      take: perPage,
+      orderBy: {
+        createdAt: 'desc',
+      },
+      select: {
+        id: true,
+        createdAt: true,
+        updatedAt: true,
+        name: true,
+        url: true,
+        customerId: true,
+        owner: {
+          select: {
+            id: true,
+            email: true,
+            name: true,
+          },
+        },
+        subscription: true,
+      },
+    }),
+    prisma.organisation.count({
+      where: whereClause,
+    }),
+  ]);
+
+  return {
+    data,
+    count,
+    currentPage: Math.max(page, 1),
+    perPage,
+    totalPages: Math.ceil(count / perPage),
+  } satisfies FindResultResponse<typeof data>;
+};
diff --git a/packages/trpc/server/admin-router/find-admin-organisations.types.ts b/packages/trpc/server/admin-router/find-admin-organisations.types.ts
new file mode 100644
index 000000000..2d447f959
--- /dev/null
+++ b/packages/trpc/server/admin-router/find-admin-organisations.types.ts
@@ -0,0 +1,42 @@
+import { z } from 'zod';
+
+import { ZFindResultResponse, ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
+import OrganisationSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationSchema';
+import SubscriptionSchema from '@documenso/prisma/generated/zod/modelSchema/SubscriptionSchema';
+import UserSchema from '@documenso/prisma/generated/zod/modelSchema/UserSchema';
+
+export const ZFindAdminOrganisationsRequestSchema = ZFindSearchParamsSchema.extend({
+  ownerUserId: z.number().optional(),
+  memberUserId: z.number().optional(),
+});
+
+export const ZFindAdminOrganisationsResponseSchema = ZFindResultResponse.extend({
+  data: OrganisationSchema.pick({
+    id: true,
+    createdAt: true,
+    updatedAt: true,
+    name: true,
+    url: true,
+    customerId: true,
+  })
+    .extend({
+      owner: UserSchema.pick({
+        id: true,
+        email: true,
+        name: true,
+      }),
+      subscription: SubscriptionSchema.pick({
+        status: true,
+        id: true,
+        planId: true,
+        priceId: true,
+        periodEnd: true,
+        createdAt: true,
+        updatedAt: true,
+        cancelAtPeriodEnd: true,
+      }).nullable(),
+    })
+    .array(),
+});
+
+export type TFindAdminOrganisationsResponse = z.infer<typeof ZFindAdminOrganisationsResponseSchema>;
diff --git a/packages/trpc/server/admin-router/find-subscription-claims.ts b/packages/trpc/server/admin-router/find-subscription-claims.ts
new file mode 100644
index 000000000..cae1738dc
--- /dev/null
+++ b/packages/trpc/server/admin-router/find-subscription-claims.ts
@@ -0,0 +1,76 @@
+import type { Prisma } from '@prisma/client';
+import type { z } from 'zod';
+
+import type { FindResultResponse } from '@documenso/lib/types/search-params';
+import { prisma } from '@documenso/prisma';
+import type SubscriptionClaimSchema from '@documenso/prisma/generated/zod/modelSchema/SubscriptionClaimSchema';
+
+import { adminProcedure } from '../trpc';
+import {
+  ZFindSubscriptionClaimsRequestSchema,
+  ZFindSubscriptionClaimsResponseSchema,
+} from './find-subscription-claims.types';
+
+export const findSubscriptionClaimsRoute = adminProcedure
+  .input(ZFindSubscriptionClaimsRequestSchema)
+  .output(ZFindSubscriptionClaimsResponseSchema)
+  .query(async ({ input }) => {
+    const { query, page, perPage } = input;
+
+    return await findSubscriptionClaims({ query, page, perPage });
+  });
+
+type FindSubscriptionClaimsOptions = {
+  query?: string;
+  page?: number;
+  perPage?: number;
+};
+
+export const findSubscriptionClaims = async ({
+  query,
+  page = 1,
+  perPage = 50,
+}: FindSubscriptionClaimsOptions) => {
+  let whereClause: Prisma.SubscriptionClaimWhereInput = {};
+
+  if (query) {
+    whereClause = {
+      OR: [
+        {
+          id: {
+            contains: query,
+            mode: 'insensitive',
+          },
+        },
+        {
+          name: {
+            contains: query,
+            mode: 'insensitive',
+          },
+        },
+      ],
+    };
+  }
+
+  const [data, count] = await Promise.all([
+    prisma.subscriptionClaim.findMany({
+      where: whereClause,
+      skip: Math.max(page - 1, 0) * perPage,
+      take: perPage,
+      orderBy: {
+        name: 'asc',
+      },
+    }),
+    prisma.subscriptionClaim.count({
+      where: whereClause,
+    }),
+  ]);
+
+  return {
+    data,
+    count,
+    currentPage: Math.max(page, 1),
+    perPage,
+    totalPages: Math.ceil(count / perPage),
+  } satisfies FindResultResponse<z.infer<typeof SubscriptionClaimSchema>[]>;
+};
diff --git a/packages/trpc/server/admin-router/find-subscription-claims.types.ts b/packages/trpc/server/admin-router/find-subscription-claims.types.ts
new file mode 100644
index 000000000..9c7576dc9
--- /dev/null
+++ b/packages/trpc/server/admin-router/find-subscription-claims.types.ts
@@ -0,0 +1,22 @@
+import type { z } from 'zod';
+
+import { ZFindResultResponse, ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
+import SubscriptionClaimSchema from '@documenso/prisma/generated/zod/modelSchema/SubscriptionClaimSchema';
+
+export const ZFindSubscriptionClaimsRequestSchema = ZFindSearchParamsSchema.extend({});
+
+export const ZFindSubscriptionClaimsResponseSchema = ZFindResultResponse.extend({
+  data: SubscriptionClaimSchema.pick({
+    id: true,
+    createdAt: true,
+    updatedAt: true,
+    name: true,
+    teamCount: true,
+    memberCount: true,
+    locked: true,
+    flags: true,
+  }).array(),
+});
+
+export type TFindSubscriptionClaimsRequest = z.infer<typeof ZFindSubscriptionClaimsRequestSchema>;
+export type TFindSubscriptionClaimsResponse = z.infer<typeof ZFindSubscriptionClaimsResponseSchema>;
diff --git a/packages/trpc/server/admin-router/get-admin-organisation.ts b/packages/trpc/server/admin-router/get-admin-organisation.ts
new file mode 100644
index 000000000..d7ef4fd23
--- /dev/null
+++ b/packages/trpc/server/admin-router/get-admin-organisation.ts
@@ -0,0 +1,56 @@
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { prisma } from '@documenso/prisma';
+
+import { adminProcedure } from '../trpc';
+import {
+  ZGetAdminOrganisationRequestSchema,
+  ZGetAdminOrganisationResponseSchema,
+} from './get-admin-organisation.types';
+
+export const getAdminOrganisationRoute = adminProcedure
+  .input(ZGetAdminOrganisationRequestSchema)
+  .output(ZGetAdminOrganisationResponseSchema)
+  .query(async ({ input }) => {
+    const { organisationId } = input;
+
+    return await getAdminOrganisation({
+      organisationId,
+    });
+  });
+
+type GetOrganisationOptions = {
+  organisationId: string;
+};
+
+export const getAdminOrganisation = async ({ organisationId }: GetOrganisationOptions) => {
+  const organisation = await prisma.organisation.findFirst({
+    where: {
+      id: organisationId,
+    },
+    include: {
+      organisationClaim: true,
+      organisationGlobalSettings: true,
+      teams: true,
+      members: {
+        include: {
+          user: {
+            select: {
+              id: true,
+              email: true,
+              name: true,
+            },
+          },
+        },
+      },
+      subscription: true,
+    },
+  });
+
+  if (!organisation) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Organisation not found',
+    });
+  }
+
+  return organisation;
+};
diff --git a/packages/trpc/server/admin-router/get-admin-organisation.types.ts b/packages/trpc/server/admin-router/get-admin-organisation.types.ts
new file mode 100644
index 000000000..8491003f9
--- /dev/null
+++ b/packages/trpc/server/admin-router/get-admin-organisation.types.ts
@@ -0,0 +1,38 @@
+import { z } from 'zod';
+
+import { ZOrganisationSchema } from '@documenso/lib/types/organisation';
+import OrganisationClaimSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationClaimSchema';
+import OrganisationGlobalSettingsSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationGlobalSettingsSchema';
+import OrganisationMemberSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationMemberSchema';
+import SubscriptionSchema from '@documenso/prisma/generated/zod/modelSchema/SubscriptionSchema';
+import TeamSchema from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
+import UserSchema from '@documenso/prisma/generated/zod/modelSchema/UserSchema';
+
+export const ZGetAdminOrganisationRequestSchema = z.object({
+  organisationId: z.string(),
+});
+
+export const ZGetAdminOrganisationResponseSchema = ZOrganisationSchema.extend({
+  organisationGlobalSettings: OrganisationGlobalSettingsSchema,
+  teams: z.array(
+    TeamSchema.pick({
+      id: true,
+      name: true,
+      url: true,
+      createdAt: true,
+      avatarImageId: true,
+      organisationId: true,
+    }),
+  ),
+  members: OrganisationMemberSchema.extend({
+    user: UserSchema.pick({
+      id: true,
+      email: true,
+      name: true,
+    }),
+  }).array(),
+  subscription: SubscriptionSchema.nullable(),
+  organisationClaim: OrganisationClaimSchema,
+});
+
+export type TGetAdminOrganisationResponse = z.infer<typeof ZGetAdminOrganisationResponseSchema>;
diff --git a/packages/trpc/server/admin-router/router.ts b/packages/trpc/server/admin-router/router.ts
index d4a0c712d..08b49b38e 100644
--- a/packages/trpc/server/admin-router/router.ts
+++ b/packages/trpc/server/admin-router/router.ts
@@ -14,6 +14,13 @@ import { getUserById } from '@documenso/lib/server-only/user/get-user-by-id';
 import { isDocumentCompleted } from '@documenso/lib/utils/document';
 
 import { adminProcedure, router } from '../trpc';
+import { createAdminOrganisationRoute } from './create-admin-organisation';
+import { createStripeCustomerRoute } from './create-stripe-customer';
+import { createSubscriptionClaimRoute } from './create-subscription-claim';
+import { deleteSubscriptionClaimRoute } from './delete-subscription-claim';
+import { findAdminOrganisationsRoute } from './find-admin-organisations';
+import { findSubscriptionClaimsRoute } from './find-subscription-claims';
+import { getAdminOrganisationRoute } from './get-admin-organisation';
 import {
   ZAdminDeleteDocumentMutationSchema,
   ZAdminDeleteUserMutationSchema,
@@ -25,8 +32,27 @@ import {
   ZAdminUpdateRecipientMutationSchema,
   ZAdminUpdateSiteSettingMutationSchema,
 } from './schema';
+import { updateAdminOrganisationRoute } from './update-admin-organisation';
+import { updateSubscriptionClaimRoute } from './update-subscription-claim';
 
 export const adminRouter = router({
+  organisation: {
+    find: findAdminOrganisationsRoute,
+    get: getAdminOrganisationRoute,
+    create: createAdminOrganisationRoute,
+    update: updateAdminOrganisationRoute,
+  },
+  claims: {
+    find: findSubscriptionClaimsRoute,
+    create: createSubscriptionClaimRoute,
+    update: updateSubscriptionClaimRoute,
+    delete: deleteSubscriptionClaimRoute,
+  },
+  stripe: {
+    createCustomer: createStripeCustomerRoute,
+  },
+
+  // Todo: migrate old routes
   findDocuments: adminProcedure.input(ZAdminFindDocumentsQuerySchema).query(async ({ input }) => {
     const { query, page, perPage } = input;
 
diff --git a/packages/trpc/server/admin-router/update-admin-organisation.ts b/packages/trpc/server/admin-router/update-admin-organisation.ts
new file mode 100644
index 000000000..25665a97b
--- /dev/null
+++ b/packages/trpc/server/admin-router/update-admin-organisation.ts
@@ -0,0 +1,51 @@
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { prisma } from '@documenso/prisma';
+
+import { adminProcedure } from '../trpc';
+import {
+  ZUpdateAdminOrganisationRequestSchema,
+  ZUpdateAdminOrganisationResponseSchema,
+} from './update-admin-organisation.types';
+
+export const updateAdminOrganisationRoute = adminProcedure
+  .input(ZUpdateAdminOrganisationRequestSchema)
+  .output(ZUpdateAdminOrganisationResponseSchema)
+  .mutation(async ({ input }) => {
+    const { organisationId, data } = input;
+
+    const organisation = await prisma.organisation.findUnique({
+      where: {
+        id: organisationId,
+      },
+      include: {
+        organisationClaim: true,
+      },
+    });
+
+    if (!organisation) {
+      throw new AppError(AppErrorCode.NOT_FOUND);
+    }
+
+    const { name, url, customerId, claims, originalSubscriptionClaimId } = data;
+
+    await prisma.organisation.update({
+      where: {
+        id: organisationId,
+      },
+      data: {
+        name,
+        url,
+        customerId: customerId ? customerId : undefined,
+      },
+    });
+
+    await prisma.organisationClaim.update({
+      where: {
+        id: organisation.organisationClaimId,
+      },
+      data: {
+        ...claims,
+        originalSubscriptionClaimId,
+      },
+    });
+  });
diff --git a/packages/trpc/server/admin-router/update-admin-organisation.types.ts b/packages/trpc/server/admin-router/update-admin-organisation.types.ts
new file mode 100644
index 000000000..cb89bf609
--- /dev/null
+++ b/packages/trpc/server/admin-router/update-admin-organisation.types.ts
@@ -0,0 +1,24 @@
+import { z } from 'zod';
+
+import { ZOrganisationNameSchema } from '../organisation-router/create-organisation.types';
+import { ZTeamUrlSchema } from '../team-router/schema';
+import { ZCreateSubscriptionClaimRequestSchema } from './create-subscription-claim.types';
+
+export const ZUpdateAdminOrganisationRequestSchema = z.object({
+  organisationId: z.string(),
+  data: z.object({
+    name: ZOrganisationNameSchema.optional(),
+    url: ZTeamUrlSchema.optional(),
+    claims: ZCreateSubscriptionClaimRequestSchema.pick({
+      teamCount: true,
+      memberCount: true,
+      flags: true,
+    }).optional(),
+    customerId: z.string().optional(),
+    originalSubscriptionClaimId: z.string().optional(),
+  }),
+});
+
+export const ZUpdateAdminOrganisationResponseSchema = z.void();
+
+export type TUpdateAdminOrganisationRequest = z.infer<typeof ZUpdateAdminOrganisationRequestSchema>;
diff --git a/packages/trpc/server/admin-router/update-subscription-claim.ts b/packages/trpc/server/admin-router/update-subscription-claim.ts
new file mode 100644
index 000000000..e3c1072f6
--- /dev/null
+++ b/packages/trpc/server/admin-router/update-subscription-claim.ts
@@ -0,0 +1,65 @@
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { jobsClient } from '@documenso/lib/jobs/client';
+import type { TClaimFlags } from '@documenso/lib/types/subscription';
+import { prisma } from '@documenso/prisma';
+
+import { adminProcedure } from '../trpc';
+import {
+  ZUpdateSubscriptionClaimRequestSchema,
+  ZUpdateSubscriptionClaimResponseSchema,
+} from './update-subscription-claim.types';
+
+export const updateSubscriptionClaimRoute = adminProcedure
+  .input(ZUpdateSubscriptionClaimRequestSchema)
+  .output(ZUpdateSubscriptionClaimResponseSchema)
+  .mutation(async ({ input }) => {
+    const { id, data } = input;
+
+    const existingClaim = await prisma.subscriptionClaim.findUnique({
+      where: { id },
+    });
+
+    if (!existingClaim) {
+      throw new AppError(AppErrorCode.NOT_FOUND, { message: 'Subscription claim not found' });
+    }
+
+    const newlyEnabledFlags = getNewTruthyFlags(existingClaim.flags, data.flags);
+
+    await prisma.$transaction(async (tx) => {
+      await tx.subscriptionClaim.update({
+        where: {
+          id,
+        },
+        data,
+      });
+
+      if (Object.keys(newlyEnabledFlags).length > 0) {
+        await jobsClient.triggerJob({
+          name: 'internal.backport-subscription-claims',
+          payload: {
+            subscriptionClaimId: id,
+            flags: newlyEnabledFlags,
+          },
+        });
+      }
+    });
+  });
+
+function getNewTruthyFlags(
+  a: Partial<TClaimFlags>,
+  b: Partial<TClaimFlags>,
+): Record<keyof TClaimFlags, true> {
+  const flags: { [key in keyof TClaimFlags]?: true } = {};
+
+  for (const key in b) {
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    const typedKey = key as keyof TClaimFlags;
+
+    if (b[typedKey] === true && a[typedKey] !== true) {
+      flags[typedKey] = true;
+    }
+  }
+
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return flags as Record<keyof TClaimFlags, true>;
+}
diff --git a/packages/trpc/server/admin-router/update-subscription-claim.types.ts b/packages/trpc/server/admin-router/update-subscription-claim.types.ts
new file mode 100644
index 000000000..b9ea7b504
--- /dev/null
+++ b/packages/trpc/server/admin-router/update-subscription-claim.types.ts
@@ -0,0 +1,12 @@
+import { z } from 'zod';
+
+import { ZCreateSubscriptionClaimRequestSchema } from './create-subscription-claim.types';
+
+export const ZUpdateSubscriptionClaimRequestSchema = z.object({
+  id: z.string(),
+  data: ZCreateSubscriptionClaimRequestSchema,
+});
+
+export const ZUpdateSubscriptionClaimResponseSchema = z.void();
+
+export type TUpdateSubscriptionClaimRequest = z.infer<typeof ZUpdateSubscriptionClaimRequestSchema>;
diff --git a/packages/trpc/server/api-token-router/schema.ts b/packages/trpc/server/api-token-router/schema.ts
index f03de73eb..32afed4a7 100644
--- a/packages/trpc/server/api-token-router/schema.ts
+++ b/packages/trpc/server/api-token-router/schema.ts
@@ -7,7 +7,7 @@ export const ZGetApiTokenByIdQuerySchema = z.object({
 export type TGetApiTokenByIdQuerySchema = z.infer<typeof ZGetApiTokenByIdQuerySchema>;
 
 export const ZCreateTokenMutationSchema = z.object({
-  teamId: z.number().optional(),
+  teamId: z.number(),
   tokenName: z.string().min(3, { message: 'The token name should be 3 characters or longer' }),
   expirationDate: z.string().nullable(),
 });
@@ -16,7 +16,7 @@ export type TCreateTokenMutationSchema = z.infer<typeof ZCreateTokenMutationSche
 
 export const ZDeleteTokenByIdMutationSchema = z.object({
   id: z.number().min(1),
-  teamId: z.number().optional(),
+  teamId: z.number(),
 });
 
 export type TDeleteTokenByIdMutationSchema = z.infer<typeof ZDeleteTokenByIdMutationSchema>;
diff --git a/packages/trpc/server/billing/create-subscription.ts b/packages/trpc/server/billing/create-subscription.ts
new file mode 100644
index 000000000..8a0be6825
--- /dev/null
+++ b/packages/trpc/server/billing/create-subscription.ts
@@ -0,0 +1,81 @@
+import { createCheckoutSession } from '@documenso/ee/server-only/stripe/create-checkout-session';
+import { createCustomer } from '@documenso/ee/server-only/stripe/create-customer';
+import { IS_BILLING_ENABLED, NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import { ZCreateSubscriptionRequestSchema } from './create-subscription.types';
+
+export const createSubscriptionRoute = authenticatedProcedure
+  .input(ZCreateSubscriptionRequestSchema)
+  .mutation(async ({ ctx, input }) => {
+    const { organisationId, priceId } = input;
+
+    const userId = ctx.user.id;
+
+    if (!IS_BILLING_ENABLED()) {
+      throw new AppError(AppErrorCode.INVALID_REQUEST, {
+        message: 'Billing is not enabled',
+      });
+    }
+
+    const organisation = await prisma.organisation.findFirst({
+      where: buildOrganisationWhereQuery({
+        organisationId,
+        userId,
+        roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_BILLING'],
+      }),
+      include: {
+        subscription: true,
+        owner: {
+          select: {
+            email: true,
+            name: true,
+          },
+        },
+      },
+    });
+
+    if (!organisation) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED);
+    }
+
+    let customerId = organisation.customerId;
+
+    if (!customerId) {
+      const customer = await createCustomer({
+        name: organisation.name,
+        email: organisation.owner.email,
+      });
+
+      customerId = customer.id;
+
+      await prisma.organisation.update({
+        where: {
+          id: organisationId,
+        },
+        data: {
+          customerId: customer.id,
+        },
+      });
+    }
+
+    const redirectUrl = await createCheckoutSession({
+      customerId,
+      priceId,
+      returnUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/o/${organisation.url}/settings/billing`,
+    });
+
+    if (!redirectUrl) {
+      throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+        message: 'Failed to create checkout session',
+      });
+    }
+
+    return {
+      redirectUrl,
+    };
+  });
diff --git a/packages/trpc/server/billing/create-subscription.types.ts b/packages/trpc/server/billing/create-subscription.types.ts
new file mode 100644
index 000000000..3c0fef0fb
--- /dev/null
+++ b/packages/trpc/server/billing/create-subscription.types.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod';
+
+export const ZCreateSubscriptionRequestSchema = z.object({
+  organisationId: z.string().describe('The organisation to create the subscription for'),
+  priceId: z.string().describe('The price to create the subscription for'),
+});
diff --git a/packages/trpc/server/billing/get-invoices.ts b/packages/trpc/server/billing/get-invoices.ts
new file mode 100644
index 000000000..bc25a837c
--- /dev/null
+++ b/packages/trpc/server/billing/get-invoices.ts
@@ -0,0 +1,58 @@
+import { getInvoices } from '@documenso/ee/server-only/stripe/get-invoices';
+import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import { ZGetInvoicesRequestSchema } from './get-invoices.types';
+
+export const getInvoicesRoute = authenticatedProcedure
+  .input(ZGetInvoicesRequestSchema)
+  .query(async ({ ctx, input }) => {
+    const { organisationId } = input;
+
+    const userId = ctx.user.id;
+
+    if (!IS_BILLING_ENABLED()) {
+      throw new AppError(AppErrorCode.INVALID_REQUEST, {
+        message: 'Billing is not enabled',
+      });
+    }
+
+    const organisation = await prisma.organisation.findFirst({
+      where: buildOrganisationWhereQuery({
+        organisationId,
+        userId,
+        roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+      }),
+      include: {
+        subscription: true,
+      },
+    });
+
+    if (!organisation) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'You are not authorized to access this organisation',
+      });
+    }
+
+    if (!organisation.customerId) {
+      return null;
+    }
+
+    const invoices = await getInvoices({
+      customerId: organisation.customerId,
+    });
+
+    return invoices.data.map((invoice) => ({
+      id: invoice.id,
+      status: invoice.status,
+      created: invoice.created,
+      currency: invoice.currency,
+      total: invoice.total,
+      hosted_invoice_url: invoice.hosted_invoice_url,
+      invoice_pdf: invoice.invoice_pdf,
+    }));
+  });
diff --git a/packages/trpc/server/billing/get-invoices.types.ts b/packages/trpc/server/billing/get-invoices.types.ts
new file mode 100644
index 000000000..77964b968
--- /dev/null
+++ b/packages/trpc/server/billing/get-invoices.types.ts
@@ -0,0 +1,5 @@
+import { z } from 'zod';
+
+export const ZGetInvoicesRequestSchema = z.object({
+  organisationId: z.string().describe('The organisation to get the invoices for'),
+});
diff --git a/packages/trpc/server/billing/get-plans.ts b/packages/trpc/server/billing/get-plans.ts
new file mode 100644
index 000000000..617990eec
--- /dev/null
+++ b/packages/trpc/server/billing/get-plans.ts
@@ -0,0 +1,31 @@
+import { getInternalClaimPlans } from '@documenso/ee/server-only/stripe/get-internal-claim-plans';
+import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+
+export const getPlansRoute = authenticatedProcedure.query(async ({ ctx }) => {
+  const userId = ctx.user.id;
+
+  const plans = await getInternalClaimPlans();
+
+  let canCreateFreeOrganisation = false;
+
+  if (IS_BILLING_ENABLED()) {
+    const numberOfFreeOrganisations = await prisma.organisation.count({
+      where: {
+        ownerUserId: userId,
+        subscription: {
+          is: null,
+        },
+      },
+    });
+
+    canCreateFreeOrganisation = numberOfFreeOrganisations === 0;
+  }
+
+  return {
+    plans,
+    canCreateFreeOrganisation,
+  };
+});
diff --git a/packages/trpc/server/billing/get-subscription.ts b/packages/trpc/server/billing/get-subscription.ts
new file mode 100644
index 000000000..6c24dd455
--- /dev/null
+++ b/packages/trpc/server/billing/get-subscription.ts
@@ -0,0 +1,34 @@
+import { getInternalClaimPlans } from '@documenso/ee/server-only/stripe/get-internal-claim-plans';
+import { getSubscription } from '@documenso/ee/server-only/stripe/get-subscription';
+import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+
+import { authenticatedProcedure } from '../trpc';
+import { ZGetSubscriptionRequestSchema } from './get-subscription.types';
+
+export const getSubscriptionRoute = authenticatedProcedure
+  .input(ZGetSubscriptionRequestSchema)
+  .query(async ({ ctx, input }) => {
+    const { organisationId } = input;
+
+    const userId = ctx.user.id;
+
+    if (!IS_BILLING_ENABLED()) {
+      throw new AppError(AppErrorCode.INVALID_REQUEST, {
+        message: 'Billing is not enabled',
+      });
+    }
+
+    const [subscription, plans] = await Promise.all([
+      getSubscription({
+        organisationId,
+        userId,
+      }),
+      getInternalClaimPlans(),
+    ]);
+
+    return {
+      subscription,
+      plans,
+    };
+  });
diff --git a/packages/trpc/server/billing/get-subscription.types.ts b/packages/trpc/server/billing/get-subscription.types.ts
new file mode 100644
index 000000000..c1ef2a2b3
--- /dev/null
+++ b/packages/trpc/server/billing/get-subscription.types.ts
@@ -0,0 +1,5 @@
+import { z } from 'zod';
+
+export const ZGetSubscriptionRequestSchema = z.object({
+  organisationId: z.string().describe('The organisation to get the subscription for'),
+});
diff --git a/packages/trpc/server/billing/manage-subscription.ts b/packages/trpc/server/billing/manage-subscription.ts
new file mode 100644
index 000000000..2d215067a
--- /dev/null
+++ b/packages/trpc/server/billing/manage-subscription.ts
@@ -0,0 +1,98 @@
+import { createCustomer } from '@documenso/ee/server-only/stripe/create-customer';
+import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session';
+import { IS_BILLING_ENABLED, NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import { ZManageSubscriptionRequestSchema } from './manage-subscription.types';
+
+export const manageSubscriptionRoute = authenticatedProcedure
+  .input(ZManageSubscriptionRequestSchema)
+  .mutation(async ({ ctx, input }) => {
+    const { organisationId } = input;
+
+    const userId = ctx.user.id;
+
+    if (!IS_BILLING_ENABLED()) {
+      throw new AppError(AppErrorCode.INVALID_REQUEST, {
+        message: 'Billing is not enabled',
+      });
+    }
+
+    const organisation = await prisma.organisation.findFirst({
+      where: buildOrganisationWhereQuery({
+        organisationId,
+        userId,
+        roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_BILLING'],
+      }),
+      include: {
+        subscription: true,
+        owner: {
+          select: {
+            email: true,
+            name: true,
+          },
+        },
+      },
+    });
+
+    if (!organisation) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED);
+    }
+
+    let customerId = organisation.customerId;
+
+    // If for some reason customer ID is missing in the organisation but
+    // exists in the subscription take it from the subscription.
+    if (!customerId && organisation.subscription?.customerId) {
+      customerId = organisation.subscription.customerId;
+
+      await prisma.organisation
+        .update({
+          where: {
+            id: organisationId,
+          },
+          data: {
+            customerId,
+          },
+        })
+        .catch((err) => {
+          // Todo: Logger
+          console.error('Critical error, potential conflicting data');
+          console.error(err.message);
+
+          throw err;
+        });
+    }
+
+    // If the customer ID is still missing create a new customer.
+    if (!customerId) {
+      const customer = await createCustomer({
+        name: organisation.name,
+        email: organisation.owner.email,
+      });
+
+      customerId = customer.id;
+
+      await prisma.organisation.update({
+        where: {
+          id: organisationId,
+        },
+        data: {
+          customerId: customer.id,
+        },
+      });
+    }
+
+    const redirectUrl = await getPortalSession({
+      customerId,
+      returnUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/o/${organisation.url}/settings/billing`,
+    });
+
+    return {
+      redirectUrl,
+    };
+  });
diff --git a/packages/trpc/server/billing/manage-subscription.types.ts b/packages/trpc/server/billing/manage-subscription.types.ts
new file mode 100644
index 000000000..0d77166ef
--- /dev/null
+++ b/packages/trpc/server/billing/manage-subscription.types.ts
@@ -0,0 +1,5 @@
+import { z } from 'zod';
+
+export const ZManageSubscriptionRequestSchema = z.object({
+  organisationId: z.string().describe('The organisation to manage the subscription for'),
+});
diff --git a/packages/trpc/server/billing/router.ts b/packages/trpc/server/billing/router.ts
new file mode 100644
index 000000000..e11a759de
--- /dev/null
+++ b/packages/trpc/server/billing/router.ts
@@ -0,0 +1,20 @@
+import { router } from '../trpc';
+import { createSubscriptionRoute } from './create-subscription';
+import { getInvoicesRoute } from './get-invoices';
+import { getPlansRoute } from './get-plans';
+import { getSubscriptionRoute } from './get-subscription';
+import { manageSubscriptionRoute } from './manage-subscription';
+
+export const billingRouter = router({
+  plans: {
+    get: getPlansRoute,
+  },
+  subscription: {
+    get: getSubscriptionRoute,
+    create: createSubscriptionRoute,
+    manage: manageSubscriptionRoute,
+  },
+  invoices: {
+    get: getInvoicesRoute,
+  },
+});
diff --git a/packages/trpc/server/document-router/find-inbox.ts b/packages/trpc/server/document-router/find-inbox.ts
new file mode 100644
index 000000000..a13ef2ad2
--- /dev/null
+++ b/packages/trpc/server/document-router/find-inbox.ts
@@ -0,0 +1,105 @@
+import type { Document, Prisma } from '@prisma/client';
+import { DocumentStatus, RecipientRole } from '@prisma/client';
+
+import type { FindResultResponse } from '@documenso/lib/types/search-params';
+import { maskRecipientTokensForDocument } from '@documenso/lib/utils/mask-recipient-tokens-for-document';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import { ZFindInboxRequestSchema, ZFindInboxResponseSchema } from './find-inbox.types';
+
+export const findInboxRoute = authenticatedProcedure
+  .input(ZFindInboxRequestSchema)
+  .output(ZFindInboxResponseSchema)
+  .query(async ({ input, ctx }) => {
+    const { page, perPage } = input;
+
+    const userId = ctx.user.id;
+
+    return await findInbox({
+      userId,
+      page,
+      perPage,
+    });
+  });
+
+export type FindInboxOptions = {
+  userId: number;
+  page?: number;
+  perPage?: number;
+  orderBy?: {
+    column: keyof Omit<Document, 'document'>;
+    direction: 'asc' | 'desc';
+  };
+};
+
+export const findInbox = async ({ userId, page = 1, perPage = 10, orderBy }: FindInboxOptions) => {
+  const user = await prisma.user.findFirstOrThrow({
+    where: {
+      id: userId,
+    },
+  });
+
+  const orderByColumn = orderBy?.column ?? 'createdAt';
+  const orderByDirection = orderBy?.direction ?? 'desc';
+
+  const whereClause: Prisma.DocumentWhereInput = {
+    status: {
+      not: DocumentStatus.DRAFT,
+    },
+    deletedAt: null,
+    recipients: {
+      some: {
+        email: user.email,
+        role: {
+          not: RecipientRole.CC,
+        },
+      },
+    },
+  };
+
+  const [data, count] = await Promise.all([
+    prisma.document.findMany({
+      where: whereClause,
+      skip: Math.max(page - 1, 0) * perPage,
+      take: perPage,
+      orderBy: {
+        [orderByColumn]: orderByDirection,
+      },
+      include: {
+        user: {
+          select: {
+            id: true,
+            name: true,
+            email: true,
+          },
+        },
+        recipients: true,
+        team: {
+          select: {
+            id: true,
+            url: true,
+          },
+        },
+      },
+    }),
+    prisma.document.count({
+      where: whereClause,
+    }),
+  ]);
+
+  const maskedData = data.map((document) =>
+    maskRecipientTokensForDocument({
+      document,
+      user,
+    }),
+  );
+
+  return {
+    data: maskedData,
+    count,
+    currentPage: Math.max(page, 1),
+    perPage,
+    totalPages: Math.ceil(count / perPage),
+  } satisfies FindResultResponse<typeof data>;
+};
diff --git a/packages/trpc/server/document-router/find-inbox.types.ts b/packages/trpc/server/document-router/find-inbox.types.ts
new file mode 100644
index 000000000..4e856f3c3
--- /dev/null
+++ b/packages/trpc/server/document-router/find-inbox.types.ts
@@ -0,0 +1,13 @@
+// import type { OpenApiMeta } from 'trpc-to-openapi';
+import type { z } from 'zod';
+
+import { ZDocumentManySchema } from '@documenso/lib/types/document';
+import { ZFindResultResponse, ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
+
+export const ZFindInboxRequestSchema = ZFindSearchParamsSchema;
+
+export const ZFindInboxResponseSchema = ZFindResultResponse.extend({
+  data: ZDocumentManySchema.array(),
+});
+
+export type TFindInboxResponse = z.infer<typeof ZFindInboxResponseSchema>;
diff --git a/packages/trpc/server/document-router/router.ts b/packages/trpc/server/document-router/router.ts
index 2a14ed30e..b1d60effb 100644
--- a/packages/trpc/server/document-router/router.ts
+++ b/packages/trpc/server/document-router/router.ts
@@ -19,7 +19,6 @@ import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document
 import { getDocumentWithDetailsById } from '@documenso/lib/server-only/document/get-document-with-details-by-id';
 import type { GetStatsInput } from '@documenso/lib/server-only/document/get-stats';
 import { getStats } from '@documenso/lib/server-only/document/get-stats';
-import { moveDocumentToTeam } from '@documenso/lib/server-only/document/move-document-to-team';
 import { resendDocument } from '@documenso/lib/server-only/document/resend-document';
 import { searchDocumentsWithKeyword } from '@documenso/lib/server-only/document/search-documents-with-keyword';
 import { sendDocument } from '@documenso/lib/server-only/document/send-document';
@@ -28,6 +27,7 @@ import { getPresignPostUrl } from '@documenso/lib/universal/upload/server-action
 import { isDocumentCompleted } from '@documenso/lib/utils/document';
 
 import { authenticatedProcedure, procedure, router } from '../trpc';
+import { findInboxRoute } from './find-inbox';
 import {
   ZCreateDocumentRequestSchema,
   ZCreateDocumentV2RequestSchema,
@@ -49,8 +49,6 @@ import {
   ZGetDocumentByTokenQuerySchema,
   ZGetDocumentWithDetailsByIdRequestSchema,
   ZGetDocumentWithDetailsByIdResponseSchema,
-  ZMoveDocumentToTeamResponseSchema,
-  ZMoveDocumentToTeamSchema,
   ZResendDocumentMutationSchema,
   ZSearchDocumentsMutationSchema,
   ZSetSigningOrderForDocumentMutationSchema,
@@ -59,6 +57,10 @@ import {
 import { updateDocumentRoute } from './update-document';
 
 export const documentRouter = router({
+  inbox: {
+    find: findInboxRoute,
+  },
+
   /**
    * @private
    */
@@ -174,7 +176,7 @@ export const documentRouter = router({
           teamId: team.id,
           teamEmail: team.teamEmail?.email,
           senderIds,
-          currentTeamMemberRole: team.currentTeamMember?.role,
+          currentTeamMemberRole: team.currentTeamRole,
           currentUserEmail: user.email,
           userId: user.id,
         };
@@ -255,7 +257,7 @@ export const documentRouter = router({
     .input(ZCreateDocumentV2RequestSchema)
     .output(ZCreateDocumentV2ResponseSchema)
     .mutation(async ({ input, ctx }) => {
-      const { teamId } = ctx;
+      const { teamId, user } = ctx;
 
       const {
         title,
@@ -267,7 +269,7 @@ export const documentRouter = router({
         meta,
       } = input;
 
-      const { remaining } = await getServerLimits({ email: ctx.user.email, teamId });
+      const { remaining } = await getServerLimits({ userId: user.id, teamId });
 
       if (remaining.documents <= 0) {
         throw new AppError(AppErrorCode.LIMIT_EXCEEDED, {
@@ -325,10 +327,10 @@ export const documentRouter = router({
     // })
     .input(ZCreateDocumentRequestSchema)
     .mutation(async ({ input, ctx }) => {
-      const { teamId } = ctx;
+      const { user, teamId } = ctx;
       const { title, documentDataId, timezone, folderId } = input;
 
-      const { remaining } = await getServerLimits({ email: ctx.user.email, teamId });
+      const { remaining } = await getServerLimits({ userId: user.id, teamId });
 
       if (remaining.documents <= 0) {
         throw new AppError(AppErrorCode.LIMIT_EXCEEDED, {
@@ -338,7 +340,7 @@ export const documentRouter = router({
       }
 
       return await createDocument({
-        userId: ctx.user.id,
+        userId: user.id,
         teamId,
         title,
         documentDataId,
@@ -381,33 +383,6 @@ export const documentRouter = router({
       return ZGenericSuccessResponse;
     }),
 
-  /**
-   * @public
-   */
-  moveDocumentToTeam: authenticatedProcedure
-    .meta({
-      openapi: {
-        method: 'POST',
-        path: '/document/move',
-        summary: 'Move document',
-        description: 'Move a document from your personal account to a team',
-        tags: ['Document'],
-      },
-    })
-    .input(ZMoveDocumentToTeamSchema)
-    .output(ZMoveDocumentToTeamResponseSchema)
-    .mutation(async ({ input, ctx }) => {
-      const { documentId, teamId } = input;
-      const userId = ctx.user.id;
-
-      return await moveDocumentToTeam({
-        documentId,
-        teamId,
-        userId,
-        requestMetadata: ctx.metadata,
-      });
-    }),
-
   /**
    * @private
    *
diff --git a/packages/trpc/server/document-router/schema.ts b/packages/trpc/server/document-router/schema.ts
index 239106a8b..315b593d4 100644
--- a/packages/trpc/server/document-router/schema.ts
+++ b/packages/trpc/server/document-router/schema.ts
@@ -344,10 +344,3 @@ export const ZDownloadAuditLogsMutationSchema = z.object({
 export const ZDownloadCertificateMutationSchema = z.object({
   documentId: z.number(),
 });
-
-export const ZMoveDocumentToTeamSchema = z.object({
-  documentId: z.number().describe('The ID of the document to move to a team.'),
-  teamId: z.number().describe('The ID of the team to move the document to.'),
-});
-
-export const ZMoveDocumentToTeamResponseSchema = ZDocumentLiteSchema;
diff --git a/packages/trpc/server/embedding-router/create-embedding-presign-token.ts b/packages/trpc/server/embedding-router/create-embedding-presign-token.ts
index f0c81dacf..c17c7c463 100644
--- a/packages/trpc/server/embedding-router/create-embedding-presign-token.ts
+++ b/packages/trpc/server/embedding-router/create-embedding-presign-token.ts
@@ -1,10 +1,8 @@
-import { isCommunityPlan } from '@documenso/ee/server-only/util/is-community-plan';
-import { isUserEnterprise } from '@documenso/ee/server-only/util/is-document-enterprise';
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { createEmbeddingPresignToken } from '@documenso/lib/server-only/embedding-presign/create-embedding-presign-token';
+import { getOrganisationClaimByTeamId } from '@documenso/lib/server-only/organisation/get-organisation-claims';
 import { getApiTokenByToken } from '@documenso/lib/server-only/public-api/get-api-token-by-token';
-import { prisma } from '@documenso/prisma';
 
 import { procedure } from '../trpc';
 import {
@@ -42,24 +40,11 @@ export const createEmbeddingPresignTokenRoute = procedure
           });
         }
 
-        const [hasCommunityPlan, hasEnterprisePlan] = await Promise.all([
-          isCommunityPlan({ userId: token.userId, teamId: token.teamId ?? undefined }),
-          isUserEnterprise({ userId: token.userId, teamId: token.teamId ?? undefined }),
-        ]);
+        const organisationClaim = await getOrganisationClaimByTeamId({
+          teamId: token.teamId,
+        });
 
-        let hasTeamAuthoringFlag = false;
-
-        if (token.teamId) {
-          const teamGlobalSettings = await prisma.teamGlobalSettings.findFirst({
-            where: {
-              teamId: token.teamId,
-            },
-          });
-
-          hasTeamAuthoringFlag = teamGlobalSettings?.allowEmbeddedAuthoring ?? false;
-        }
-
-        if (!hasCommunityPlan && !hasEnterprisePlan && !hasTeamAuthoringFlag) {
+        if (!organisationClaim.flags.embedAuthoring) {
           throw new AppError(AppErrorCode.UNAUTHORIZED, {
             message: 'You do not have permission to create embedding presign tokens',
           });
diff --git a/packages/trpc/server/folder-router/schema.ts b/packages/trpc/server/folder-router/schema.ts
index 72d8e17d9..6595cea4d 100644
--- a/packages/trpc/server/folder-router/schema.ts
+++ b/packages/trpc/server/folder-router/schema.ts
@@ -1,6 +1,7 @@
 import { z } from 'zod';
 
 import { ZFolderTypeSchema } from '@documenso/lib/types/folder-type';
+import { ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
 import { DocumentVisibility } from '@documenso/prisma/generated/types';
 
 /**
@@ -111,13 +112,6 @@ export const ZGetFoldersResponseSchema = z.object({
 
 export type TGetFoldersResponse = z.infer<typeof ZGetFoldersResponseSchema>;
 
-export const ZFindSearchParamsSchema = z.object({
-  query: z.string().optional(),
-  page: z.number().optional(),
-  perPage: z.number().optional(),
-  type: ZFolderTypeSchema.optional(),
-});
-
 export const ZFindFoldersRequestSchema = ZFindSearchParamsSchema.extend({
   parentId: z.string().nullable().optional(),
   type: ZFolderTypeSchema.optional(),
diff --git a/packages/trpc/server/organisation-router/accept-organisation-member-invite.ts b/packages/trpc/server/organisation-router/accept-organisation-member-invite.ts
new file mode 100644
index 000000000..7df7b6872
--- /dev/null
+++ b/packages/trpc/server/organisation-router/accept-organisation-member-invite.ts
@@ -0,0 +1,18 @@
+import { acceptOrganisationInvitation } from '@documenso/lib/server-only/organisation/accept-organisation-invitation';
+
+import { maybeAuthenticatedProcedure } from '../trpc';
+import {
+  ZAcceptOrganisationMemberInviteRequestSchema,
+  ZAcceptOrganisationMemberInviteResponseSchema,
+} from './accept-organisation-member-invite.types';
+
+export const acceptOrganisationMemberInviteRoute = maybeAuthenticatedProcedure
+  .input(ZAcceptOrganisationMemberInviteRequestSchema)
+  .output(ZAcceptOrganisationMemberInviteResponseSchema)
+  .mutation(async ({ input }) => {
+    const { token } = input;
+
+    return await acceptOrganisationInvitation({
+      token,
+    });
+  });
diff --git a/packages/trpc/server/organisation-router/accept-organisation-member-invite.types.ts b/packages/trpc/server/organisation-router/accept-organisation-member-invite.types.ts
new file mode 100644
index 000000000..5ada9be0b
--- /dev/null
+++ b/packages/trpc/server/organisation-router/accept-organisation-member-invite.types.ts
@@ -0,0 +1,11 @@
+import { z } from 'zod';
+
+export const ZAcceptOrganisationMemberInviteRequestSchema = z.object({
+  token: z.string(),
+});
+
+export const ZAcceptOrganisationMemberInviteResponseSchema = z.void();
+
+export type TAcceptOrganisationMemberInviteResponse = z.infer<
+  typeof ZAcceptOrganisationMemberInviteResponseSchema
+>;
diff --git a/packages/trpc/server/organisation-router/create-organisation-group.ts b/packages/trpc/server/organisation-router/create-organisation-group.ts
new file mode 100644
index 000000000..9f148764d
--- /dev/null
+++ b/packages/trpc/server/organisation-router/create-organisation-group.ts
@@ -0,0 +1,91 @@
+import { OrganisationGroupType } from '@prisma/client';
+
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { getMemberOrganisationRole } from '@documenso/lib/server-only/team/get-member-roles';
+import { generateDatabaseId } from '@documenso/lib/universal/id';
+import {
+  buildOrganisationWhereQuery,
+  isOrganisationRoleWithinUserHierarchy,
+} from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZCreateOrganisationGroupRequestSchema,
+  ZCreateOrganisationGroupResponseSchema,
+} from './create-organisation-group.types';
+
+export const createOrganisationGroupRoute = authenticatedProcedure
+  // .meta(createOrganisationGroupMeta)
+  .input(ZCreateOrganisationGroupRequestSchema)
+  .output(ZCreateOrganisationGroupResponseSchema)
+  .mutation(async ({ input, ctx }) => {
+    const { organisationId, organisationRole, name, memberIds } = input;
+    const { user } = ctx;
+
+    const organisation = await prisma.organisation.findFirst({
+      where: buildOrganisationWhereQuery({
+        organisationId,
+        userId: user.id,
+        roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+      }),
+      include: {
+        groups: true,
+        members: {
+          include: {
+            user: true,
+          },
+        },
+      },
+    });
+
+    if (!organisation) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED);
+    }
+
+    const currentUserOrganisationRole = await getMemberOrganisationRole({
+      organisationId,
+      reference: {
+        type: 'User',
+        id: user.id,
+      },
+    });
+
+    if (!isOrganisationRoleWithinUserHierarchy(currentUserOrganisationRole, organisationRole)) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'You are not allowed to create this organisation group',
+      });
+    }
+
+    // Validate that members exist in the organisation.
+    memberIds.forEach((memberId) => {
+      const member = organisation.members.find(({ id }) => id === memberId);
+
+      if (!member) {
+        throw new AppError(AppErrorCode.NOT_FOUND);
+      }
+    });
+
+    await prisma.$transaction(async (tx) => {
+      const group = await tx.organisationGroup.create({
+        data: {
+          id: generateDatabaseId('org_group'),
+          organisationId,
+          name,
+          type: OrganisationGroupType.CUSTOM,
+          organisationRole,
+        },
+      });
+
+      await tx.organisationGroupMember.createMany({
+        data: memberIds.map((memberId) => ({
+          id: generateDatabaseId('group_member'),
+          organisationMemberId: memberId,
+          groupId: group.id,
+        })),
+      });
+
+      return group;
+    });
+  });
diff --git a/packages/trpc/server/organisation-router/create-organisation-group.types.ts b/packages/trpc/server/organisation-router/create-organisation-group.types.ts
new file mode 100644
index 000000000..af824d426
--- /dev/null
+++ b/packages/trpc/server/organisation-router/create-organisation-group.types.ts
@@ -0,0 +1,21 @@
+import { OrganisationMemberRole } from '@prisma/client';
+import { z } from 'zod';
+
+// export const createOrganisationGroupMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/organisation/{teamId}/groups',
+//     summary: 'Create organisation group',
+//     description: 'Create a new group for a organisation',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZCreateOrganisationGroupRequestSchema = z.object({
+  organisationId: z.string(),
+  organisationRole: z.nativeEnum(OrganisationMemberRole),
+  name: z.string().max(100),
+  memberIds: z.array(z.string()),
+});
+
+export const ZCreateOrganisationGroupResponseSchema = z.void();
diff --git a/packages/trpc/server/organisation-router/create-organisation-member-invites.ts b/packages/trpc/server/organisation-router/create-organisation-member-invites.ts
new file mode 100644
index 000000000..0178570e0
--- /dev/null
+++ b/packages/trpc/server/organisation-router/create-organisation-member-invites.ts
@@ -0,0 +1,23 @@
+import { createOrganisationMemberInvites } from '@documenso/lib/server-only/organisation/create-organisation-member-invites';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZCreateOrganisationMemberInvitesRequestSchema,
+  ZCreateOrganisationMemberInvitesResponseSchema,
+} from './create-organisation-member-invites.types';
+
+export const createOrganisationMemberInvitesRoute = authenticatedProcedure
+  .input(ZCreateOrganisationMemberInvitesRequestSchema)
+  .output(ZCreateOrganisationMemberInvitesResponseSchema)
+  .mutation(async ({ ctx, input }) => {
+    const { organisationId, invitations } = input;
+    const userId = ctx.user.id;
+    const userName = ctx.user.name || '';
+
+    await createOrganisationMemberInvites({
+      userId,
+      userName,
+      organisationId,
+      invitations,
+    });
+  });
diff --git a/packages/trpc/server/organisation-router/create-organisation-member-invites.types.ts b/packages/trpc/server/organisation-router/create-organisation-member-invites.types.ts
new file mode 100644
index 000000000..716f973dd
--- /dev/null
+++ b/packages/trpc/server/organisation-router/create-organisation-member-invites.types.ts
@@ -0,0 +1,42 @@
+import { OrganisationMemberRole } from '@prisma/client';
+import { z } from 'zod';
+
+// export const createOrganisationMemberInvitesMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/organisation/member/create',
+//     summary: 'Invite organisation members',
+//     description: 'Invite a users to be part of your organisation',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZCreateOrganisationMemberInvitesRequestSchema = z.object({
+  organisationId: z.string().describe('The organisation to invite the user to'),
+  invitations: z
+    .array(
+      z.object({
+        email: z.string().trim().email().toLowerCase(),
+        organisationRole: z.nativeEnum(OrganisationMemberRole),
+      }),
+    )
+    .min(1)
+    .refine(
+      (invitations) => {
+        const emails = invitations
+          .filter((invitation) => invitation.email !== undefined)
+          .map((invitation) => invitation.email);
+
+        return new Set(emails).size === emails.length;
+      },
+      {
+        message: 'Emails must be unique, no duplicate values allowed',
+      },
+    ),
+});
+
+export const ZCreateOrganisationMemberInvitesResponseSchema = z.void();
+
+export type TCreateOrganisationMemberInvitesRequestSchema = z.infer<
+  typeof ZCreateOrganisationMemberInvitesRequestSchema
+>;
diff --git a/packages/trpc/server/organisation-router/create-organisation.ts b/packages/trpc/server/organisation-router/create-organisation.ts
new file mode 100644
index 000000000..39086b55e
--- /dev/null
+++ b/packages/trpc/server/organisation-router/create-organisation.ts
@@ -0,0 +1,79 @@
+import { OrganisationType } from '@prisma/client';
+
+import { createCheckoutSession } from '@documenso/ee/server-only/stripe/create-checkout-session';
+import { createCustomer } from '@documenso/ee/server-only/stripe/create-customer';
+import { IS_BILLING_ENABLED, NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { createOrganisation } from '@documenso/lib/server-only/organisation/create-organisation';
+import { INTERNAL_CLAIM_ID, internalClaims } from '@documenso/lib/types/subscription';
+import { generateStripeOrganisationCreateMetadata } from '@documenso/lib/utils/billing';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZCreateOrganisationRequestSchema,
+  ZCreateOrganisationResponseSchema,
+} from './create-organisation.types';
+
+export const createOrganisationRoute = authenticatedProcedure
+  // .meta(createOrganisationMeta)
+  .input(ZCreateOrganisationRequestSchema)
+  .output(ZCreateOrganisationResponseSchema)
+  .mutation(async ({ input, ctx }) => {
+    const { name, priceId } = input;
+    const { user } = ctx;
+
+    // Check if user can create a free organiastion.
+    if (IS_BILLING_ENABLED() && !priceId) {
+      const userOrganisations = await prisma.organisation.findMany({
+        where: {
+          ownerUserId: user.id,
+          subscription: {
+            is: null,
+          },
+        },
+      });
+
+      if (userOrganisations.length >= 1) {
+        throw new AppError(AppErrorCode.LIMIT_EXCEEDED, {
+          message: 'You have reached the maximum number of free organisations.',
+        });
+      }
+    }
+
+    // Create checkout session for payment.
+    if (IS_BILLING_ENABLED() && priceId) {
+      const customer = await createCustomer({
+        email: user.email,
+        name: user.name || user.email,
+      });
+
+      const checkoutUrl = await createCheckoutSession({
+        priceId,
+        customerId: customer.id,
+        returnUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/settings/organisations`,
+        subscriptionMetadata: generateStripeOrganisationCreateMetadata(name, user.id),
+      });
+
+      return {
+        paymentRequired: true,
+        checkoutUrl,
+      };
+    }
+
+    // Free organisations should be Personal by default.
+    const organisationType = IS_BILLING_ENABLED()
+      ? OrganisationType.PERSONAL
+      : OrganisationType.ORGANISATION;
+
+    await createOrganisation({
+      userId: user.id,
+      name,
+      type: organisationType,
+      claim: internalClaims[INTERNAL_CLAIM_ID.FREE],
+    });
+
+    return {
+      paymentRequired: false,
+    };
+  });
diff --git a/packages/trpc/server/organisation-router/create-organisation.types.ts b/packages/trpc/server/organisation-router/create-organisation.types.ts
new file mode 100644
index 000000000..e18846120
--- /dev/null
+++ b/packages/trpc/server/organisation-router/create-organisation.types.ts
@@ -0,0 +1,33 @@
+import { z } from 'zod';
+
+// export const createOrganisationMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/organisation',
+//     summary: 'Create organisation',
+//     description: 'Create an organisation',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZOrganisationNameSchema = z
+  .string()
+  .min(3, { message: 'Minimum 3 characters' })
+  .max(50, { message: 'Maximum 50 characters' });
+
+export const ZCreateOrganisationRequestSchema = z.object({
+  name: ZOrganisationNameSchema,
+  priceId: z.string().optional(),
+});
+
+export const ZCreateOrganisationResponseSchema = z.union([
+  z.object({
+    paymentRequired: z.literal(false),
+  }),
+  z.object({
+    paymentRequired: z.literal(true),
+    checkoutUrl: z.string(),
+  }),
+]);
+
+export type TCreateOrganisationResponse = z.infer<typeof ZCreateOrganisationResponseSchema>;
diff --git a/packages/trpc/server/organisation-router/decline-organisation-member-invite.ts b/packages/trpc/server/organisation-router/decline-organisation-member-invite.ts
new file mode 100644
index 000000000..548cc004e
--- /dev/null
+++ b/packages/trpc/server/organisation-router/decline-organisation-member-invite.ts
@@ -0,0 +1,38 @@
+import { OrganisationMemberInviteStatus } from '@prisma/client';
+
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { prisma } from '@documenso/prisma';
+
+import { maybeAuthenticatedProcedure } from '../trpc';
+import {
+  ZDeclineOrganisationMemberInviteRequestSchema,
+  ZDeclineOrganisationMemberInviteResponseSchema,
+} from './decline-organisation-member-invite.types';
+
+export const declineOrganisationMemberInviteRoute = maybeAuthenticatedProcedure
+  .input(ZDeclineOrganisationMemberInviteRequestSchema)
+  .output(ZDeclineOrganisationMemberInviteResponseSchema)
+  .mutation(async ({ input }) => {
+    const { token } = input;
+
+    const organisationMemberInvite = await prisma.organisationMemberInvite.findFirst({
+      where: {
+        token,
+      },
+    });
+
+    if (!organisationMemberInvite) {
+      throw new AppError(AppErrorCode.NOT_FOUND);
+    }
+
+    await prisma.organisationMemberInvite.update({
+      where: {
+        id: organisationMemberInvite.id,
+      },
+      data: {
+        status: OrganisationMemberInviteStatus.DECLINED,
+      },
+    });
+
+    // TODO: notify the team owner
+  });
diff --git a/packages/trpc/server/organisation-router/decline-organisation-member-invite.types.ts b/packages/trpc/server/organisation-router/decline-organisation-member-invite.types.ts
new file mode 100644
index 000000000..3593d925c
--- /dev/null
+++ b/packages/trpc/server/organisation-router/decline-organisation-member-invite.types.ts
@@ -0,0 +1,11 @@
+import { z } from 'zod';
+
+export const ZDeclineOrganisationMemberInviteRequestSchema = z.object({
+  token: z.string(),
+});
+
+export const ZDeclineOrganisationMemberInviteResponseSchema = z.void();
+
+export type TDeclineOrganisationMemberInviteResponse = z.infer<
+  typeof ZDeclineOrganisationMemberInviteResponseSchema
+>;
diff --git a/packages/trpc/server/organisation-router/delete-organisation-group.ts b/packages/trpc/server/organisation-router/delete-organisation-group.ts
new file mode 100644
index 000000000..cf8d0bae9
--- /dev/null
+++ b/packages/trpc/server/organisation-router/delete-organisation-group.ts
@@ -0,0 +1,62 @@
+import { OrganisationGroupType } from '@prisma/client';
+
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZDeleteOrganisationGroupRequestSchema,
+  ZDeleteOrganisationGroupResponseSchema,
+} from './delete-organisation-group.types';
+
+export const deleteOrganisationGroupRoute = authenticatedProcedure
+  // .meta(deleteOrganisationGroupMeta)
+  .input(ZDeleteOrganisationGroupRequestSchema)
+  .output(ZDeleteOrganisationGroupResponseSchema)
+  .mutation(async ({ input, ctx }) => {
+    const { groupId, organisationId } = input;
+    const { user } = ctx;
+
+    const organisation = await prisma.organisation.findFirst({
+      where: buildOrganisationWhereQuery({
+        organisationId,
+        userId: user.id,
+        roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+      }),
+    });
+
+    if (!organisation) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED);
+    }
+
+    const group = await prisma.organisationGroup.findFirst({
+      where: {
+        id: groupId,
+        organisationId,
+      },
+    });
+
+    if (!group) {
+      throw new AppError(AppErrorCode.NOT_FOUND, {
+        message: 'Organisation group not found',
+      });
+    }
+
+    if (
+      group.type === OrganisationGroupType.INTERNAL_ORGANISATION ||
+      group.type === OrganisationGroupType.INTERNAL_TEAM
+    ) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'You are not allowed to delete internal groups',
+      });
+    }
+
+    await prisma.organisationGroup.delete({
+      where: {
+        id: groupId,
+        organisationId: organisation.id,
+      },
+    });
+  });
diff --git a/packages/trpc/server/organisation-router/delete-organisation-group.types.ts b/packages/trpc/server/organisation-router/delete-organisation-group.types.ts
new file mode 100644
index 000000000..b623106e0
--- /dev/null
+++ b/packages/trpc/server/organisation-router/delete-organisation-group.types.ts
@@ -0,0 +1,18 @@
+import { z } from 'zod';
+
+// export const deleteOrganisationGroupMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/organisation/groups/{id}/delete',
+//     summary: 'Delete organisation group',
+//     description: 'Delete an existing group for a organisation',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZDeleteOrganisationGroupRequestSchema = z.object({
+  organisationId: z.string(),
+  groupId: z.string(),
+});
+
+export const ZDeleteOrganisationGroupResponseSchema = z.void();
diff --git a/packages/trpc/server/organisation-router/delete-organisation-member-invites.ts b/packages/trpc/server/organisation-router/delete-organisation-member-invites.ts
new file mode 100644
index 000000000..44d30e097
--- /dev/null
+++ b/packages/trpc/server/organisation-router/delete-organisation-member-invites.ts
@@ -0,0 +1,72 @@
+import { syncMemberCountWithStripeSeatPlan } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { validateIfSubscriptionIsRequired } from '@documenso/lib/utils/billing';
+import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZDeleteOrganisationMemberInvitesRequestSchema,
+  ZDeleteOrganisationMemberInvitesResponseSchema,
+} from './delete-organisation-member-invites.types';
+
+export const deleteOrganisationMemberInvitesRoute = authenticatedProcedure
+  //   .meta(deleteOrganisationMemberInvitesMeta)
+  .input(ZDeleteOrganisationMemberInvitesRequestSchema)
+  .output(ZDeleteOrganisationMemberInvitesResponseSchema)
+  .mutation(async ({ ctx, input }) => {
+    const { organisationId, invitationIds } = input;
+    const userId = ctx.user.id;
+
+    const organisation = await prisma.organisation.findFirst({
+      where: buildOrganisationWhereQuery({
+        organisationId,
+        userId,
+        roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+      }),
+      include: {
+        organisationClaim: true,
+        subscription: true,
+        members: {
+          select: {
+            id: true,
+          },
+        },
+        invites: {
+          select: {
+            id: true,
+          },
+        },
+      },
+    });
+
+    if (!organisation) {
+      throw new AppError(AppErrorCode.NOT_FOUND);
+    }
+
+    const { organisationClaim } = organisation;
+
+    const subscription = validateIfSubscriptionIsRequired(organisation.subscription);
+
+    const numberOfCurrentMembers = organisation.members.length;
+    const numberOfCurrentInvites = organisation.invites.length;
+    const totalMemberCountWithInvites = numberOfCurrentMembers + numberOfCurrentInvites - 1;
+
+    if (subscription) {
+      await syncMemberCountWithStripeSeatPlan(
+        subscription,
+        organisationClaim,
+        totalMemberCountWithInvites,
+      );
+    }
+
+    await prisma.organisationMemberInvite.deleteMany({
+      where: {
+        id: {
+          in: invitationIds,
+        },
+        organisationId,
+      },
+    });
+  });
diff --git a/packages/trpc/server/organisation-router/delete-organisation-member-invites.types.ts b/packages/trpc/server/organisation-router/delete-organisation-member-invites.types.ts
new file mode 100644
index 000000000..1fd6ab1ea
--- /dev/null
+++ b/packages/trpc/server/organisation-router/delete-organisation-member-invites.types.ts
@@ -0,0 +1,20 @@
+import { z } from 'zod';
+
+// export const deleteOrganisationMemberInvitesMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/organisation/member/delete-many',
+//     summary: 'Delete organisation member invites',
+//     description: 'Delete organisation member invites',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZDeleteOrganisationMemberInvitesRequestSchema = z.object({
+  organisationId: z.string(),
+  invitationIds: z.array(z.string()).refine((items) => new Set(items).size === items.length, {
+    message: 'Invitation IDs must be unique, no duplicate values allowed',
+  }),
+});
+
+export const ZDeleteOrganisationMemberInvitesResponseSchema = z.void();
diff --git a/packages/trpc/server/organisation-router/delete-organisation-member.ts b/packages/trpc/server/organisation-router/delete-organisation-member.ts
new file mode 100644
index 000000000..5da41bf1e
--- /dev/null
+++ b/packages/trpc/server/organisation-router/delete-organisation-member.ts
@@ -0,0 +1,21 @@
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZDeleteOrganisationMemberRequestSchema,
+  ZDeleteOrganisationMemberResponseSchema,
+} from './delete-organisation-member.types';
+import { deleteOrganisationMembers } from './delete-organisation-members';
+
+export const deleteOrganisationMemberRoute = authenticatedProcedure
+  //   .meta(deleteOrganisationMemberMeta)
+  .input(ZDeleteOrganisationMemberRequestSchema)
+  .output(ZDeleteOrganisationMemberResponseSchema)
+  .mutation(async ({ ctx, input }) => {
+    const { organisationId, organisationMemberId } = input;
+    const userId = ctx.user.id;
+
+    await deleteOrganisationMembers({
+      userId,
+      organisationId,
+      organisationMemberIds: [organisationMemberId],
+    });
+  });
diff --git a/packages/trpc/server/organisation-router/delete-organisation-member.types.ts b/packages/trpc/server/organisation-router/delete-organisation-member.types.ts
new file mode 100644
index 000000000..ab635a86c
--- /dev/null
+++ b/packages/trpc/server/organisation-router/delete-organisation-member.types.ts
@@ -0,0 +1,18 @@
+import { z } from 'zod';
+
+// export const deleteOrganisationMemberMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/organisation/member/delete',
+//     summary: 'Delete organisation member',
+//     description: 'Delete organisation member',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZDeleteOrganisationMemberRequestSchema = z.object({
+  organisationId: z.string(),
+  organisationMemberId: z.string(),
+});
+
+export const ZDeleteOrganisationMemberResponseSchema = z.void();
diff --git a/packages/trpc/server/organisation-router/delete-organisation-members.ts b/packages/trpc/server/organisation-router/delete-organisation-members.ts
new file mode 100644
index 000000000..876111913
--- /dev/null
+++ b/packages/trpc/server/organisation-router/delete-organisation-members.ts
@@ -0,0 +1,105 @@
+import { syncMemberCountWithStripeSeatPlan } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { jobs } from '@documenso/lib/jobs/client';
+import { validateIfSubscriptionIsRequired } from '@documenso/lib/utils/billing';
+import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+import { OrganisationMemberInviteStatus } from '@documenso/prisma/client';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZDeleteOrganisationMembersRequestSchema,
+  ZDeleteOrganisationMembersResponseSchema,
+} from './delete-organisation-members.types';
+
+export const deleteOrganisationMembersRoute = authenticatedProcedure
+  //   .meta(deleteOrganisationMembersMeta)
+  .input(ZDeleteOrganisationMembersRequestSchema)
+  .output(ZDeleteOrganisationMembersResponseSchema)
+  .mutation(async ({ ctx, input }) => {
+    const { organisationId, organisationMemberIds } = input;
+    const userId = ctx.user.id;
+
+    await deleteOrganisationMembers({
+      userId,
+      organisationId,
+      organisationMemberIds,
+    });
+  });
+
+type DeleteOrganisationMembersProps = {
+  userId: number;
+  organisationId: string;
+  organisationMemberIds: string[];
+};
+
+export const deleteOrganisationMembers = async ({
+  userId,
+  organisationId,
+  organisationMemberIds,
+}: DeleteOrganisationMembersProps) => {
+  const organisation = await prisma.organisation.findFirst({
+    where: buildOrganisationWhereQuery({
+      organisationId,
+      userId,
+      roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+    }),
+    include: {
+      subscription: true,
+      organisationClaim: true,
+      members: {
+        select: {
+          id: true,
+          userId: true,
+        },
+      },
+      invites: {
+        where: {
+          status: OrganisationMemberInviteStatus.PENDING,
+        },
+        select: {
+          id: true,
+        },
+      },
+    },
+  });
+
+  if (!organisation) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED);
+  }
+
+  const { organisationClaim } = organisation;
+
+  const membersToDelete = organisation.members.filter((member) =>
+    organisationMemberIds.includes(member.id),
+  );
+
+  const subscription = validateIfSubscriptionIsRequired(organisation.subscription);
+
+  const inviteCount = organisation.invites.length;
+  const newMemberCount = organisation.members.length + inviteCount - membersToDelete.length;
+
+  if (subscription) {
+    await syncMemberCountWithStripeSeatPlan(subscription, organisationClaim, newMemberCount);
+  }
+
+  await prisma.$transaction(async (tx) => {
+    await tx.organisationMember.deleteMany({
+      where: {
+        id: {
+          in: organisationMemberIds,
+        },
+        organisationId,
+      },
+    });
+
+    await jobs.triggerJob({
+      name: 'send.organisation-member-left.email',
+      payload: {
+        organisationId,
+        memberUserId: userId,
+      },
+    });
+  });
+};
diff --git a/packages/trpc/server/organisation-router/delete-organisation-members.types.ts b/packages/trpc/server/organisation-router/delete-organisation-members.types.ts
new file mode 100644
index 000000000..6feadec6b
--- /dev/null
+++ b/packages/trpc/server/organisation-router/delete-organisation-members.types.ts
@@ -0,0 +1,22 @@
+import { z } from 'zod';
+
+// export const deleteOrganisationMembersMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/organisation/member/delete-many',
+//     summary: 'Delete organisation members',
+//     description: 'Delete organisation members',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZDeleteOrganisationMembersRequestSchema = z.object({
+  organisationId: z.string(),
+  organisationMemberIds: z
+    .array(z.string())
+    .refine((items) => new Set(items).size === items.length, {
+      message: 'Organisation member ids must be unique, no duplicate values allowed',
+    }),
+});
+
+export const ZDeleteOrganisationMembersResponseSchema = z.void();
diff --git a/packages/trpc/server/organisation-router/delete-organisation.ts b/packages/trpc/server/organisation-router/delete-organisation.ts
new file mode 100644
index 000000000..692368cce
--- /dev/null
+++ b/packages/trpc/server/organisation-router/delete-organisation.ts
@@ -0,0 +1,39 @@
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZDeleteOrganisationRequestSchema,
+  ZDeleteOrganisationResponseSchema,
+} from './delete-organisation.types';
+
+export const deleteOrganisationRoute = authenticatedProcedure
+  //   .meta(deleteOrganisationMeta)
+  .input(ZDeleteOrganisationRequestSchema)
+  .output(ZDeleteOrganisationResponseSchema)
+  .mutation(async ({ input, ctx }) => {
+    const { organisationId } = input;
+    const { user } = ctx;
+
+    const organisation = await prisma.organisation.findFirst({
+      where: buildOrganisationWhereQuery({
+        organisationId,
+        userId: user.id,
+        roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['DELETE_ORGANISATION'],
+      }),
+    });
+
+    if (!organisation) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'You are not authorized to delete this organisation',
+      });
+    }
+
+    await prisma.organisation.delete({
+      where: {
+        id: organisation.id,
+      },
+    });
+  });
diff --git a/packages/trpc/server/organisation-router/delete-organisation.types.ts b/packages/trpc/server/organisation-router/delete-organisation.types.ts
new file mode 100644
index 000000000..0030e0fb4
--- /dev/null
+++ b/packages/trpc/server/organisation-router/delete-organisation.types.ts
@@ -0,0 +1,17 @@
+import { z } from 'zod';
+
+// export const deleteOrganisationMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'DELETE',
+//     path: '/organisation/{teamId}',
+//     summary: 'Delete organisation',
+//     description: 'Delete an existing organisation',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZDeleteOrganisationRequestSchema = z.object({
+  organisationId: z.string(),
+});
+
+export const ZDeleteOrganisationResponseSchema = z.void();
diff --git a/packages/trpc/server/organisation-router/find-organisation-groups.ts b/packages/trpc/server/organisation-router/find-organisation-groups.ts
new file mode 100644
index 000000000..1d6e39f95
--- /dev/null
+++ b/packages/trpc/server/organisation-router/find-organisation-groups.ts
@@ -0,0 +1,164 @@
+import type { OrganisationGroupType, OrganisationMemberRole } from '@prisma/client';
+import { Prisma } from '@prisma/client';
+
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import type { FindResultResponse } from '@documenso/lib/types/search-params';
+import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZFindOrganisationGroupsRequestSchema,
+  ZFindOrganisationGroupsResponseSchema,
+} from './find-organisation-groups.types';
+
+export const findOrganisationGroupsRoute = authenticatedProcedure
+  // .meta(findOrganisationGroupsMeta)
+  .input(ZFindOrganisationGroupsRequestSchema)
+  .output(ZFindOrganisationGroupsResponseSchema)
+  .query(async ({ input, ctx }) => {
+    const { organisationId, types, query, page, perPage, organisationGroupId, organisationRoles } =
+      input;
+    const { user } = ctx;
+
+    return await findOrganisationGroups({
+      userId: user.id,
+      organisationId,
+      organisationGroupId,
+      organisationRoles,
+      types,
+      query,
+      page,
+      perPage,
+    });
+  });
+
+type FindOrganisationGroupsOptions = {
+  userId: number;
+  organisationId: string;
+  organisationGroupId?: string;
+  organisationRoles?: OrganisationMemberRole[];
+  types?: OrganisationGroupType[];
+  query?: string;
+  page?: number;
+  perPage?: number;
+};
+
+export const findOrganisationGroups = async ({
+  userId,
+  organisationId,
+  organisationGroupId,
+  organisationRoles = [],
+  types = [],
+  query,
+  page = 1,
+  perPage = 10,
+}: FindOrganisationGroupsOptions) => {
+  const organisation = await prisma.organisation.findFirst({
+    where: buildOrganisationWhereQuery({ organisationId, userId }),
+  });
+
+  if (!organisation) {
+    throw new AppError(AppErrorCode.NOT_FOUND);
+  }
+
+  const whereClause: Prisma.OrganisationGroupWhereInput = {
+    organisationId: organisation.id,
+    type:
+      types.length > 0
+        ? {
+            in: types,
+          }
+        : undefined,
+    organisationRole:
+      organisationRoles.length > 0
+        ? {
+            in: organisationRoles,
+          }
+        : undefined,
+    id: organisationGroupId,
+  };
+
+  if (query) {
+    whereClause.name = {
+      contains: query,
+      mode: Prisma.QueryMode.insensitive,
+    };
+  }
+
+  const [data, count] = await Promise.all([
+    prisma.organisationGroup.findMany({
+      where: whereClause,
+      skip: Math.max(page - 1, 0) * perPage,
+      take: perPage,
+      orderBy: {
+        name: 'desc',
+      },
+      select: {
+        id: true,
+        name: true,
+        type: true,
+        organisationId: true,
+        organisationRole: true,
+        teamGroups: {
+          select: {
+            id: true,
+            teamId: true,
+            teamRole: true,
+            team: {
+              select: {
+                id: true,
+                name: true,
+              },
+            },
+          },
+        },
+        organisationGroupMembers: {
+          select: {
+            organisationMember: {
+              select: {
+                id: true,
+                user: {
+                  select: {
+                    id: true,
+                    email: true,
+                    name: true,
+                    avatarImageId: true,
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    }),
+    prisma.organisationGroup.count({
+      where: whereClause,
+    }),
+  ]);
+
+  const mappedData = data.map((group) => ({
+    ...group,
+    teams: group.teamGroups.map((teamGroup) => ({
+      id: teamGroup.team.id,
+      name: teamGroup.team.name,
+      teamGroupId: teamGroup.id,
+      teamRole: teamGroup.teamRole,
+    })),
+    members: group.organisationGroupMembers.map(({ organisationMember }) => ({
+      id: organisationMember.id,
+      userId: organisationMember.user.id,
+      name: organisationMember.user.name || '',
+      email: organisationMember.user.email,
+      avatarImageId: organisationMember.user.avatarImageId,
+    })),
+  }));
+
+  return {
+    data: mappedData,
+    count,
+    currentPage: Math.max(page, 1),
+    perPage,
+    totalPages: Math.ceil(count / perPage),
+  } satisfies FindResultResponse<typeof mappedData>;
+};
diff --git a/packages/trpc/server/organisation-router/find-organisation-groups.types.ts b/packages/trpc/server/organisation-router/find-organisation-groups.types.ts
new file mode 100644
index 000000000..549e55d2a
--- /dev/null
+++ b/packages/trpc/server/organisation-router/find-organisation-groups.types.ts
@@ -0,0 +1,54 @@
+import { OrganisationGroupType, OrganisationMemberRole, TeamMemberRole } from '@prisma/client';
+import { z } from 'zod';
+
+import { ZFindResultResponse, ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { OrganisationGroupSchema } from '@documenso/prisma/generated/zod/modelSchema/OrganisationGroupSchema';
+
+// export const getOrganisationGroupsMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'GET',
+//     path: '/organisation/{teamId}/groups',
+//     summary: 'Get organisation groups',
+//     description: 'Get all groups for a organisation',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZFindOrganisationGroupsRequestSchema = ZFindSearchParamsSchema.extend({
+  organisationId: z.string(),
+  organisationGroupId: z.string().optional(),
+  organisationRoles: z.nativeEnum(OrganisationMemberRole).array().optional(),
+  types: z.nativeEnum(OrganisationGroupType).array().optional(),
+});
+
+export const ZFindOrganisationGroupsResponseSchema = ZFindResultResponse.extend({
+  data: OrganisationGroupSchema.pick({
+    type: true,
+    organisationRole: true,
+    id: true,
+    name: true,
+    organisationId: true,
+  })
+    .extend({
+      members: z
+        .object({
+          id: z.string(),
+          userId: z.number(),
+          name: z.string(),
+          email: z.string(),
+          avatarImageId: z.string().nullable(),
+        })
+        .array(),
+      teams: z
+        .object({
+          id: z.number(),
+          name: z.string(),
+          teamGroupId: z.string(),
+          teamRole: z.nativeEnum(TeamMemberRole),
+        })
+        .array(),
+    })
+    .array(),
+});
+
+export type TFindOrganisationGroupsResponse = z.infer<typeof ZFindOrganisationGroupsResponseSchema>;
diff --git a/packages/trpc/server/organisation-router/find-organisation-member-invites.ts b/packages/trpc/server/organisation-router/find-organisation-member-invites.ts
new file mode 100644
index 000000000..29fe5369a
--- /dev/null
+++ b/packages/trpc/server/organisation-router/find-organisation-member-invites.ts
@@ -0,0 +1,105 @@
+import type { OrganisationMemberInviteStatus } from '@prisma/client';
+import { Prisma } from '@prisma/client';
+
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import type { FindResultResponse } from '@documenso/lib/types/search-params';
+import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZFindOrganisationMemberInvitesRequestSchema,
+  ZFindOrganisationMemberInvitesResponseSchema,
+} from './find-organisation-member-invites.types';
+
+export const findOrganisationMemberInvitesRoute = authenticatedProcedure
+  //   .meta(getOrganisationMemberInvitesMeta)
+  .input(ZFindOrganisationMemberInvitesRequestSchema)
+  .output(ZFindOrganisationMemberInvitesResponseSchema)
+  .query(async ({ input, ctx }) => {
+    const { organisationId, query, page, perPage, status } = input;
+    const { user } = ctx;
+
+    return await findOrganisationMemberInvites({
+      userId: user.id,
+      organisationId,
+      query,
+      page,
+      perPage,
+      status,
+    });
+  });
+
+type FindOrganisationMemberInvitesOptions = {
+  userId: number;
+  organisationId: string;
+  query?: string;
+  page?: number;
+  perPage?: number;
+  status?: OrganisationMemberInviteStatus;
+};
+
+export const findOrganisationMemberInvites = async ({
+  userId,
+  organisationId,
+  query,
+  page = 1,
+  perPage = 10,
+  status,
+}: FindOrganisationMemberInvitesOptions) => {
+  const organisation = await prisma.organisation.findFirst({
+    where: buildOrganisationWhereQuery({
+      organisationId,
+      userId,
+      roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+    }),
+  });
+
+  if (!organisation) {
+    throw new AppError(AppErrorCode.NOT_FOUND);
+  }
+
+  const whereClause: Prisma.OrganisationMemberInviteWhereInput = {
+    organisationId: organisation.id,
+    status,
+  };
+
+  if (query) {
+    whereClause.email = {
+      contains: query,
+      mode: Prisma.QueryMode.insensitive,
+    };
+  }
+
+  const [data, count] = await Promise.all([
+    prisma.organisationMemberInvite.findMany({
+      where: whereClause,
+      skip: Math.max(page - 1, 0) * perPage,
+      take: perPage,
+      orderBy: {
+        createdAt: 'desc',
+      },
+      // Exclude token attribute.
+      select: {
+        id: true,
+        organisationId: true,
+        email: true,
+        createdAt: true,
+        organisationRole: true,
+        status: true,
+      },
+    }),
+    prisma.organisationMemberInvite.count({
+      where: whereClause,
+    }),
+  ]);
+
+  return {
+    data,
+    count,
+    currentPage: Math.max(page, 1),
+    perPage,
+    totalPages: Math.ceil(count / perPage),
+  } satisfies FindResultResponse<typeof data>;
+};
diff --git a/packages/trpc/server/organisation-router/find-organisation-member-invites.types.ts b/packages/trpc/server/organisation-router/find-organisation-member-invites.types.ts
new file mode 100644
index 000000000..b33270cb6
--- /dev/null
+++ b/packages/trpc/server/organisation-router/find-organisation-member-invites.types.ts
@@ -0,0 +1,35 @@
+import { OrganisationMemberInviteStatus } from '@prisma/client';
+import { z } from 'zod';
+
+import { ZFindResultResponse, ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { OrganisationMemberInviteSchema } from '@documenso/prisma/generated/zod/modelSchema/OrganisationMemberInviteSchema';
+
+// export const getOrganisationMemberInvitesMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'GET',
+//     path: '/organisation/{teamId}/members/pending',
+//     summary: 'Find organisation members pending',
+//     description: 'Find all members of a organisation pending',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZFindOrganisationMemberInvitesRequestSchema = ZFindSearchParamsSchema.extend({
+  organisationId: z.string(),
+  status: z.nativeEnum(OrganisationMemberInviteStatus).optional(),
+});
+
+export const ZFindOrganisationMemberInvitesResponseSchema = ZFindResultResponse.extend({
+  data: OrganisationMemberInviteSchema.pick({
+    id: true,
+    organisationId: true,
+    email: true,
+    createdAt: true,
+    organisationRole: true,
+    status: true,
+  }).array(),
+});
+
+export type TFindOrganisationMemberInvitesResponse = z.infer<
+  typeof ZFindOrganisationMemberInvitesResponseSchema
+>;
diff --git a/packages/trpc/server/organisation-router/find-organisation-members.ts b/packages/trpc/server/organisation-router/find-organisation-members.ts
new file mode 100644
index 000000000..576003eaa
--- /dev/null
+++ b/packages/trpc/server/organisation-router/find-organisation-members.ts
@@ -0,0 +1,137 @@
+import { Prisma } from '@prisma/client';
+
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import type { FindResultResponse } from '@documenso/lib/types/search-params';
+import {
+  buildOrganisationWhereQuery,
+  getHighestOrganisationRoleInGroup,
+} from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZFindOrganisationMembersRequestSchema,
+  ZFindOrganisationMembersResponseSchema,
+} from './find-organisation-members.types';
+
+export const findOrganisationMembersRoute = authenticatedProcedure
+  //   .meta(getOrganisationMembersMeta)
+  .input(ZFindOrganisationMembersRequestSchema)
+  .output(ZFindOrganisationMembersResponseSchema)
+  .query(async ({ input, ctx }) => {
+    const { organisationId } = input;
+    const { id } = ctx.user;
+
+    const organisationMembers = await findOrganisationMembers({
+      userId: id,
+      organisationId,
+      query: input.query,
+      page: input.page,
+      perPage: input.perPage,
+    });
+
+    return {
+      ...organisationMembers,
+      data: organisationMembers.data.map((organisationMember) => {
+        const groups = organisationMember.organisationGroupMembers.map((group) => group.group);
+
+        return {
+          id: organisationMember.id,
+          userId: organisationMember.user.id,
+          email: organisationMember.user.email,
+          name: organisationMember.user.name || '',
+          createdAt: organisationMember.createdAt,
+          currentOrganisationRole: getHighestOrganisationRoleInGroup(groups),
+          avatarImageId: organisationMember.user.avatarImageId,
+          groups,
+        };
+      }),
+    };
+  });
+
+type FindOrganisationMembersOptions = {
+  userId: number;
+  organisationId: string;
+  query?: string;
+  page?: number;
+  perPage?: number;
+};
+
+export const findOrganisationMembers = async ({
+  userId,
+  organisationId,
+  query,
+  page = 1,
+  perPage = 10,
+}: FindOrganisationMembersOptions) => {
+  const organisation = await prisma.organisation.findFirst({
+    where: buildOrganisationWhereQuery({ organisationId, userId }),
+  });
+
+  if (!organisation) {
+    throw new AppError(AppErrorCode.NOT_FOUND);
+  }
+
+  const whereClause: Prisma.OrganisationMemberWhereInput = {
+    organisationId: organisation.id,
+  };
+
+  if (query) {
+    whereClause.user = {
+      OR: [
+        {
+          email: {
+            contains: query,
+            mode: Prisma.QueryMode.insensitive,
+          },
+        },
+        {
+          name: {
+            contains: query,
+            mode: Prisma.QueryMode.insensitive,
+          },
+        },
+      ],
+    };
+  }
+
+  const [data, count] = await Promise.all([
+    prisma.organisationMember.findMany({
+      where: whereClause,
+      skip: Math.max(page - 1, 0) * perPage,
+      take: perPage,
+      orderBy: {
+        createdAt: 'desc',
+      },
+      select: {
+        id: true,
+        organisationId: true,
+        user: {
+          select: {
+            id: true,
+            email: true,
+            name: true,
+            avatarImageId: true,
+          },
+        },
+        organisationGroupMembers: {
+          select: {
+            group: true,
+          },
+        },
+        createdAt: true,
+      },
+    }),
+    prisma.organisationMember.count({
+      where: whereClause,
+    }),
+  ]);
+
+  return {
+    data,
+    count,
+    currentPage: Math.max(page, 1),
+    perPage,
+    totalPages: Math.ceil(count / perPage),
+  } satisfies FindResultResponse<typeof data>;
+};
diff --git a/packages/trpc/server/organisation-router/find-organisation-members.types.ts b/packages/trpc/server/organisation-router/find-organisation-members.types.ts
new file mode 100644
index 000000000..8dbf2c262
--- /dev/null
+++ b/packages/trpc/server/organisation-router/find-organisation-members.types.ts
@@ -0,0 +1,46 @@
+import { z } from 'zod';
+
+import { ZFindResultResponse, ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
+import OrganisationMemberRoleSchema from '@documenso/prisma/generated/zod/inputTypeSchemas/OrganisationMemberRoleSchema';
+import OrganisationGroupSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationGroupSchema';
+import { OrganisationMemberSchema } from '@documenso/prisma/generated/zod/modelSchema/OrganisationMemberSchema';
+
+// export const getOrganisationMembersMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'GET',
+//     path: '/organisation/{teamId}/members',
+//     summary: 'Find organisation members',
+//     description: 'Find all members of a organisation',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZFindOrganisationMembersRequestSchema = ZFindSearchParamsSchema.extend({
+  organisationId: z.string(),
+});
+
+export const ZFindOrganisationMembersResponseSchema = ZFindResultResponse.extend({
+  data: OrganisationMemberSchema.pick({
+    id: true,
+    createdAt: true,
+    userId: true,
+  })
+    .extend({
+      email: z.string(),
+      name: z.string(),
+      avatarImageId: z.string().nullable(),
+      currentOrganisationRole: OrganisationMemberRoleSchema,
+      groups: z.array(
+        OrganisationGroupSchema.pick({
+          id: true,
+          organisationRole: true,
+          type: true,
+        }),
+      ),
+    })
+    .array(),
+});
+
+export type TFindOrganisationMembersResponse = z.infer<
+  typeof ZFindOrganisationMembersResponseSchema
+>;
diff --git a/packages/trpc/server/organisation-router/get-organisation-member-invites.ts b/packages/trpc/server/organisation-router/get-organisation-member-invites.ts
new file mode 100644
index 000000000..15f88fdd3
--- /dev/null
+++ b/packages/trpc/server/organisation-router/get-organisation-member-invites.ts
@@ -0,0 +1,34 @@
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZGetOrganisationMemberInvitesRequestSchema,
+  ZGetOrganisationMemberInvitesResponseSchema,
+} from './get-organisation-member-invites.types';
+
+export const getOrganisationMemberInvitesRoute = authenticatedProcedure
+  //   .meta(getOrganisationMemberInvitesMeta)
+  .input(ZGetOrganisationMemberInvitesRequestSchema)
+  .output(ZGetOrganisationMemberInvitesResponseSchema)
+  .query(async ({ input, ctx }) => {
+    const { user } = ctx;
+
+    const { status } = input;
+
+    return await prisma.organisationMemberInvite.findMany({
+      where: {
+        email: user.email,
+        status,
+      },
+      include: {
+        organisation: {
+          select: {
+            id: true,
+            name: true,
+            url: true,
+            avatarImageId: true,
+          },
+        },
+      },
+    });
+  });
diff --git a/packages/trpc/server/organisation-router/get-organisation-member-invites.types.ts b/packages/trpc/server/organisation-router/get-organisation-member-invites.types.ts
new file mode 100644
index 000000000..a1fb29f5f
--- /dev/null
+++ b/packages/trpc/server/organisation-router/get-organisation-member-invites.types.ts
@@ -0,0 +1,30 @@
+import { OrganisationMemberInviteStatus } from '@prisma/client';
+import { z } from 'zod';
+
+import { OrganisationMemberInviteSchema } from '@documenso/prisma/generated/zod/modelSchema/OrganisationMemberInviteSchema';
+import OrganisationSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationSchema';
+
+export const ZGetOrganisationMemberInvitesRequestSchema = z.object({
+  status: z.nativeEnum(OrganisationMemberInviteStatus).optional(),
+});
+
+export const ZGetOrganisationMemberInvitesResponseSchema = OrganisationMemberInviteSchema.pick({
+  id: true,
+  organisationId: true,
+  email: true,
+  createdAt: true,
+  token: true,
+})
+  .extend({
+    organisation: OrganisationSchema.pick({
+      id: true,
+      name: true,
+      url: true,
+      avatarImageId: true,
+    }),
+  })
+  .array();
+
+export type TGetOrganisationMemberInvitesResponse = z.infer<
+  typeof ZGetOrganisationMemberInvitesResponseSchema
+>;
diff --git a/packages/trpc/server/organisation-router/get-organisation-session.ts b/packages/trpc/server/organisation-router/get-organisation-session.ts
new file mode 100644
index 000000000..43fedf5a0
--- /dev/null
+++ b/packages/trpc/server/organisation-router/get-organisation-session.ts
@@ -0,0 +1,79 @@
+import { getHighestOrganisationRoleInGroup } from '@documenso/lib/utils/organisations';
+import { buildTeamWhereQuery, getHighestTeamRoleInGroup } from '@documenso/lib/utils/teams';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import type { TGetOrganisationSessionResponse } from './get-organisation-session.types';
+import { ZGetOrganisationSessionResponseSchema } from './get-organisation-session.types';
+
+/**
+ * Get all the organisations and teams a user belongs to.
+ */
+export const getOrganisationSessionRoute = authenticatedProcedure
+  .output(ZGetOrganisationSessionResponseSchema)
+  .query(async ({ ctx }) => {
+    return await getOrganisationSession({ userId: ctx.user.id });
+  });
+
+export const getOrganisationSession = async ({
+  userId,
+}: {
+  userId: number;
+}): Promise<TGetOrganisationSessionResponse> => {
+  const organisations = await prisma.organisation.findMany({
+    where: {
+      members: {
+        some: {
+          userId,
+        },
+      },
+    },
+    include: {
+      organisationClaim: true,
+      subscription: true,
+      groups: {
+        where: {
+          organisationGroupMembers: {
+            some: {
+              organisationMember: {
+                userId,
+              },
+            },
+          },
+        },
+      },
+      teams: {
+        where: buildTeamWhereQuery({ teamId: undefined, userId }),
+        include: {
+          teamGroups: {
+            where: {
+              organisationGroup: {
+                organisationGroupMembers: {
+                  some: {
+                    organisationMember: {
+                      userId,
+                    },
+                  },
+                },
+              },
+            },
+            include: {
+              organisationGroup: true,
+            },
+          },
+        },
+      },
+    },
+  });
+
+  return organisations.map((organisation) => {
+    return {
+      ...organisation,
+      teams: organisation.teams.map((team) => ({
+        ...team,
+        currentTeamRole: getHighestTeamRoleInGroup(team.teamGroups),
+      })),
+      currentOrganisationRole: getHighestOrganisationRoleInGroup(organisation.groups),
+    };
+  });
+};
diff --git a/packages/trpc/server/organisation-router/get-organisation-session.types.ts b/packages/trpc/server/organisation-router/get-organisation-session.types.ts
new file mode 100644
index 000000000..8b63d0e01
--- /dev/null
+++ b/packages/trpc/server/organisation-router/get-organisation-session.types.ts
@@ -0,0 +1,28 @@
+import { z } from 'zod';
+
+import { ZOrganisationSchema } from '@documenso/lib/types/organisation';
+import { OrganisationMemberRole, TeamMemberRole } from '@documenso/prisma/generated/types';
+import SubscriptionSchema from '@documenso/prisma/generated/zod/modelSchema/SubscriptionSchema';
+import TeamSchema from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
+
+export const ZGetOrganisationSessionResponseSchema = ZOrganisationSchema.extend({
+  teams: z.array(
+    TeamSchema.pick({
+      id: true,
+      name: true,
+      url: true,
+      createdAt: true,
+      avatarImageId: true,
+      organisationId: true,
+    }).extend({
+      currentTeamRole: z.nativeEnum(TeamMemberRole),
+    }),
+  ),
+  subscription: SubscriptionSchema.nullable(),
+  currentOrganisationRole: z.nativeEnum(OrganisationMemberRole),
+}).array();
+
+export type TGetOrganisationSessionResponse = z.infer<typeof ZGetOrganisationSessionResponseSchema>;
+
+export type TeamSession = TGetOrganisationSessionResponse[number]['teams'][number];
+export type OrganisationSession = TGetOrganisationSessionResponse[number];
diff --git a/packages/trpc/server/organisation-router/get-organisation.ts b/packages/trpc/server/organisation-router/get-organisation.ts
new file mode 100644
index 000000000..51037550e
--- /dev/null
+++ b/packages/trpc/server/organisation-router/get-organisation.ts
@@ -0,0 +1,79 @@
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZGetOrganisationRequestSchema,
+  ZGetOrganisationResponseSchema,
+} from './get-organisation.types';
+
+export const getOrganisationRoute = authenticatedProcedure
+  //   .meta(getOrganisationMeta)
+  .input(ZGetOrganisationRequestSchema)
+  .output(ZGetOrganisationResponseSchema)
+  .query(async ({ input, ctx }) => {
+    const { organisationReference } = input;
+
+    return await getOrganisation({
+      userId: ctx.user.id,
+      organisationReference,
+    });
+  });
+
+type GetOrganisationOptions = {
+  userId: number;
+
+  /**
+   * The ID or URL of the organisation.
+   */
+  organisationReference: string;
+};
+
+export const getOrganisation = async ({
+  userId,
+  organisationReference,
+}: GetOrganisationOptions) => {
+  const organisation = await prisma.organisation.findFirst({
+    where: {
+      OR: [{ id: organisationReference }, { url: organisationReference }],
+      members: {
+        some: {
+          userId,
+        },
+      },
+    },
+    include: {
+      organisationGlobalSettings: true,
+      subscription: true,
+      organisationClaim: true,
+      teams: {
+        where: {
+          teamGroups: {
+            some: {
+              organisationGroup: {
+                organisationGroupMembers: {
+                  some: {
+                    organisationMember: {
+                      userId,
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (!organisation) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Organisation not found',
+    });
+  }
+
+  return {
+    ...organisation,
+    teams: organisation.teams,
+  };
+};
diff --git a/packages/trpc/server/organisation-router/get-organisation.types.ts b/packages/trpc/server/organisation-router/get-organisation.types.ts
new file mode 100644
index 000000000..39df51b3d
--- /dev/null
+++ b/packages/trpc/server/organisation-router/get-organisation.types.ts
@@ -0,0 +1,39 @@
+import { z } from 'zod';
+
+import { ZOrganisationSchema } from '@documenso/lib/types/organisation';
+import OrganisationClaimSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationClaimSchema';
+import OrganisationGlobalSettingsSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationGlobalSettingsSchema';
+import SubscriptionSchema from '@documenso/prisma/generated/zod/modelSchema/SubscriptionSchema';
+import TeamSchema from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
+
+// export const getOrganisationMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'GET',
+//     path: '/organisation/{teamReference}',
+//     summary: 'Get organisation',
+//     description: 'Get an organisation by ID or URL',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZGetOrganisationRequestSchema = z.object({
+  organisationReference: z.string().describe('The ID or URL of the organisation.'),
+});
+
+export const ZGetOrganisationResponseSchema = ZOrganisationSchema.extend({
+  organisationGlobalSettings: OrganisationGlobalSettingsSchema,
+  organisationClaim: OrganisationClaimSchema,
+  subscription: SubscriptionSchema.nullable(),
+  teams: z.array(
+    TeamSchema.pick({
+      id: true,
+      name: true,
+      url: true,
+      createdAt: true,
+      avatarImageId: true,
+      organisationId: true,
+    }),
+  ),
+});
+
+export type TGetOrganisationResponse = z.infer<typeof ZGetOrganisationResponseSchema>;
diff --git a/packages/trpc/server/organisation-router/get-organisations.ts b/packages/trpc/server/organisation-router/get-organisations.ts
new file mode 100644
index 000000000..8a7326a2d
--- /dev/null
+++ b/packages/trpc/server/organisation-router/get-organisations.ts
@@ -0,0 +1,58 @@
+import { getHighestOrganisationRoleInGroup } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZGetOrganisationsRequestSchema,
+  ZGetOrganisationsResponseSchema,
+} from './get-organisations.types';
+
+export const getOrganisationsRoute = authenticatedProcedure
+  //   .meta(getOrganisationsMeta)
+  .input(ZGetOrganisationsRequestSchema)
+  .output(ZGetOrganisationsResponseSchema)
+  .query(async ({ ctx }) => {
+    const { user } = ctx;
+
+    return getOrganisations({ userId: user.id });
+  });
+
+export const getOrganisations = async ({ userId }: { userId: number }) => {
+  const organisations = await prisma.organisation.findMany({
+    where: {
+      members: {
+        some: {
+          userId,
+        },
+      },
+    },
+    include: {
+      members: {
+        where: {
+          userId,
+        },
+      },
+      groups: {
+        where: {
+          organisationGroupMembers: {
+            some: {
+              organisationMember: {
+                userId,
+              },
+            },
+          },
+        },
+      },
+    },
+  });
+
+  return organisations.map(({ groups, ...organisation }) => {
+    const currentOrganisationRole = getHighestOrganisationRoleInGroup(groups);
+
+    return {
+      ...organisation,
+      currentOrganisationRole: currentOrganisationRole,
+      currentMemberId: organisation.members[0].id,
+    };
+  });
+};
diff --git a/packages/trpc/server/organisation-router/get-organisations.types.ts b/packages/trpc/server/organisation-router/get-organisations.types.ts
new file mode 100644
index 000000000..714fbf68b
--- /dev/null
+++ b/packages/trpc/server/organisation-router/get-organisations.types.ts
@@ -0,0 +1,23 @@
+import { z } from 'zod';
+
+import { ZOrganisationManySchema } from '@documenso/lib/types/organisation';
+import OrganisationMemberRoleSchema from '@documenso/prisma/generated/zod/inputTypeSchemas/OrganisationMemberRoleSchema';
+
+// export const getOrganisationsMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'GET',
+//     path: '/organisation/teams',
+//     summary: 'Get teams',
+//     description: 'Get all teams you are a member of',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZGetOrganisationsRequestSchema = z.void();
+
+export const ZGetOrganisationsResponseSchema = ZOrganisationManySchema.extend({
+  currentOrganisationRole: OrganisationMemberRoleSchema,
+  currentMemberId: z.string(),
+}).array();
+
+export type TGetOrganisationsResponse = z.infer<typeof ZGetOrganisationsResponseSchema>;
diff --git a/packages/trpc/server/organisation-router/leave-organisation.ts b/packages/trpc/server/organisation-router/leave-organisation.ts
new file mode 100644
index 000000000..c925adc6b
--- /dev/null
+++ b/packages/trpc/server/organisation-router/leave-organisation.ts
@@ -0,0 +1,75 @@
+import { syncMemberCountWithStripeSeatPlan } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { jobs } from '@documenso/lib/jobs/client';
+import { validateIfSubscriptionIsRequired } from '@documenso/lib/utils/billing';
+import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+import { OrganisationMemberInviteStatus } from '@documenso/prisma/client';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZLeaveOrganisationRequestSchema,
+  ZLeaveOrganisationResponseSchema,
+} from './leave-organisation.types';
+
+export const leaveOrganisationRoute = authenticatedProcedure
+  .input(ZLeaveOrganisationRequestSchema)
+  .output(ZLeaveOrganisationResponseSchema)
+  .mutation(async ({ ctx, input }) => {
+    const { organisationId } = input;
+
+    const userId = ctx.user.id;
+
+    const organisation = await prisma.organisation.findFirst({
+      where: buildOrganisationWhereQuery({ organisationId, userId }),
+      include: {
+        organisationClaim: true,
+        subscription: true,
+        invites: {
+          where: {
+            status: OrganisationMemberInviteStatus.PENDING,
+          },
+          select: {
+            id: true,
+          },
+        },
+        members: {
+          select: {
+            id: true,
+          },
+        },
+      },
+    });
+
+    if (!organisation) {
+      throw new AppError(AppErrorCode.NOT_FOUND);
+    }
+
+    const { organisationClaim } = organisation;
+
+    const subscription = validateIfSubscriptionIsRequired(organisation.subscription);
+
+    const inviteCount = organisation.invites.length;
+    const newMemberCount = organisation.members.length + inviteCount - 1;
+
+    if (subscription) {
+      await syncMemberCountWithStripeSeatPlan(subscription, organisationClaim, newMemberCount);
+    }
+
+    await prisma.organisationMember.delete({
+      where: {
+        userId_organisationId: {
+          userId,
+          organisationId,
+        },
+      },
+    });
+
+    await jobs.triggerJob({
+      name: 'send.organisation-member-left.email',
+      payload: {
+        organisationId: organisation.id,
+        memberUserId: userId,
+      },
+    });
+  });
diff --git a/packages/trpc/server/organisation-router/leave-organisation.types.ts b/packages/trpc/server/organisation-router/leave-organisation.types.ts
new file mode 100644
index 000000000..0dd275618
--- /dev/null
+++ b/packages/trpc/server/organisation-router/leave-organisation.types.ts
@@ -0,0 +1,7 @@
+import { z } from 'zod';
+
+export const ZLeaveOrganisationRequestSchema = z.object({
+  organisationId: z.string(),
+});
+
+export const ZLeaveOrganisationResponseSchema = z.void();
diff --git a/packages/trpc/server/organisation-router/resend-organisation-member-invite.ts b/packages/trpc/server/organisation-router/resend-organisation-member-invite.ts
new file mode 100644
index 000000000..9dbae3b2c
--- /dev/null
+++ b/packages/trpc/server/organisation-router/resend-organisation-member-invite.ts
@@ -0,0 +1,99 @@
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { sendOrganisationMemberInviteEmail } from '@documenso/lib/server-only/organisation/create-organisation-member-invites';
+import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZResendOrganisationMemberInviteRequestSchema,
+  ZResendOrganisationMemberInviteResponseSchema,
+} from './resend-organisation-member-invite.types';
+
+export const resendOrganisationMemberInviteRoute = authenticatedProcedure
+  //   .meta(resendOrganisationMemberInviteMeta)
+  .input(ZResendOrganisationMemberInviteRequestSchema)
+  .output(ZResendOrganisationMemberInviteResponseSchema)
+  .mutation(async ({ ctx, input }) => {
+    const { organisationId, invitationId } = input;
+
+    const userId = ctx.user.id;
+    const userName = ctx.user.name || '';
+
+    await resendOrganisationMemberInvitation({
+      userId,
+      userName,
+      organisationId,
+      invitationId,
+    });
+  });
+
+export type ResendOrganisationMemberInvitationOptions = {
+  /**
+   * The ID of the user who is initiating this action.
+   */
+  userId: number;
+
+  /**
+   * The name of the user who is initiating this action.
+   */
+  userName: string;
+
+  /**
+   * The ID of the organisation.
+   */
+  organisationId: string;
+
+  /**
+   * The IDs of the invitations to resend.
+   */
+  invitationId: string;
+};
+
+/**
+ * Resend an email for a given member invite.
+ */
+export const resendOrganisationMemberInvitation = async ({
+  userId,
+  userName,
+  organisationId,
+  invitationId,
+}: ResendOrganisationMemberInvitationOptions): Promise<void> => {
+  const organisation = await prisma.organisation.findFirst({
+    where: buildOrganisationWhereQuery({
+      organisationId,
+      userId,
+      roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+    }),
+    include: {
+      organisationGlobalSettings: true,
+      invites: {
+        where: {
+          id: invitationId,
+        },
+      },
+    },
+  });
+
+  if (!organisation) {
+    throw new AppError('OrganisationNotFound', {
+      message: 'User is not a valid member of the team.',
+      statusCode: 404,
+    });
+  }
+
+  const invitation = organisation.invites[0];
+
+  if (!invitation) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Invitation does not exist',
+    });
+  }
+
+  await sendOrganisationMemberInviteEmail({
+    email: invitation.email,
+    token: invitation.token,
+    senderName: userName,
+    organisation,
+  });
+};
diff --git a/packages/trpc/server/organisation-router/resend-organisation-member-invite.types.ts b/packages/trpc/server/organisation-router/resend-organisation-member-invite.types.ts
new file mode 100644
index 000000000..18124d6cb
--- /dev/null
+++ b/packages/trpc/server/organisation-router/resend-organisation-member-invite.types.ts
@@ -0,0 +1,18 @@
+import { z } from 'zod';
+
+// export const resendOrganisationMemberInviteMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/organisation/member/resend-invite',
+//     summary: 'Resend organisation member invite',
+//     description: 'Resend a organisation member invite',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZResendOrganisationMemberInviteRequestSchema = z.object({
+  organisationId: z.string(),
+  invitationId: z.string(),
+});
+
+export const ZResendOrganisationMemberInviteResponseSchema = z.void();
diff --git a/packages/trpc/server/organisation-router/router.ts b/packages/trpc/server/organisation-router/router.ts
new file mode 100644
index 000000000..e3abe700a
--- /dev/null
+++ b/packages/trpc/server/organisation-router/router.ts
@@ -0,0 +1,60 @@
+import { router } from '../trpc';
+import { acceptOrganisationMemberInviteRoute } from './accept-organisation-member-invite';
+import { createOrganisationRoute } from './create-organisation';
+import { createOrganisationGroupRoute } from './create-organisation-group';
+import { createOrganisationMemberInvitesRoute } from './create-organisation-member-invites';
+import { declineOrganisationMemberInviteRoute } from './decline-organisation-member-invite';
+import { deleteOrganisationRoute } from './delete-organisation';
+import { deleteOrganisationGroupRoute } from './delete-organisation-group';
+import { deleteOrganisationMemberRoute } from './delete-organisation-member';
+import { deleteOrganisationMemberInvitesRoute } from './delete-organisation-member-invites';
+import { deleteOrganisationMembersRoute } from './delete-organisation-members';
+import { findOrganisationGroupsRoute } from './find-organisation-groups';
+import { findOrganisationMemberInvitesRoute } from './find-organisation-member-invites';
+import { findOrganisationMembersRoute } from './find-organisation-members';
+import { getOrganisationRoute } from './get-organisation';
+import { getOrganisationMemberInvitesRoute } from './get-organisation-member-invites';
+import { getOrganisationSessionRoute } from './get-organisation-session';
+import { getOrganisationsRoute } from './get-organisations';
+import { leaveOrganisationRoute } from './leave-organisation';
+import { resendOrganisationMemberInviteRoute } from './resend-organisation-member-invite';
+import { updateOrganisationRoute } from './update-organisation';
+import { updateOrganisationGroupRoute } from './update-organisation-group';
+import { updateOrganisationMemberRoute } from './update-organisation-members';
+import { updateOrganisationSettingsRoute } from './update-organisation-settings';
+
+export const organisationRouter = router({
+  get: getOrganisationRoute,
+  getMany: getOrganisationsRoute,
+  create: createOrganisationRoute,
+  update: updateOrganisationRoute,
+  delete: deleteOrganisationRoute,
+  leave: leaveOrganisationRoute,
+  member: {
+    find: findOrganisationMembersRoute,
+    update: updateOrganisationMemberRoute,
+    delete: deleteOrganisationMemberRoute,
+    deleteMany: deleteOrganisationMembersRoute,
+    invite: {
+      find: findOrganisationMemberInvitesRoute,
+      getMany: getOrganisationMemberInvitesRoute,
+      createMany: createOrganisationMemberInvitesRoute,
+      deleteMany: deleteOrganisationMemberInvitesRoute,
+      accept: acceptOrganisationMemberInviteRoute,
+      decline: declineOrganisationMemberInviteRoute,
+      resend: resendOrganisationMemberInviteRoute,
+    },
+  },
+  group: {
+    find: findOrganisationGroupsRoute,
+    create: createOrganisationGroupRoute,
+    update: updateOrganisationGroupRoute,
+    delete: deleteOrganisationGroupRoute,
+  },
+  settings: {
+    update: updateOrganisationSettingsRoute,
+  },
+  internal: {
+    getOrganisationSession: getOrganisationSessionRoute,
+  },
+});
diff --git a/packages/trpc/server/organisation-router/update-organisation-group.ts b/packages/trpc/server/organisation-router/update-organisation-group.ts
new file mode 100644
index 000000000..3eef706d3
--- /dev/null
+++ b/packages/trpc/server/organisation-router/update-organisation-group.ts
@@ -0,0 +1,127 @@
+import { unique } from 'remeda';
+
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { getMemberOrganisationRole } from '@documenso/lib/server-only/team/get-member-roles';
+import { generateDatabaseId } from '@documenso/lib/universal/id';
+import {
+  buildOrganisationWhereQuery,
+  isOrganisationRoleWithinUserHierarchy,
+} from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+import { OrganisationGroupType } from '@documenso/prisma/generated/types';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZUpdateOrganisationGroupRequestSchema,
+  ZUpdateOrganisationGroupResponseSchema,
+} from './update-organisation-group.types';
+
+export const updateOrganisationGroupRoute = authenticatedProcedure
+  // .meta(updateOrganisationGroupMeta)
+  .input(ZUpdateOrganisationGroupRequestSchema)
+  .output(ZUpdateOrganisationGroupResponseSchema)
+  .mutation(async ({ input, ctx }) => {
+    const { id, ...data } = input;
+    const { user } = ctx;
+
+    const organisationGroup = await prisma.organisationGroup.findFirst({
+      where: {
+        id,
+        organisation: buildOrganisationWhereQuery({
+          organisationId: undefined,
+          userId: user.id,
+          roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+        }),
+      },
+      include: {
+        organisationGroupMembers: true,
+      },
+    });
+
+    if (!organisationGroup) {
+      throw new AppError(AppErrorCode.NOT_FOUND, {
+        message: 'Organisation group not found',
+      });
+    }
+
+    if (organisationGroup.type === OrganisationGroupType.INTERNAL_ORGANISATION) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'You are not allowed to update internal organisation groups',
+      });
+    }
+
+    const currentUserOrganisationRole = await getMemberOrganisationRole({
+      organisationId: organisationGroup.organisationId,
+      reference: {
+        type: 'User',
+        id: user.id,
+      },
+    });
+
+    if (
+      !isOrganisationRoleWithinUserHierarchy(
+        currentUserOrganisationRole,
+        organisationGroup.organisationRole,
+      )
+    ) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'You are not allowed to update this organisation group',
+      });
+    }
+
+    if (
+      data.organisationRole &&
+      !isOrganisationRoleWithinUserHierarchy(currentUserOrganisationRole, data.organisationRole)
+    ) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'You are not allowed to set an organisation role higher than your own',
+      });
+    }
+
+    const groupMemberIds = unique(data.memberIds || []);
+
+    const membersToDelete = organisationGroup.organisationGroupMembers.filter(
+      (member) => !groupMemberIds.includes(member.organisationMemberId),
+    );
+
+    const membersToCreate = groupMemberIds.filter(
+      (id) =>
+        !organisationGroup.organisationGroupMembers.some(
+          (member) => member.organisationMemberId === id,
+        ),
+    );
+
+    await prisma.$transaction(async (tx) => {
+      await tx.organisationGroup.update({
+        where: {
+          id,
+        },
+        data: {
+          organisationRole: data.organisationRole,
+          name: data.name,
+        },
+      });
+
+      // Only run deletion if memberIds is defined.
+      if (data.memberIds && membersToDelete.length > 0) {
+        await tx.organisationGroupMember.deleteMany({
+          where: {
+            groupId: organisationGroup.id,
+            organisationMemberId: { in: membersToDelete.map((m) => m.organisationMemberId) },
+          },
+        });
+      }
+
+      // Only run creation if memberIds is defined.
+      if (data.memberIds && membersToCreate.length > 0) {
+        await tx.organisationGroupMember.createMany({
+          data: membersToCreate.map((id) => ({
+            id: generateDatabaseId('group_member'),
+            groupId: organisationGroup.id,
+            organisationMemberId: id,
+          })),
+        });
+      }
+    });
+  });
diff --git a/packages/trpc/server/organisation-router/update-organisation-group.types.ts b/packages/trpc/server/organisation-router/update-organisation-group.types.ts
new file mode 100644
index 000000000..a32187edc
--- /dev/null
+++ b/packages/trpc/server/organisation-router/update-organisation-group.types.ts
@@ -0,0 +1,24 @@
+import { OrganisationMemberRole } from '@prisma/client';
+import { z } from 'zod';
+
+// export const updateOrganisationGroupMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/organisation/groups/{id}',
+//     summary: 'Update organisation group',
+//     description: 'Update an existing group for a organisation',
+//     tags: ['Organisation'],
+//     requiredScopes: ['personal:organisation:write'],
+//   },
+// };
+
+export const ZUpdateOrganisationGroupRequestSchema = z.object({
+  id: z.string(),
+  name: z.string().nullable().optional(),
+  organisationRole: z.nativeEnum(OrganisationMemberRole).optional(),
+  memberIds: z.array(z.string()).optional(),
+});
+
+export const ZUpdateOrganisationGroupResponseSchema = z.void();
+
+export type TUpdateOrganisationGroupRequest = z.infer<typeof ZUpdateOrganisationGroupRequestSchema>;
diff --git a/packages/trpc/server/organisation-router/update-organisation-members.ts b/packages/trpc/server/organisation-router/update-organisation-members.ts
new file mode 100644
index 000000000..20bd2a1b9
--- /dev/null
+++ b/packages/trpc/server/organisation-router/update-organisation-members.ts
@@ -0,0 +1,156 @@
+import { OrganisationGroupType } from '@prisma/client';
+
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { generateDatabaseId } from '@documenso/lib/universal/id';
+import {
+  buildOrganisationWhereQuery,
+  getHighestOrganisationRoleInGroup,
+  isOrganisationRoleWithinUserHierarchy,
+} from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZUpdateOrganisationMemberRequestSchema,
+  ZUpdateOrganisationMemberResponseSchema,
+} from './update-organisation-members.types';
+
+export const updateOrganisationMemberRoute = authenticatedProcedure
+  //   .meta(updateOrganisationMemberMeta)
+  .input(ZUpdateOrganisationMemberRequestSchema)
+  .output(ZUpdateOrganisationMemberResponseSchema)
+  .mutation(async ({ ctx, input }) => {
+    const { organisationId, organisationMemberId, data } = input;
+    const userId = ctx.user.id;
+
+    const organisation = await prisma.organisation.findFirst({
+      where: buildOrganisationWhereQuery({
+        organisationId,
+        userId,
+        roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+      }),
+      include: {
+        groups: {
+          where: {
+            type: OrganisationGroupType.INTERNAL_ORGANISATION,
+          },
+        },
+        members: {
+          include: {
+            organisationGroupMembers: {
+              include: {
+                group: true,
+              },
+            },
+            user: {
+              select: {
+                id: true,
+                name: true,
+                email: true,
+              },
+            },
+          },
+        },
+      },
+    });
+
+    if (!organisation) {
+      throw new AppError(AppErrorCode.NOT_FOUND, { message: 'Organisation not found' });
+    }
+
+    const currentUser = organisation.members.find((member) => member.userId === userId);
+
+    const organisationMemberToUpdate = organisation.members.find(
+      (member) => member.id === organisationMemberId,
+    );
+
+    if (!organisationMemberToUpdate || !currentUser) {
+      throw new AppError(AppErrorCode.NOT_FOUND, { message: 'Organisation member does not exist' });
+    }
+
+    if (organisationMemberToUpdate.userId === organisation.ownerUserId) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, { message: 'Cannot update the owner' });
+    }
+
+    const currentUserOrganisationRoles = currentUser.organisationGroupMembers.filter(
+      ({ group }) => group.type === OrganisationGroupType.INTERNAL_ORGANISATION,
+    );
+
+    if (currentUserOrganisationRoles.length !== 1) {
+      throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+        message: 'Current user has multiple internal organisation roles',
+      });
+    }
+
+    const currentUserOrganisationRole = currentUserOrganisationRoles[0].group.organisationRole;
+    const currentMemberToUpdateOrganisationRole = getHighestOrganisationRoleInGroup(
+      organisationMemberToUpdate.organisationGroupMembers.flatMap((member) => member.group),
+    );
+
+    const isMemberToUpdateHigherRole = !isOrganisationRoleWithinUserHierarchy(
+      currentUserOrganisationRole,
+      currentMemberToUpdateOrganisationRole,
+    );
+
+    if (isMemberToUpdateHigherRole) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'Cannot update a member with a higher role',
+      });
+    }
+
+    const isNewMemberRoleHigherThanCurrentRole = !isOrganisationRoleWithinUserHierarchy(
+      currentUserOrganisationRole,
+      data.role,
+    );
+
+    if (isNewMemberRoleHigherThanCurrentRole) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'Cannot give a member a role higher than the user initating the update',
+      });
+    }
+
+    const currentMemberGroup = organisation.groups.find(
+      (group) => group.organisationRole === currentMemberToUpdateOrganisationRole,
+    );
+
+    const newMemberGroup = organisation.groups.find(
+      (group) => group.organisationRole === data.role,
+    );
+
+    if (!currentMemberGroup) {
+      console.error('[CRITICAL]: Missing internal group');
+
+      throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+        message: 'Current member group not found',
+      });
+    }
+
+    if (!newMemberGroup) {
+      console.error('[CRITICAL]: Missing internal group');
+
+      throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+        message: 'New member group not found',
+      });
+    }
+
+    // Switch member to new internal group role.
+    await prisma.$transaction(async (tx) => {
+      await tx.organisationGroupMember.delete({
+        where: {
+          organisationMemberId_groupId: {
+            organisationMemberId: organisationMemberToUpdate.id,
+            groupId: currentMemberGroup.id,
+          },
+        },
+      });
+
+      await tx.organisationGroupMember.create({
+        data: {
+          id: generateDatabaseId('group_member'),
+          organisationMemberId: organisationMemberToUpdate.id,
+          groupId: newMemberGroup.id,
+        },
+      });
+    });
+  });
diff --git a/packages/trpc/server/organisation-router/update-organisation-members.types.ts b/packages/trpc/server/organisation-router/update-organisation-members.types.ts
new file mode 100644
index 000000000..8bcc2febc
--- /dev/null
+++ b/packages/trpc/server/organisation-router/update-organisation-members.types.ts
@@ -0,0 +1,22 @@
+import { OrganisationMemberRole } from '@prisma/client';
+import { z } from 'zod';
+
+// export const updateOrganisationMemberMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/organisation/member/update',
+//     summary: 'Update organisation member',
+//     description: 'Update organisation member',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZUpdateOrganisationMemberRequestSchema = z.object({
+  organisationId: z.string(),
+  organisationMemberId: z.string(),
+  data: z.object({
+    role: z.nativeEnum(OrganisationMemberRole),
+  }),
+});
+
+export const ZUpdateOrganisationMemberResponseSchema = z.void();
diff --git a/packages/trpc/server/organisation-router/update-organisation-settings.ts b/packages/trpc/server/organisation-router/update-organisation-settings.ts
new file mode 100644
index 000000000..114d8d0a0
--- /dev/null
+++ b/packages/trpc/server/organisation-router/update-organisation-settings.ts
@@ -0,0 +1,100 @@
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZUpdateOrganisationSettingsRequestSchema,
+  ZUpdateOrganisationSettingsResponseSchema,
+} from './update-organisation-settings.types';
+
+export const updateOrganisationSettingsRoute = authenticatedProcedure
+  .input(ZUpdateOrganisationSettingsRequestSchema)
+  .output(ZUpdateOrganisationSettingsResponseSchema)
+  .mutation(async ({ ctx, input }) => {
+    const { user } = ctx;
+    const { organisationId, data } = input;
+
+    const {
+      // Document related settings.
+      documentVisibility,
+      documentLanguage,
+      includeSenderDetails,
+      includeSigningCertificate,
+      typedSignatureEnabled,
+      uploadSignatureEnabled,
+      drawSignatureEnabled,
+      // Branding related settings.
+      brandingEnabled,
+      brandingLogo,
+      brandingUrl,
+      brandingCompanyDetails,
+    } = data;
+
+    if (Object.values(data).length === 0) {
+      throw new AppError(AppErrorCode.INVALID_BODY, {
+        message: 'No settings to update',
+      });
+    }
+
+    const organisation = await prisma.organisation.findFirst({
+      where: buildOrganisationWhereQuery({
+        organisationId,
+        userId: user.id,
+        roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+      }),
+      include: {
+        organisationGlobalSettings: true,
+      },
+    });
+
+    if (!organisation) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'You do not have permission to update this organisation.',
+      });
+    }
+
+    const derivedTypedSignatureEnabled =
+      typedSignatureEnabled ?? organisation.organisationGlobalSettings.typedSignatureEnabled;
+    const derivedUploadSignatureEnabled =
+      uploadSignatureEnabled ?? organisation.organisationGlobalSettings.uploadSignatureEnabled;
+    const derivedDrawSignatureEnabled =
+      drawSignatureEnabled ?? organisation.organisationGlobalSettings.drawSignatureEnabled;
+
+    if (
+      derivedTypedSignatureEnabled === false &&
+      derivedUploadSignatureEnabled === false &&
+      derivedDrawSignatureEnabled === false
+    ) {
+      throw new AppError(AppErrorCode.INVALID_BODY, {
+        message: 'At least one signature type must be enabled',
+      });
+    }
+
+    await prisma.organisation.update({
+      where: {
+        id: organisationId,
+      },
+      data: {
+        organisationGlobalSettings: {
+          update: {
+            // Document related settings.
+            documentVisibility,
+            documentLanguage,
+            includeSenderDetails,
+            includeSigningCertificate,
+            typedSignatureEnabled,
+            uploadSignatureEnabled,
+            drawSignatureEnabled,
+
+            // Branding related settings.
+            brandingEnabled,
+            brandingLogo,
+            brandingUrl,
+            brandingCompanyDetails,
+          },
+        },
+      },
+    });
+  });
diff --git a/packages/trpc/server/organisation-router/update-organisation-settings.types.ts b/packages/trpc/server/organisation-router/update-organisation-settings.types.ts
new file mode 100644
index 000000000..99987ba21
--- /dev/null
+++ b/packages/trpc/server/organisation-router/update-organisation-settings.types.ts
@@ -0,0 +1,26 @@
+import { z } from 'zod';
+
+import { SUPPORTED_LANGUAGE_CODES } from '@documenso/lib/constants/i18n';
+import { DocumentVisibility } from '@documenso/lib/types/document-visibility';
+
+export const ZUpdateOrganisationSettingsRequestSchema = z.object({
+  organisationId: z.string(),
+  data: z.object({
+    // Document related settings.
+    documentVisibility: z.nativeEnum(DocumentVisibility).optional(),
+    documentLanguage: z.enum(SUPPORTED_LANGUAGE_CODES).optional(),
+    includeSenderDetails: z.boolean().optional(),
+    includeSigningCertificate: z.boolean().optional(),
+    typedSignatureEnabled: z.boolean().optional(),
+    uploadSignatureEnabled: z.boolean().optional(),
+    drawSignatureEnabled: z.boolean().optional(),
+
+    // Branding related settings.
+    brandingEnabled: z.boolean().optional(),
+    brandingLogo: z.string().optional(),
+    brandingUrl: z.string().optional(),
+    brandingCompanyDetails: z.string().optional(),
+  }),
+});
+
+export const ZUpdateOrganisationSettingsResponseSchema = z.void();
diff --git a/packages/trpc/server/organisation-router/update-organisation.ts b/packages/trpc/server/organisation-router/update-organisation.ts
new file mode 100644
index 000000000..8179315ed
--- /dev/null
+++ b/packages/trpc/server/organisation-router/update-organisation.ts
@@ -0,0 +1,45 @@
+import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { buildOrganisationWhereQuery } from '@documenso/lib/utils/organisations';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZUpdateOrganisationRequestSchema,
+  ZUpdateOrganisationResponseSchema,
+} from './update-organisation.types';
+
+export const updateOrganisationRoute = authenticatedProcedure
+  //   .meta(updateOrganisationMeta)
+  .input(ZUpdateOrganisationRequestSchema)
+  .output(ZUpdateOrganisationResponseSchema)
+  .mutation(async ({ input, ctx }) => {
+    const { organisationId, data } = input;
+
+    const userId = ctx.user.id;
+
+    // Check if organisation exists and user has access to it
+    const existingOrganisation = await prisma.organisation.findFirst({
+      where: buildOrganisationWhereQuery({
+        organisationId,
+        userId,
+        roles: ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_ORGANISATION'],
+      }),
+    });
+
+    if (!existingOrganisation) {
+      throw new AppError(AppErrorCode.NOT_FOUND, {
+        message: 'Organisation not found',
+      });
+    }
+
+    await prisma.organisation.update({
+      where: {
+        id: organisationId,
+      },
+      data: {
+        name: data.name,
+        url: data.url,
+      },
+    });
+  });
diff --git a/packages/trpc/server/organisation-router/update-organisation.types.ts b/packages/trpc/server/organisation-router/update-organisation.types.ts
new file mode 100644
index 000000000..8f1a912ef
--- /dev/null
+++ b/packages/trpc/server/organisation-router/update-organisation.types.ts
@@ -0,0 +1,25 @@
+import { z } from 'zod';
+
+import { ZTeamUrlSchema } from '../team-router/schema';
+import { ZCreateOrganisationRequestSchema } from './create-organisation.types';
+
+// export const updateOrganisationMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/organisation/{teamId}',
+//     summary: 'Update organisation',
+//     description: 'Update an organisation',
+//     tags: ['Organisation'],
+//   },
+// };
+
+export const ZUpdateOrganisationRequestSchema = z.object({
+  data: ZCreateOrganisationRequestSchema.pick({
+    name: true,
+  }).extend({
+    url: ZTeamUrlSchema,
+  }),
+  organisationId: z.string(),
+});
+
+export const ZUpdateOrganisationResponseSchema = z.void();
diff --git a/packages/trpc/server/profile-router/router.ts b/packages/trpc/server/profile-router/router.ts
index fc1e978c7..cabbbd643 100644
--- a/packages/trpc/server/profile-router/router.ts
+++ b/packages/trpc/server/profile-router/router.ts
@@ -1,25 +1,16 @@
-import { SubscriptionStatus } from '@prisma/client';
-
-import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
-import { AppError } from '@documenso/lib/errors/app-error';
+import type { SetAvatarImageOptions } from '@documenso/lib/server-only/profile/set-avatar-image';
 import { setAvatarImage } from '@documenso/lib/server-only/profile/set-avatar-image';
-import { getSubscriptionsByUserId } from '@documenso/lib/server-only/subscription/get-subscriptions-by-user-id';
-import { createBillingPortal } from '@documenso/lib/server-only/user/create-billing-portal';
-import { createCheckoutSession } from '@documenso/lib/server-only/user/create-checkout-session';
 import { deleteUser } from '@documenso/lib/server-only/user/delete-user';
 import { findUserSecurityAuditLogs } from '@documenso/lib/server-only/user/find-user-security-audit-logs';
 import { getUserById } from '@documenso/lib/server-only/user/get-user-by-id';
 import { updateProfile } from '@documenso/lib/server-only/user/update-profile';
-import { updatePublicProfile } from '@documenso/lib/server-only/user/update-public-profile';
 
 import { adminProcedure, authenticatedProcedure, router } from '../trpc';
 import {
-  ZCreateCheckoutSessionRequestSchema,
   ZFindUserSecurityAuditLogsSchema,
   ZRetrieveUserByIdQuerySchema,
   ZSetProfileImageMutationSchema,
   ZUpdateProfileMutationSchema,
-  ZUpdatePublicProfileMutationSchema,
 } from './schema';
 
 export const profileRouter = router({
@@ -38,31 +29,6 @@ export const profileRouter = router({
     return await getUserById({ id });
   }),
 
-  createBillingPortal: authenticatedProcedure.mutation(async ({ ctx }) => {
-    return await createBillingPortal({
-      user: {
-        id: ctx.user.id,
-        customerId: ctx.user.customerId,
-        email: ctx.user.email,
-        name: ctx.user.name,
-      },
-    });
-  }),
-
-  createCheckoutSession: authenticatedProcedure
-    .input(ZCreateCheckoutSessionRequestSchema)
-    .mutation(async ({ ctx, input }) => {
-      return await createCheckoutSession({
-        user: {
-          id: ctx.user.id,
-          customerId: ctx.user.customerId,
-          email: ctx.user.email,
-          name: ctx.user.name,
-        },
-        priceId: input.priceId,
-      });
-    }),
-
   updateProfile: authenticatedProcedure
     .input(ZUpdateProfileMutationSchema)
     .mutation(async ({ input, ctx }) => {
@@ -76,37 +42,6 @@ export const profileRouter = router({
       });
     }),
 
-  updatePublicProfile: authenticatedProcedure
-    .input(ZUpdatePublicProfileMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      const { url, bio, enabled } = input;
-
-      if (IS_BILLING_ENABLED() && url !== undefined && url.length < 6) {
-        const subscriptions = await getSubscriptionsByUserId({
-          userId: ctx.user.id,
-        }).then((subscriptions) =>
-          subscriptions.filter((s) => s.status === SubscriptionStatus.ACTIVE),
-        );
-
-        if (subscriptions.length === 0) {
-          throw new AppError('PREMIUM_PROFILE_URL', {
-            message: 'Only subscribers can have a username shorter than 6 characters',
-          });
-        }
-      }
-
-      const user = await updatePublicProfile({
-        userId: ctx.user.id,
-        data: {
-          url,
-          bio,
-          enabled,
-        },
-      });
-
-      return { success: true, url: user.url };
-    }),
-
   deleteAccount: authenticatedProcedure.mutation(async ({ ctx }) => {
     return await deleteUser({
       id: ctx.user.id,
@@ -116,11 +51,29 @@ export const profileRouter = router({
   setProfileImage: authenticatedProcedure
     .input(ZSetProfileImageMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      const { bytes, teamId } = input;
+      const { bytes, teamId, organisationId } = input;
+
+      let target: SetAvatarImageOptions['target'] = {
+        type: 'user',
+      };
+
+      if (teamId) {
+        target = {
+          type: 'team',
+          teamId,
+        };
+      }
+
+      if (organisationId) {
+        target = {
+          type: 'organisation',
+          organisationId,
+        };
+      }
 
       return await setAvatarImage({
         userId: ctx.user.id,
-        teamId,
+        target,
         bytes,
         requestMetadata: ctx.metadata,
       });
diff --git a/packages/trpc/server/profile-router/schema.ts b/packages/trpc/server/profile-router/schema.ts
index 1d607437f..490ea8a8c 100644
--- a/packages/trpc/server/profile-router/schema.ts
+++ b/packages/trpc/server/profile-router/schema.ts
@@ -1,7 +1,5 @@
 import { z } from 'zod';
 
-export const MAX_PROFILE_BIO_LENGTH = 256;
-
 export const ZFindUserSecurityAuditLogsSchema = z.object({
   page: z.number().optional(),
   perPage: z.number().optional(),
@@ -15,10 +13,6 @@ export const ZRetrieveUserByIdQuerySchema = z.object({
 
 export type TRetrieveUserByIdQuerySchema = z.infer<typeof ZRetrieveUserByIdQuerySchema>;
 
-export const ZCreateCheckoutSessionRequestSchema = z.object({
-  priceId: z.string().min(1),
-});
-
 export const ZUpdateProfileMutationSchema = z.object({
   name: z.string().min(1),
   signature: z.string(),
@@ -26,30 +20,10 @@ export const ZUpdateProfileMutationSchema = z.object({
 
 export type TUpdateProfileMutationSchema = z.infer<typeof ZUpdateProfileMutationSchema>;
 
-export const ZUpdatePublicProfileMutationSchema = z.object({
-  bio: z
-    .string()
-    .max(MAX_PROFILE_BIO_LENGTH, {
-      message: `Bio must be shorter than ${MAX_PROFILE_BIO_LENGTH + 1} characters`,
-    })
-    .optional(),
-  enabled: z.boolean().optional(),
-  url: z
-    .string()
-    .trim()
-    .toLowerCase()
-    .min(1, { message: 'Please enter a valid username.' })
-    .regex(/^[a-z0-9-]+$/, {
-      message: 'Username can only container alphanumeric characters and dashes.',
-    })
-    .optional(),
-});
-
-export type TUpdatePublicProfileMutationSchema = z.infer<typeof ZUpdatePublicProfileMutationSchema>;
-
 export const ZSetProfileImageMutationSchema = z.object({
   bytes: z.string().nullish(),
-  teamId: z.number().min(1).nullish(),
+  teamId: z.number().min(1).nullable(),
+  organisationId: z.string().nullable(),
 });
 
 export type TSetProfileImageMutationSchema = z.infer<typeof ZSetProfileImageMutationSchema>;
diff --git a/packages/trpc/server/router.ts b/packages/trpc/server/router.ts
index efd133547..861fd41ad 100644
--- a/packages/trpc/server/router.ts
+++ b/packages/trpc/server/router.ts
@@ -1,10 +1,12 @@
 import { adminRouter } from './admin-router/router';
 import { apiTokenRouter } from './api-token-router/router';
 import { authRouter } from './auth-router/router';
+import { billingRouter } from './billing/router';
 import { documentRouter } from './document-router/router';
 import { embeddingPresignRouter } from './embedding-router/_router';
 import { fieldRouter } from './field-router/router';
 import { folderRouter } from './folder-router/router';
+import { organisationRouter } from './organisation-router/router';
 import { profileRouter } from './profile-router/router';
 import { recipientRouter } from './recipient-router/router';
 import { shareLinkRouter } from './share-link-router/router';
@@ -15,12 +17,14 @@ import { webhookRouter } from './webhook-router/router';
 
 export const appRouter = router({
   auth: authRouter,
+  billing: billingRouter,
   profile: profileRouter,
   document: documentRouter,
   field: fieldRouter,
   folder: folderRouter,
   recipient: recipientRouter,
   admin: adminRouter,
+  organisation: organisationRouter,
   shareLink: shareLinkRouter,
   apiToken: apiTokenRouter,
   team: teamRouter,
diff --git a/packages/trpc/server/share-link-router/get-document-internal-url-for-qr-code.ts b/packages/trpc/server/share-link-router/get-document-internal-url-for-qr-code.ts
index d1d9cdcbc..40054877a 100644
--- a/packages/trpc/server/share-link-router/get-document-internal-url-for-qr-code.ts
+++ b/packages/trpc/server/share-link-router/get-document-internal-url-for-qr-code.ts
@@ -1,4 +1,5 @@
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { buildTeamWhereQuery } from '@documenso/lib/utils/teams';
 import { prisma } from '@documenso/prisma';
 
 import { procedure } from '../trpc';
@@ -26,26 +27,12 @@ export const getDocumentInternalUrlForQRCodeRoute = procedure
           },
           {
             id: documentId,
-            team: {
-              members: {
-                some: {
-                  userId: ctx.user.id,
-                },
-              },
-            },
+            team: buildTeamWhereQuery({ teamId: undefined, userId: ctx.user.id }),
           },
         ],
       },
       include: {
-        team: {
-          where: {
-            members: {
-              some: {
-                userId: ctx.user.id,
-              },
-            },
-          },
-        },
+        team: true,
       },
     });
 
@@ -53,9 +40,5 @@ export const getDocumentInternalUrlForQRCodeRoute = procedure
       return null;
     }
 
-    if (document.team) {
-      return `${NEXT_PUBLIC_WEBAPP_URL()}/t/${document.team.url}/documents/${document.id}`;
-    }
-
-    return `${NEXT_PUBLIC_WEBAPP_URL()}/documents/${document.id}`;
+    return `${NEXT_PUBLIC_WEBAPP_URL()}/t/${document.team.url}/documents/${document.id}`;
   });
diff --git a/packages/trpc/server/team-router/create-team-groups.ts b/packages/trpc/server/team-router/create-team-groups.ts
new file mode 100644
index 000000000..415125fb6
--- /dev/null
+++ b/packages/trpc/server/team-router/create-team-groups.ts
@@ -0,0 +1,107 @@
+import {
+  ALLOWED_TEAM_GROUP_TYPES,
+  TEAM_MEMBER_ROLE_PERMISSIONS_MAP,
+} from '@documenso/lib/constants/teams';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { getMemberRoles } from '@documenso/lib/server-only/team/get-member-roles';
+import { generateDatabaseId } from '@documenso/lib/universal/id';
+import { buildTeamWhereQuery, isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
+import { prisma } from '@documenso/prisma';
+import {
+  OrganisationGroupType,
+  OrganisationMemberRole,
+  TeamMemberRole,
+} from '@documenso/prisma/generated/types';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZCreateTeamGroupsRequestSchema,
+  ZCreateTeamGroupsResponseSchema,
+} from './create-team-groups.types';
+
+export const createTeamGroupsRoute = authenticatedProcedure
+  // .meta(createTeamGroupsMeta)
+  .input(ZCreateTeamGroupsRequestSchema)
+  .output(ZCreateTeamGroupsResponseSchema)
+  .mutation(async ({ input, ctx }) => {
+    const { teamId, groups } = input;
+    const { user } = ctx;
+
+    const team = await prisma.team.findFirst({
+      where: buildTeamWhereQuery({
+        teamId,
+        userId: user.id,
+        roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+      }),
+      include: {
+        organisation: {
+          include: {
+            groups: {
+              include: {
+                teamGroups: true,
+              },
+            },
+          },
+        },
+      },
+    });
+
+    if (!team) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED);
+    }
+
+    const { teamRole: currentUserTeamRole } = await getMemberRoles({
+      teamId,
+      reference: {
+        type: 'User',
+        id: user.id,
+      },
+    });
+
+    const isValid = groups.every((group) => {
+      const organisationGroup = team.organisation.groups.find(
+        ({ id }) => id === group.organisationGroupId,
+      );
+
+      // Only allow specific organisation groups to be used as a reference for team groups.
+      if (!organisationGroup?.type || !ALLOWED_TEAM_GROUP_TYPES.includes(organisationGroup.type)) {
+        return false;
+      }
+
+      // The "EVERYONE" organisation group can only have the "TEAM MEMBER" role for now.
+      if (
+        organisationGroup.type === OrganisationGroupType.INTERNAL_ORGANISATION &&
+        organisationGroup.organisationRole === OrganisationMemberRole.MEMBER &&
+        group.teamRole !== TeamMemberRole.MEMBER
+      ) {
+        return false;
+      }
+
+      // Check that the group is not already added to the team.
+      if (organisationGroup.teamGroups.some((teamGroup) => teamGroup.teamId === teamId)) {
+        return false;
+      }
+
+      // Check that the user has permission to add the group to the team.
+      if (!isTeamRoleWithinUserHierarchy(currentUserTeamRole, group.teamRole)) {
+        return false;
+      }
+
+      return true;
+    });
+
+    if (!isValid) {
+      throw new AppError(AppErrorCode.INVALID_BODY, {
+        message: 'Invalid groups',
+      });
+    }
+
+    await prisma.teamGroup.createMany({
+      data: groups.map((group) => ({
+        id: generateDatabaseId('team_group'),
+        teamId,
+        organisationGroupId: group.organisationGroupId,
+        teamRole: group.teamRole,
+      })),
+    });
+  });
diff --git a/packages/trpc/server/team-router/create-team-groups.types.ts b/packages/trpc/server/team-router/create-team-groups.types.ts
new file mode 100644
index 000000000..c8a53c371
--- /dev/null
+++ b/packages/trpc/server/team-router/create-team-groups.types.ts
@@ -0,0 +1,28 @@
+import { TeamMemberRole } from '@prisma/client';
+import { z } from 'zod';
+
+// export const createTeamGroupsMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/team/{teamId}/groups',
+//     summary: 'Create team group',
+//     description: 'Create a new group for a team',
+//     tags: ['Team'],
+//   },
+// };
+
+export const ZCreateTeamGroupsRequestSchema = z.object({
+  teamId: z.number(),
+  groups: z.array(
+    z.object({
+      teamRole: z.nativeEnum(TeamMemberRole).describe('The team role to assign to the group'),
+      organisationGroupId: z
+        .string()
+        .describe(
+          'The ID of the organisation group to create the team group from. Members from the organisation group will be assigned automatically to this team group.',
+        ),
+    }),
+  ),
+});
+
+export const ZCreateTeamGroupsResponseSchema = z.void();
diff --git a/packages/trpc/server/team-router/create-team-members.ts b/packages/trpc/server/team-router/create-team-members.ts
new file mode 100644
index 000000000..296a74dc9
--- /dev/null
+++ b/packages/trpc/server/team-router/create-team-members.ts
@@ -0,0 +1,153 @@
+import { OrganisationGroupType, TeamMemberRole } from '@prisma/client';
+import { match } from 'ts-pattern';
+
+import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { getMemberRoles } from '@documenso/lib/server-only/team/get-member-roles';
+import { generateDatabaseId } from '@documenso/lib/universal/id';
+import { buildTeamWhereQuery, isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZCreateTeamMembersRequestSchema,
+  ZCreateTeamMembersResponseSchema,
+} from './create-team-members.types';
+
+export const createTeamMembersRoute = authenticatedProcedure
+  .input(ZCreateTeamMembersRequestSchema)
+  .output(ZCreateTeamMembersResponseSchema)
+  .mutation(async ({ input, ctx }) => {
+    const { teamId, organisationMembers } = input;
+    const { user } = ctx;
+
+    return await createTeamMembers({
+      userId: user.id,
+      teamId,
+      membersToCreate: organisationMembers,
+    });
+  });
+
+type CreateTeamMembersOptions = {
+  userId: number;
+  teamId: number;
+  membersToCreate: {
+    organisationMemberId: string;
+    teamRole: TeamMemberRole;
+  }[];
+};
+
+export const createTeamMembers = async ({
+  userId,
+  teamId,
+  membersToCreate,
+}: CreateTeamMembersOptions) => {
+  const team = await prisma.team.findFirst({
+    where: buildTeamWhereQuery({
+      teamId,
+      userId,
+      roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+    }),
+    include: {
+      organisation: {
+        include: {
+          members: {
+            select: {
+              id: true,
+            },
+          },
+        },
+      },
+      teamGroups: {
+        where: {
+          organisationGroup: {
+            type: OrganisationGroupType.INTERNAL_TEAM,
+          },
+        },
+        include: {
+          organisationGroup: true,
+        },
+      },
+    },
+  });
+
+  if (!team) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Team not found or missing permissions',
+    });
+  }
+
+  const isMembersPartOfOrganisation = membersToCreate.every((member) =>
+    team.organisation.members.some(({ id }) => id === member.organisationMemberId),
+  );
+
+  if (!isMembersPartOfOrganisation) {
+    throw new AppError(AppErrorCode.INVALID_BODY, {
+      message: 'Some member IDs do not exist',
+    });
+  }
+
+  const teamMemberGroup = team.teamGroups.find(
+    (group) =>
+      group.organisationGroup.type === OrganisationGroupType.INTERNAL_TEAM &&
+      group.teamId === teamId &&
+      group.teamRole === TeamMemberRole.MEMBER,
+  );
+
+  const teamManagerGroup = team.teamGroups.find(
+    (group) =>
+      group.organisationGroup.type === OrganisationGroupType.INTERNAL_TEAM &&
+      group.teamId === teamId &&
+      group.teamRole === TeamMemberRole.MANAGER,
+  );
+
+  const teamAdminGroup = team.teamGroups.find(
+    (group) =>
+      group.organisationGroup.type === OrganisationGroupType.INTERNAL_TEAM &&
+      group.teamId === teamId &&
+      group.teamRole === TeamMemberRole.ADMIN,
+  );
+
+  if (!teamMemberGroup || !teamManagerGroup || !teamAdminGroup) {
+    console.error({
+      message: 'Team groups not found.',
+      teamMemberGroup: Boolean(teamMemberGroup),
+      teamManagerGroup: Boolean(teamManagerGroup),
+      teamAdminGroup: Boolean(teamAdminGroup),
+    });
+
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Team groups not found.',
+    });
+  }
+
+  const { teamRole: currentUserTeamRole } = await getMemberRoles({
+    teamId,
+    reference: {
+      type: 'User',
+      id: userId,
+    },
+  });
+
+  if (
+    !membersToCreate.every((member) =>
+      isTeamRoleWithinUserHierarchy(currentUserTeamRole, member.teamRole),
+    )
+  ) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'Cannot add a member with a role higher than your own',
+    });
+  }
+
+  await prisma.organisationGroupMember.createMany({
+    data: membersToCreate.map((member) => ({
+      id: generateDatabaseId('group_member'),
+      organisationMemberId: member.organisationMemberId,
+      groupId: match(member.teamRole)
+        .with(TeamMemberRole.MEMBER, () => teamMemberGroup.organisationGroupId)
+        .with(TeamMemberRole.MANAGER, () => teamManagerGroup.organisationGroupId)
+        .with(TeamMemberRole.ADMIN, () => teamAdminGroup.organisationGroupId)
+        .exhaustive(),
+    })),
+  });
+};
diff --git a/packages/trpc/server/team-router/create-team-members.types.ts b/packages/trpc/server/team-router/create-team-members.types.ts
new file mode 100644
index 000000000..0ab61270e
--- /dev/null
+++ b/packages/trpc/server/team-router/create-team-members.types.ts
@@ -0,0 +1,35 @@
+import { z } from 'zod';
+
+import { TeamMemberRole } from '@documenso/prisma/generated/types';
+
+export const ZCreateTeamMembersRequestSchema = z.object({
+  teamId: z.number(),
+  organisationMembers: z
+    .array(
+      z.object({
+        organisationMemberId: z.string().min(1),
+        teamRole: z.nativeEnum(TeamMemberRole).describe('The team role to add the user as'),
+      }),
+    )
+    .min(1)
+    .superRefine((items, ctx) => {
+      const seen = new Map<string, number>();
+
+      items.forEach((item, index) => {
+        const id = item.organisationMemberId;
+        if (seen.has(id)) {
+          ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'IDs must be unique',
+            path: [index, 'organisationMemberId'], // relative to organisationMembers
+          });
+        } else {
+          seen.set(id, index);
+        }
+      });
+    }),
+});
+
+export const ZCreateTeamMembersResponseSchema = z.void();
+
+export type TCreateTeamMembersRequestSchema = z.infer<typeof ZCreateTeamMembersRequestSchema>;
diff --git a/packages/trpc/server/team-router/create-team.ts b/packages/trpc/server/team-router/create-team.ts
new file mode 100644
index 000000000..c9422d864
--- /dev/null
+++ b/packages/trpc/server/team-router/create-team.ts
@@ -0,0 +1,21 @@
+import { createTeam } from '@documenso/lib/server-only/team/create-team';
+
+import { authenticatedProcedure } from '../trpc';
+import { ZCreateTeamRequestSchema, ZCreateTeamResponseSchema } from './create-team.types';
+
+export const createTeamRoute = authenticatedProcedure
+  // .meta(createOrganisationGroupMeta)
+  .input(ZCreateTeamRequestSchema)
+  .output(ZCreateTeamResponseSchema)
+  .mutation(async ({ input, ctx }) => {
+    const { teamName, teamUrl, organisationId, inheritMembers } = input;
+    const { user } = ctx;
+
+    return await createTeam({
+      userId: user.id,
+      teamName,
+      teamUrl,
+      organisationId,
+      inheritMembers,
+    });
+  });
diff --git a/packages/trpc/server/team-router/create-team.types.ts b/packages/trpc/server/team-router/create-team.types.ts
new file mode 100644
index 000000000..0e9ebc26c
--- /dev/null
+++ b/packages/trpc/server/team-router/create-team.types.ts
@@ -0,0 +1,29 @@
+import { z } from 'zod';
+
+import { ZTeamUrlSchema } from './schema';
+import { ZTeamNameSchema } from './schema';
+
+// export const createTeamMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/team/create',
+//     summary: 'Create team',
+//     description: 'Create a new team',
+//     tags: ['Team'],
+//   },
+// };
+
+export const ZCreateTeamRequestSchema = z.object({
+  organisationId: z.string(),
+  teamName: ZTeamNameSchema,
+  teamUrl: ZTeamUrlSchema,
+  inheritMembers: z
+    .boolean()
+    .describe(
+      'Whether to automatically assign all current and future organisation members to the new team. Defaults to true.',
+    ),
+});
+
+export const ZCreateTeamResponseSchema = z.void();
+
+export type TCreateTeamRequest = z.infer<typeof ZCreateTeamRequestSchema>;
diff --git a/packages/trpc/server/team-router/delete-team-group.ts b/packages/trpc/server/team-router/delete-team-group.ts
new file mode 100644
index 000000000..6cc396536
--- /dev/null
+++ b/packages/trpc/server/team-router/delete-team-group.ts
@@ -0,0 +1,84 @@
+import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { getMemberRoles } from '@documenso/lib/server-only/team/get-member-roles';
+import { buildTeamWhereQuery, isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
+import { prisma } from '@documenso/prisma';
+import { OrganisationGroupType, OrganisationMemberRole } from '@documenso/prisma/generated/types';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZDeleteTeamGroupRequestSchema,
+  ZDeleteTeamGroupResponseSchema,
+} from './delete-team-group.types';
+
+export const deleteTeamGroupRoute = authenticatedProcedure
+  // .meta(deleteTeamGroupMeta)
+  .input(ZDeleteTeamGroupRequestSchema)
+  .output(ZDeleteTeamGroupResponseSchema)
+  .mutation(async ({ input, ctx }) => {
+    const { teamGroupId, teamId } = input;
+    const { user } = ctx;
+
+    const team = await prisma.team.findFirst({
+      where: buildTeamWhereQuery({
+        teamId,
+        userId: user.id,
+        roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+      }),
+    });
+
+    if (!team) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED);
+    }
+
+    const group = await prisma.teamGroup.findFirst({
+      where: {
+        id: teamGroupId,
+        team: {
+          id: teamId,
+        },
+      },
+      include: {
+        organisationGroup: true,
+      },
+    });
+
+    if (!group) {
+      throw new AppError(AppErrorCode.NOT_FOUND, {
+        message: 'Team group not found',
+      });
+    }
+
+    // You cannot delete internal organisation groups.
+    // The only exception is deleting the "member" organisation group which is used to allow
+    // all organisation members to access a team.
+    if (
+      group.organisationGroup.type === OrganisationGroupType.INTERNAL_ORGANISATION &&
+      group.organisationGroup.organisationRole !== OrganisationMemberRole.MEMBER
+    ) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'You are not allowed to delete internal organisaion groups',
+      });
+    }
+
+    const { teamRole: currentUserTeamRole } = await getMemberRoles({
+      teamId,
+      reference: {
+        type: 'User',
+        id: user.id,
+      },
+    });
+
+    if (!isTeamRoleWithinUserHierarchy(currentUserTeamRole, group.teamRole)) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'You are not allowed to delete this team group',
+      });
+    }
+
+    await prisma.teamGroup.delete({
+      where: {
+        id: teamGroupId,
+        teamId,
+      },
+    });
+  });
diff --git a/packages/trpc/server/team-router/delete-team-group.types.ts b/packages/trpc/server/team-router/delete-team-group.types.ts
new file mode 100644
index 000000000..7dce318a6
--- /dev/null
+++ b/packages/trpc/server/team-router/delete-team-group.types.ts
@@ -0,0 +1,18 @@
+import { z } from 'zod';
+
+// export const deleteTeamGroupMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/team/groups/{id}/delete',
+//     summary: 'Delete team group',
+//     description: 'Delete an existing group for a team',
+//     tags: ['Team'],
+//   },
+// };
+
+export const ZDeleteTeamGroupRequestSchema = z.object({
+  teamId: z.number(),
+  teamGroupId: z.string(),
+});
+
+export const ZDeleteTeamGroupResponseSchema = z.void();
diff --git a/packages/trpc/server/team-router/delete-team-member.ts b/packages/trpc/server/team-router/delete-team-member.ts
new file mode 100644
index 000000000..f5799da19
--- /dev/null
+++ b/packages/trpc/server/team-router/delete-team-member.ts
@@ -0,0 +1,110 @@
+import { OrganisationGroupType } from '@prisma/client';
+
+import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { getMemberRoles } from '@documenso/lib/server-only/team/get-member-roles';
+import { buildTeamWhereQuery, isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZDeleteTeamMemberRequestSchema,
+  ZDeleteTeamMemberResponseSchema,
+} from './delete-team-member.types';
+
+export const deleteTeamMemberRoute = authenticatedProcedure
+  // .meta(deleteTeamMemberMeta)
+  .input(ZDeleteTeamMemberRequestSchema)
+  .output(ZDeleteTeamMemberResponseSchema)
+  .mutation(async ({ ctx, input }) => {
+    const { teamId, memberId } = input;
+    const { user } = ctx;
+
+    const team = await prisma.team.findFirst({
+      where: buildTeamWhereQuery({
+        teamId,
+        userId: user.id,
+        roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+      }),
+      include: {
+        teamGroups: {
+          where: {
+            organisationGroup: {
+              type: OrganisationGroupType.INTERNAL_TEAM,
+              organisationGroupMembers: {
+                some: {
+                  organisationMember: {
+                    id: memberId,
+                  },
+                },
+              },
+            },
+          },
+          include: {
+            organisationGroup: {
+              include: {
+                organisationGroupMembers: {
+                  include: {
+                    organisationMember: true,
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    });
+
+    if (!team) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED);
+    }
+
+    const { teamRole: currentUserTeamRole } = await getMemberRoles({
+      teamId,
+      reference: {
+        type: 'User',
+        id: user.id,
+      },
+    });
+
+    const { teamRole: currentMemberToDeleteTeamRole } = await getMemberRoles({
+      teamId,
+      reference: {
+        type: 'Member',
+        id: memberId,
+      },
+    });
+
+    // Check role permissions.
+    if (!isTeamRoleWithinUserHierarchy(currentUserTeamRole, currentMemberToDeleteTeamRole)) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'Cannot remove a member with a higher role',
+      });
+    }
+
+    const teamGroupToRemoveMemberFrom = team.teamGroups[0];
+
+    // Sanity check.
+    // This means that the member was inherited (which means they should not be deleted directly)
+    // or it means that they are not part of any team groups relating to this?
+    if (team.teamGroups.length !== 1) {
+      console.error('Member must have 1 one internal team group. This should not happen.');
+
+      // Todo: Logging.
+    }
+
+    if (team.teamGroups.length === 0) {
+      throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+        message: 'Team has no internal team groups',
+      });
+    }
+
+    await prisma.organisationGroupMember.delete({
+      where: {
+        organisationMemberId_groupId: {
+          organisationMemberId: memberId,
+          groupId: teamGroupToRemoveMemberFrom.organisationGroupId,
+        },
+      },
+    });
+  });
diff --git a/packages/trpc/server/team-router/delete-team-member.types.ts b/packages/trpc/server/team-router/delete-team-member.types.ts
new file mode 100644
index 000000000..23c3cd9f1
--- /dev/null
+++ b/packages/trpc/server/team-router/delete-team-member.types.ts
@@ -0,0 +1,18 @@
+import { z } from 'zod';
+
+// export const deleteTeamMemberMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/team/member/delete',
+//     summary: 'Delete team member',
+//     description: 'Delete team member',
+//     tags: ['Team'],
+//   },
+// };
+
+export const ZDeleteTeamMemberRequestSchema = z.object({
+  teamId: z.number().describe('The ID of the team to remove the member from.'),
+  memberId: z.string().describe('The ID of the member to remove from the team.'),
+});
+
+export const ZDeleteTeamMemberResponseSchema = z.void();
diff --git a/packages/trpc/server/team-router/delete-team.ts b/packages/trpc/server/team-router/delete-team.ts
new file mode 100644
index 000000000..46bec4b8a
--- /dev/null
+++ b/packages/trpc/server/team-router/delete-team.ts
@@ -0,0 +1,18 @@
+import { deleteTeam } from '@documenso/lib/server-only/team/delete-team';
+
+import { authenticatedProcedure } from '../trpc';
+import { ZDeleteTeamRequestSchema, ZDeleteTeamResponseSchema } from './delete-team.types';
+
+export const deleteTeamRoute = authenticatedProcedure
+  // .meta(deleteTeamMeta)
+  .input(ZDeleteTeamRequestSchema)
+  .output(ZDeleteTeamResponseSchema)
+  .mutation(async ({ input, ctx }) => {
+    const { teamId } = input;
+    const { user } = ctx;
+
+    await deleteTeam({
+      userId: user.id,
+      teamId,
+    });
+  });
diff --git a/packages/trpc/server/team-router/delete-team.types.ts b/packages/trpc/server/team-router/delete-team.types.ts
new file mode 100644
index 000000000..f4fe56545
--- /dev/null
+++ b/packages/trpc/server/team-router/delete-team.types.ts
@@ -0,0 +1,17 @@
+import { z } from 'zod';
+
+// export const deleteTeamMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'DELETE',
+//     path: '/team/{teamId}',
+//     summary: 'Delete team',
+//     description: 'Delete an existing team',
+//     tags: ['Team'],
+//   },
+// };
+
+export const ZDeleteTeamRequestSchema = z.object({
+  teamId: z.number(),
+});
+
+export const ZDeleteTeamResponseSchema = z.void();
diff --git a/packages/trpc/server/team-router/find-team-groups.ts b/packages/trpc/server/team-router/find-team-groups.ts
new file mode 100644
index 000000000..5ac66a859
--- /dev/null
+++ b/packages/trpc/server/team-router/find-team-groups.ts
@@ -0,0 +1,144 @@
+import type { OrganisationGroupType, OrganisationMemberRole } from '@prisma/client';
+import { Prisma } from '@prisma/client';
+import { unique } from 'remeda';
+
+import type { FindResultResponse } from '@documenso/lib/types/search-params';
+import { buildTeamWhereQuery } from '@documenso/lib/utils/teams';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZFindTeamGroupsRequestSchema,
+  ZFindTeamGroupsResponseSchema,
+} from './find-team-groups.types';
+
+export const findTeamGroupsRoute = authenticatedProcedure
+  // .meta(getTeamGroupsMeta)
+  .input(ZFindTeamGroupsRequestSchema)
+  .output(ZFindTeamGroupsResponseSchema)
+  .query(async ({ input, ctx }) => {
+    const { teamId, types, query, page, perPage, teamGroupId, organisationRoles } = input;
+    const { user } = ctx;
+
+    return await findTeamGroups({
+      userId: user.id,
+      teamId,
+      teamGroupId,
+      types: unique(types || []),
+      organisationRoles: unique(organisationRoles || []),
+      query,
+      page,
+      perPage,
+    });
+  });
+
+type FindTeamGroupsOptions = {
+  userId: number;
+  teamId: number;
+  teamGroupId?: string;
+  types?: OrganisationGroupType[];
+  organisationRoles?: OrganisationMemberRole[];
+  query?: string;
+  page?: number;
+  perPage?: number;
+};
+
+export const findTeamGroups = async ({
+  userId,
+  teamId,
+  teamGroupId,
+  types = [],
+  organisationRoles = [],
+  query,
+  page = 1,
+  perPage = 10,
+}: FindTeamGroupsOptions) => {
+  const whereClause: Prisma.TeamGroupWhereInput = {
+    team: buildTeamWhereQuery({ teamId, userId }),
+    id: teamGroupId,
+    organisationGroup: {
+      organisationRole: organisationRoles.length > 0 ? { in: organisationRoles } : undefined,
+      type:
+        types.length > 0
+          ? {
+              in: types,
+            }
+          : undefined,
+      ...(query && {
+        name: {
+          contains: query,
+          mode: Prisma.QueryMode.insensitive,
+        },
+      }),
+    },
+  };
+
+  const [data, count] = await Promise.all([
+    prisma.teamGroup.findMany({
+      where: whereClause,
+      skip: Math.max(page - 1, 0) * perPage,
+      take: perPage,
+      orderBy: {
+        organisationGroup: {
+          name: 'desc',
+        },
+      },
+      select: {
+        id: true,
+        teamRole: true,
+        teamId: true,
+        organisationGroup: {
+          select: {
+            id: true,
+            name: true,
+            type: true,
+            organisationGroupMembers: {
+              select: {
+                organisationMember: {
+                  select: {
+                    id: true,
+                    user: {
+                      select: {
+                        id: true,
+                        name: true,
+                        email: true,
+                        avatarImageId: true,
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    }),
+    prisma.teamGroup.count({
+      where: whereClause,
+    }),
+  ]);
+
+  const mappedData = data.map((group) => ({
+    id: group.id,
+    teamId: group.teamId,
+    teamRole: group.teamRole,
+    name: group.organisationGroup.name || '',
+    organisationGroupId: group.organisationGroup.id,
+    organisationGroupType: group.organisationGroup.type,
+    members: group.organisationGroup.organisationGroupMembers.map(({ organisationMember }) => ({
+      id: organisationMember.id,
+      userId: organisationMember.user.id,
+      name: organisationMember.user.name || '',
+      email: organisationMember.user.email,
+      avatarImageId: organisationMember.user.avatarImageId,
+    })),
+  }));
+
+  return {
+    data: mappedData,
+    count,
+    currentPage: Math.max(page, 1),
+    perPage,
+    totalPages: Math.ceil(count / perPage),
+  } satisfies FindResultResponse<typeof mappedData>;
+};
diff --git a/packages/trpc/server/team-router/find-team-groups.types.ts b/packages/trpc/server/team-router/find-team-groups.types.ts
new file mode 100644
index 000000000..ab0d1fbb0
--- /dev/null
+++ b/packages/trpc/server/team-router/find-team-groups.types.ts
@@ -0,0 +1,47 @@
+import { OrganisationGroupType, OrganisationMemberRole } from '@prisma/client';
+import { z } from 'zod';
+
+import { ZFindResultResponse, ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { TeamGroupSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamGroupSchema';
+
+// export const getTeamGroupsMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'GET',
+//     path: '/team/{teamId}/groups',
+//     summary: 'Get team groups',
+//     description: 'Get all groups for a team',
+//     tags: ['Team'],
+//   },
+// };
+
+export const ZFindTeamGroupsRequestSchema = ZFindSearchParamsSchema.extend({
+  teamId: z.number(),
+  teamGroupId: z.string().optional(),
+  organisationRoles: z.nativeEnum(OrganisationMemberRole).array().optional(),
+  types: z.nativeEnum(OrganisationGroupType).array().optional(),
+});
+
+export const ZFindTeamGroupsResponseSchema = ZFindResultResponse.extend({
+  data: TeamGroupSchema.pick({
+    teamRole: true,
+    id: true,
+    teamId: true,
+  })
+    .extend({
+      name: z.string(),
+      organisationGroupId: z.string(),
+      organisationGroupType: z.nativeEnum(OrganisationGroupType),
+      members: z
+        .object({
+          id: z.string(),
+          userId: z.number(),
+          name: z.string(),
+          email: z.string(),
+          avatarImageId: z.string().nullable(),
+        })
+        .array(),
+    })
+    .array(),
+});
+
+export type TFindTeamGroupsResponse = z.infer<typeof ZFindTeamGroupsResponseSchema>;
diff --git a/packages/trpc/server/team-router/find-team-members.ts b/packages/trpc/server/team-router/find-team-members.ts
new file mode 100644
index 000000000..c9550b0e4
--- /dev/null
+++ b/packages/trpc/server/team-router/find-team-members.ts
@@ -0,0 +1,23 @@
+import { findTeamMembers } from '@documenso/lib/server-only/team/find-team-members';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZFindTeamMembersRequestSchema,
+  ZFindTeamMembersResponseSchema,
+} from './find-team-members.types';
+
+export const findTeamMembersRoute = authenticatedProcedure
+  .input(ZFindTeamMembersRequestSchema)
+  .output(ZFindTeamMembersResponseSchema)
+  .query(async ({ input, ctx }) => {
+    const { teamId, query, page, perPage } = input;
+    const { user } = ctx;
+
+    return await findTeamMembers({
+      userId: user.id,
+      teamId,
+      query,
+      page,
+      perPage,
+    });
+  });
diff --git a/packages/trpc/server/team-router/find-team-members.types.ts b/packages/trpc/server/team-router/find-team-members.types.ts
new file mode 100644
index 000000000..83d3657a5
--- /dev/null
+++ b/packages/trpc/server/team-router/find-team-members.types.ts
@@ -0,0 +1,27 @@
+import { z } from 'zod';
+
+import { ZFindResultResponse, ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { OrganisationMemberRole, TeamMemberRole } from '@documenso/prisma/generated/types';
+import OrganisationMemberSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationMemberSchema';
+
+export const ZFindTeamMembersRequestSchema = ZFindSearchParamsSchema.extend({
+  teamId: z.number(),
+});
+
+export const ZFindTeamMembersResponseSchema = ZFindResultResponse.extend({
+  data: OrganisationMemberSchema.pick({
+    id: true,
+    createdAt: true,
+    userId: true,
+  })
+    .extend({
+      teamRole: z.nativeEnum(TeamMemberRole),
+      organisationRole: z.nativeEnum(OrganisationMemberRole),
+      email: z.string(),
+      name: z.string().nullable(),
+      avatarImageId: z.string().nullable(),
+    })
+    .array(),
+});
+
+export type TFindTeamMembersResponse = z.infer<typeof ZFindTeamMembersResponseSchema>;
diff --git a/packages/trpc/server/team-router/find-teams.ts b/packages/trpc/server/team-router/find-teams.ts
new file mode 100644
index 000000000..f6d9cc4e7
--- /dev/null
+++ b/packages/trpc/server/team-router/find-teams.ts
@@ -0,0 +1,15 @@
+import { findTeams } from '@documenso/lib/server-only/team/find-teams';
+
+import { authenticatedProcedure } from '../trpc';
+import { ZFindTeamsRequestSchema, ZFindTeamsResponseSchema } from './find-teams.types';
+
+export const findTeamsRoute = authenticatedProcedure
+  //   .meta(getTeamsMeta)
+  .input(ZFindTeamsRequestSchema)
+  .output(ZFindTeamsResponseSchema)
+  .query(async ({ ctx, input }) => {
+    const { organisationId } = input;
+    const { user } = ctx;
+
+    return findTeams({ userId: user.id, organisationId });
+  });
diff --git a/packages/trpc/server/team-router/find-teams.types.ts b/packages/trpc/server/team-router/find-teams.types.ts
new file mode 100644
index 000000000..4d4c24454
--- /dev/null
+++ b/packages/trpc/server/team-router/find-teams.types.ts
@@ -0,0 +1,36 @@
+import { TeamMemberRole } from '@prisma/client';
+import { z } from 'zod';
+
+import { ZFindResultResponse, ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
+import TeamSchema from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
+
+// export const getTeamsMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'GET',
+//     path: '/team/teams',
+//     summary: 'Get teams',
+//     description: 'Get all teams you are a member of',
+//     tags: ['team'],
+//   },
+// };
+
+export const ZFindTeamsRequestSchema = ZFindSearchParamsSchema.extend({
+  organisationId: z.string(),
+});
+
+export const ZFindTeamsResponseSchema = ZFindResultResponse.extend({
+  data: TeamSchema.pick({
+    id: true,
+    name: true,
+    url: true,
+    createdAt: true,
+    avatarImageId: true,
+    organisationId: true,
+  })
+    .extend({
+      currentTeamRole: z.nativeEnum(TeamMemberRole),
+    })
+    .array(),
+});
+
+export type TFindTeamsResponse = z.infer<typeof ZFindTeamsResponseSchema>;
diff --git a/packages/trpc/server/team-router/get-team-members.ts b/packages/trpc/server/team-router/get-team-members.ts
new file mode 100644
index 000000000..a98c71dca
--- /dev/null
+++ b/packages/trpc/server/team-router/get-team-members.ts
@@ -0,0 +1,21 @@
+import { getTeamMembers } from '@documenso/lib/server-only/team/get-team-members';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZGetTeamMembersRequestSchema,
+  ZGetTeamMembersResponseSchema,
+} from './get-team-members.types';
+
+export const getTeamMembersRoute = authenticatedProcedure
+  //   .meta(getTeamMembersMeta)
+  .input(ZGetTeamMembersRequestSchema)
+  .output(ZGetTeamMembersResponseSchema)
+  .query(async ({ input, ctx }) => {
+    const { teamId } = input;
+    const { user } = ctx;
+
+    return await getTeamMembers({
+      userId: user.id,
+      teamId,
+    });
+  });
diff --git a/packages/trpc/server/team-router/get-team-members.types.ts b/packages/trpc/server/team-router/get-team-members.types.ts
new file mode 100644
index 000000000..ae0a7816b
--- /dev/null
+++ b/packages/trpc/server/team-router/get-team-members.types.ts
@@ -0,0 +1,34 @@
+import { z } from 'zod';
+
+import { OrganisationMemberRole, TeamMemberRole } from '@documenso/prisma/generated/types';
+import OrganisationMemberSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationMemberSchema';
+
+// export const getTeamMembersMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'GET',
+//     path: '/team/{teamId}/members',
+//     summary: 'Get team members',
+//     description: 'Get all members of a team',
+//     tags: ['team'],
+//   },
+// };
+
+export const ZGetTeamMembersRequestSchema = z.object({
+  teamId: z.number(),
+});
+
+export const ZGetTeamMembersResponseSchema = OrganisationMemberSchema.pick({
+  id: true,
+  createdAt: true,
+  userId: true,
+})
+  .extend({
+    teamRole: z.nativeEnum(TeamMemberRole),
+    organisationRole: z.nativeEnum(OrganisationMemberRole),
+    email: z.string(),
+    name: z.string().nullable(),
+    avatarImageId: z.string().nullable(),
+  })
+  .array();
+
+export type TGetTeamMembersResponse = z.infer<typeof ZGetTeamMembersResponseSchema>;
diff --git a/packages/trpc/server/team-router/get-team.ts b/packages/trpc/server/team-router/get-team.ts
new file mode 100644
index 000000000..f36abb293
--- /dev/null
+++ b/packages/trpc/server/team-router/get-team.ts
@@ -0,0 +1,15 @@
+import { getTeam } from '@documenso/lib/server-only/team/get-team';
+
+import { authenticatedProcedure } from '../trpc';
+import { ZGetTeamRequestSchema, ZGetTeamResponseSchema } from './get-team.types';
+
+export const getTeamRoute = authenticatedProcedure
+  //   .meta(getTeamMeta)
+  .input(ZGetTeamRequestSchema)
+  .output(ZGetTeamResponseSchema)
+  .query(async ({ input, ctx }) => {
+    return await getTeam({
+      teamReference: input.teamReference,
+      userId: ctx.user.id,
+    });
+  });
diff --git a/packages/trpc/server/team-router/get-team.types.ts b/packages/trpc/server/team-router/get-team.types.ts
new file mode 100644
index 000000000..768a46f0c
--- /dev/null
+++ b/packages/trpc/server/team-router/get-team.types.ts
@@ -0,0 +1,39 @@
+import { z } from 'zod';
+
+import { TeamMemberRole } from '@documenso/prisma/generated/types';
+import OrganisationGlobalSettingsSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationGlobalSettingsSchema';
+import TeamGlobalSettingsSchema from '@documenso/prisma/generated/zod/modelSchema/TeamGlobalSettingsSchema';
+import TeamSchema from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
+
+// export const getTeamMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'GET',
+//     path: '/team/{teamReference}',
+//     summary: 'Get team',
+//     description: 'Get a team by ID or URL',
+//     tags: ['team'],
+//   },
+// };
+
+export const ZGetTeamRequestSchema = z.object({
+  teamReference: z.union([z.string(), z.number()]),
+});
+
+export const ZGetTeamResponseSchema = TeamSchema.pick({
+  id: true,
+  name: true,
+  url: true,
+  createdAt: true,
+  avatarImageId: true,
+  organisationId: true,
+}).extend({
+  currentTeamRole: z.nativeEnum(TeamMemberRole),
+  teamSettings: TeamGlobalSettingsSchema.omit({
+    id: true,
+  }),
+  derivedSettings: OrganisationGlobalSettingsSchema.omit({
+    id: true,
+  }),
+});
+
+export type TGetTeamResponse = z.infer<typeof ZGetTeamResponseSchema>;
diff --git a/packages/trpc/server/team-router/router.ts b/packages/trpc/server/team-router/router.ts
index 618c363c1..aeb1fa8af 100644
--- a/packages/trpc/server/team-router/router.ts
+++ b/packages/trpc/server/team-router/router.ts
@@ -1,642 +1,109 @@
-import { TRPCError } from '@trpc/server';
-import { z } from 'zod';
-
-import { getTeamPrices } from '@documenso/ee/server-only/stripe/get-team-prices';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { acceptTeamInvitation } from '@documenso/lib/server-only/team/accept-team-invitation';
-import { createTeam } from '@documenso/lib/server-only/team/create-team';
-import { createTeamBillingPortal } from '@documenso/lib/server-only/team/create-team-billing-portal';
-import { createTeamPendingCheckoutSession } from '@documenso/lib/server-only/team/create-team-checkout-session';
 import { createTeamEmailVerification } from '@documenso/lib/server-only/team/create-team-email-verification';
-import { createTeamMemberInvites } from '@documenso/lib/server-only/team/create-team-member-invites';
-import { declineTeamInvitation } from '@documenso/lib/server-only/team/decline-team-invitation';
-import { deleteTeam } from '@documenso/lib/server-only/team/delete-team';
 import { deleteTeamEmail } from '@documenso/lib/server-only/team/delete-team-email';
 import { deleteTeamEmailVerification } from '@documenso/lib/server-only/team/delete-team-email-verification';
-import { deleteTeamMemberInvitations } from '@documenso/lib/server-only/team/delete-team-invitations';
-import { deleteTeamMembers } from '@documenso/lib/server-only/team/delete-team-members';
-import { deleteTeamPending } from '@documenso/lib/server-only/team/delete-team-pending';
-import { deleteTeamTransferRequest } from '@documenso/lib/server-only/team/delete-team-transfer-request';
-import { findTeamInvoices } from '@documenso/lib/server-only/team/find-team-invoices';
-import { findTeamMemberInvites } from '@documenso/lib/server-only/team/find-team-member-invites';
-import { findTeamMembers } from '@documenso/lib/server-only/team/find-team-members';
-import { findTeams } from '@documenso/lib/server-only/team/find-teams';
-import { findTeamsPending } from '@documenso/lib/server-only/team/find-teams-pending';
-import { getTeamById } from '@documenso/lib/server-only/team/get-team';
 import { getTeamEmailByEmail } from '@documenso/lib/server-only/team/get-team-email-by-email';
-import { getTeamInvitations } from '@documenso/lib/server-only/team/get-team-invitations';
-import { getTeamMembers } from '@documenso/lib/server-only/team/get-team-members';
-import { getTeams } from '@documenso/lib/server-only/team/get-teams';
-import { leaveTeam } from '@documenso/lib/server-only/team/leave-team';
-import { requestTeamOwnershipTransfer } from '@documenso/lib/server-only/team/request-team-ownership-transfer';
 import { resendTeamEmailVerification } from '@documenso/lib/server-only/team/resend-team-email-verification';
-import { resendTeamMemberInvitation } from '@documenso/lib/server-only/team/resend-team-member-invitation';
-import { updateTeam } from '@documenso/lib/server-only/team/update-team';
-import { updateTeamBrandingSettings } from '@documenso/lib/server-only/team/update-team-branding-settings';
 import { updateTeamEmail } from '@documenso/lib/server-only/team/update-team-email';
-import { updateTeamMember } from '@documenso/lib/server-only/team/update-team-member';
-import { updateTeamPublicProfile } from '@documenso/lib/server-only/team/update-team-public-profile';
 
 import { authenticatedProcedure, router } from '../trpc';
+import { createTeamRoute } from './create-team';
+import { createTeamGroupsRoute } from './create-team-groups';
+import { createTeamMembersRoute } from './create-team-members';
+import { deleteTeamRoute } from './delete-team';
+import { deleteTeamGroupRoute } from './delete-team-group';
+import { deleteTeamMemberRoute } from './delete-team-member';
+import { findTeamGroupsRoute } from './find-team-groups';
+import { findTeamMembersRoute } from './find-team-members';
+import { findTeamsRoute } from './find-teams';
+import { getTeamRoute } from './get-team';
+import { getTeamMembersRoute } from './get-team-members';
 import {
-  ZAcceptTeamInvitationMutationSchema,
-  ZCreateTeamBillingPortalMutationSchema,
   ZCreateTeamEmailVerificationMutationSchema,
-  ZCreateTeamMemberInvitesMutationSchema,
-  ZCreateTeamMutationSchema,
-  ZCreateTeamPendingCheckoutMutationSchema,
-  ZDeclineTeamInvitationMutationSchema,
   ZDeleteTeamEmailMutationSchema,
   ZDeleteTeamEmailVerificationMutationSchema,
-  ZDeleteTeamMemberInvitationsMutationSchema,
-  ZDeleteTeamMembersMutationSchema,
-  ZDeleteTeamMutationSchema,
-  ZDeleteTeamPendingMutationSchema,
-  ZDeleteTeamTransferRequestMutationSchema,
-  ZFindTeamInvoicesQuerySchema,
-  ZFindTeamMemberInvitesQuerySchema,
-  ZFindTeamMembersQuerySchema,
-  ZFindTeamsPendingQuerySchema,
-  ZFindTeamsQuerySchema,
-  ZGetTeamMembersQuerySchema,
-  ZGetTeamQuerySchema,
-  ZLeaveTeamMutationSchema,
-  ZRequestTeamOwnerhsipTransferMutationSchema,
   ZResendTeamEmailVerificationMutationSchema,
-  ZResendTeamMemberInvitationMutationSchema,
-  ZUpdateTeamBrandingSettingsMutationSchema,
   ZUpdateTeamEmailMutationSchema,
-  ZUpdateTeamMemberMutationSchema,
-  ZUpdateTeamMutationSchema,
-  ZUpdateTeamPublicProfileMutationSchema,
 } from './schema';
-import { updateTeamDocumentSettingsRoute } from './update-team-document-settings';
+import { updateTeamRoute } from './update-team';
+import { updateTeamGroupRoute } from './update-team-group';
+import { updateTeamMemberRoute } from './update-team-member';
+import { updateTeamSettingsRoute } from './update-team-settings';
 
 export const teamRouter = router({
-  // Internal endpoint for now.
-  getTeams: authenticatedProcedure.query(async ({ ctx }) => {
-    return await getTeams({ userId: ctx.user.id });
-  }),
+  find: findTeamsRoute,
+  get: getTeamRoute,
+  create: createTeamRoute,
+  update: updateTeamRoute,
+  delete: deleteTeamRoute,
+  member: {
+    find: findTeamMembersRoute,
+    getMany: getTeamMembersRoute,
+    createMany: createTeamMembersRoute,
+    update: updateTeamMemberRoute,
+    delete: deleteTeamMemberRoute,
+  },
+  group: {
+    find: findTeamGroupsRoute,
+    createMany: createTeamGroupsRoute,
+    update: updateTeamGroupRoute,
+    delete: deleteTeamGroupRoute,
+  },
+  settings: {
+    update: updateTeamSettingsRoute,
+  },
 
-  // Todo: Public endpoint.
-  findTeams: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'GET',
-    //     path: '/team',
-    //     summary: 'Find teams',
-    //     description: 'Find your teams based on a search criteria',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZFindTeamsQuerySchema)
-    .query(async ({ input, ctx }) => {
-      return await findTeams({
-        userId: ctx.user.id,
-        ...input,
-      });
+  // Old routes (to be migrated)
+  // Todo: Refactor into routes.
+  email: {
+    get: authenticatedProcedure.query(async ({ ctx }) => {
+      return await getTeamEmailByEmail({ email: ctx.user.email });
     }),
-
-  // Todo: Public endpoint.
-  getTeam: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'GET',
-    //     path: '/team/{teamId}',
-    //     summary: 'Get team',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZGetTeamQuerySchema)
-    .query(async ({ input, ctx }) => {
-      return await getTeamById({ teamId: input.teamId, userId: ctx.user.id });
-    }),
-
-  // Todo: Public endpoint.
-  createTeam: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/create',
-    //     summary: 'Create team',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZCreateTeamMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await createTeam({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Todo: Public endpoint.
-  updateTeam: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}',
-    //     summary: 'Update team',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZUpdateTeamMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await updateTeam({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Todo: Public endpoint.
-  deleteTeam: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}/delete',
-    //     summary: 'Delete team',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZDeleteTeamMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await deleteTeam({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Todo: Public endpoint.
-  leaveTeam: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}/leave',
-    //     summary: 'Leave a team',
-    //     description: '',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZLeaveTeamMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await leaveTeam({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Todo: Public endpoint.
-  findTeamMemberInvites: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'GET',
-    //     path: '/team/{teamId}/member/invite',
-    //     summary: 'Find member invites',
-    //     description: 'Returns pending team member invites',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZFindTeamMemberInvitesQuerySchema)
-    .query(async ({ input, ctx }) => {
-      return await findTeamMemberInvites({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Todo: Public endpoint.
-  createTeamMemberInvites: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}/member/invite',
-    //     summary: 'Invite members',
-    //     description: 'Send email invitations to users to join the team',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZCreateTeamMemberInvitesMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await createTeamMemberInvites({
-        userId: ctx.user.id,
-        userName: ctx.user.name ?? '',
-        ...input,
-      });
-    }),
-
-  // Todo: Public endpoint.
-  resendTeamMemberInvitation: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}/member/invite/{invitationId}/resend',
-    //     summary: 'Resend member invite',
-    //     description: 'Resend an email invitation to a user to join the team',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZResendTeamMemberInvitationMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      await resendTeamMemberInvitation({
-        userId: ctx.user.id,
-        userName: ctx.user.name ?? '',
-        ...input,
-      });
-    }),
-
-  // Todo: Public endpoint.
-  deleteTeamMemberInvitations: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}/member/invite/delete',
-    //     summary: 'Delete member invite',
-    //     description: 'Delete a pending team member invite',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZDeleteTeamMemberInvitationsMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await deleteTeamMemberInvitations({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Todo: Public endpoint.
-  getTeamMembers: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'GET',
-    //     path: '/team/{teamId}/member',
-    //     summary: 'Get members',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZGetTeamMembersQuerySchema)
-    .query(async ({ input, ctx }) => {
-      return await getTeamMembers({ teamId: input.teamId, userId: ctx.user.id });
-    }),
-
-  // Todo: Public endpoint.
-  findTeamMembers: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'GET',
-    //     path: '/team/{teamId}/member/find',
-    //     summary: 'Find members',
-    //     description: 'Find team members based on a search criteria',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZFindTeamMembersQuerySchema)
-    .query(async ({ input, ctx }) => {
-      return await findTeamMembers({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Todo: Public endpoint.
-  updateTeamMember: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}/member/{teamMemberId}',
-    //     summary: 'Update member',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZUpdateTeamMemberMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await updateTeamMember({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Todo: Public endpoint.
-  deleteTeamMembers: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}/member/delete',
-    //     summary: 'Delete members',
-    //     description: '',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZDeleteTeamMembersMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await deleteTeamMembers({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Internal endpoint for now.
-  createTeamEmailVerification: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}/email/create',
-    //     summary: 'Create team email',
-    //     description: 'Add an email to a team and send an email request to verify it',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZCreateTeamEmailVerificationMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await createTeamEmailVerification({
-        teamId: input.teamId,
-        userId: ctx.user.id,
-        data: {
-          email: input.email,
-          name: input.name,
-        },
-      });
-    }),
-
-  // Internal endpoint for now.
-  getTeamInvitations: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'GET',
-    //     path: '/team/invite',
-    //     summary: 'Get team invitations',
-    //     description: '',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(z.void())
-    .query(async ({ ctx }) => {
-      return await getTeamInvitations({ email: ctx.user.email });
-    }),
-
-  // Todo: Public endpoint.
-  updateTeamPublicProfile: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}/profile',
-    //     summary: 'Update a team public profile',
-    //     description: '',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZUpdateTeamPublicProfileMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      try {
-        const { teamId, bio, enabled } = input;
-
-        await updateTeamPublicProfile({
+    update: authenticatedProcedure
+      .input(ZUpdateTeamEmailMutationSchema)
+      .mutation(async ({ input, ctx }) => {
+        return await updateTeamEmail({
           userId: ctx.user.id,
-          teamId,
-          data: {
-            bio,
-            enabled,
-          },
+          ...input,
         });
-      } catch (err) {
-        console.error(err);
-
-        const error = AppError.parseError(err);
-
-        if (error.code !== AppErrorCode.UNKNOWN_ERROR) {
-          throw error;
-        }
-
-        throw new TRPCError({
-          code: 'BAD_REQUEST',
-          message:
-            'We were unable to update your public profile. Please review the information you provided and try again.',
+      }),
+    delete: authenticatedProcedure
+      .input(ZDeleteTeamEmailMutationSchema)
+      .mutation(async ({ input, ctx }) => {
+        return await deleteTeamEmail({
+          userId: ctx.user.id,
+          userEmail: ctx.user.email,
+          ...input,
         });
-      }
-    }),
-
-  // Internal endpoint for now.
-  requestTeamOwnershipTransfer: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}/transfer',
-    //     summary: 'Request a team ownership transfer',
-    //     description: '',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZRequestTeamOwnerhsipTransferMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await requestTeamOwnershipTransfer({
-        userId: ctx.user.id,
-        userName: ctx.user.name ?? '',
-        ...input,
-      });
-    }),
-
-  // Internal endpoint for now.
-  deleteTeamTransferRequest: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}/transfer/delete',
-    //     summary: 'Delete team transfer request',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZDeleteTeamTransferRequestMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await deleteTeamTransferRequest({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Todo
-  getTeamEmailByEmail: authenticatedProcedure.query(async ({ ctx }) => {
-    return await getTeamEmailByEmail({ email: ctx.user.email });
-  }),
-
-  // Internal endpoint for now.
-  updateTeamEmail: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}/email',
-    //     summary: 'Update a team email',
-    //     description: '',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZUpdateTeamEmailMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await updateTeamEmail({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Internal endpoint for now.
-  deleteTeamEmail: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}/email/delete',
-    //     summary: 'Delete team email',
-    //     description: '',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZDeleteTeamEmailMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await deleteTeamEmail({
-        userId: ctx.user.id,
-        userEmail: ctx.user.email,
-        ...input,
-      });
-    }),
-
-  // Internal endpoint for now.
-  resendTeamEmailVerification: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}/email/resend',
-    //     summary: 'Resend team email verification',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZResendTeamEmailVerificationMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      await resendTeamEmailVerification({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Internal endpoint for now.
-  deleteTeamEmailVerification: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/{teamId}/email/verify/delete',
-    //     summary: 'Delete team email verification',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZDeleteTeamEmailVerificationMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await deleteTeamEmailVerification({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Internal endpoint. Use updateTeam instead.
-  updateTeamBrandingSettings: authenticatedProcedure
-    .input(ZUpdateTeamBrandingSettingsMutationSchema)
-    .mutation(async ({ ctx, input }) => {
-      const { teamId, settings } = input;
-
-      return await updateTeamBrandingSettings({
-        userId: ctx.user.id,
-        teamId,
-        settings,
-      });
-    }),
-
-  // Internal endpoint for now.
-  createTeamPendingCheckout: authenticatedProcedure
-    .input(ZCreateTeamPendingCheckoutMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await createTeamPendingCheckoutSession({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Internal endpoint for now.
-  findTeamInvoices: authenticatedProcedure
-    .input(ZFindTeamInvoicesQuerySchema)
-    .query(async ({ input, ctx }) => {
-      return await findTeamInvoices({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Internal endpoint for now.
-  getTeamPrices: authenticatedProcedure.query(async () => {
-    return await getTeamPrices();
-  }),
-
-  updateTeamDocumentSettings: updateTeamDocumentSettingsRoute,
-
-  // Internal endpoint for now.
-  acceptTeamInvitation: authenticatedProcedure
-    .input(ZAcceptTeamInvitationMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await acceptTeamInvitation({
-        teamId: input.teamId,
-        userId: ctx.user.id,
-      });
-    }),
-
-  // Internal endpoint for now.
-  declineTeamInvitation: authenticatedProcedure
-    .input(ZDeclineTeamInvitationMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await declineTeamInvitation({
-        teamId: input.teamId,
-        userId: ctx.user.id,
-      });
-    }),
-
-  // Internal endpoint for now.
-  createBillingPortal: authenticatedProcedure
-    .input(ZCreateTeamBillingPortalMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await createTeamBillingPortal({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Internal endpoint for now.
-  findTeamsPending: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'GET',
-    //     path: '/team/pending',
-    //     summary: 'Find pending teams',
-    //     description: 'Find teams that are pending payment',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZFindTeamsPendingQuerySchema)
-    .query(async ({ input, ctx }) => {
-      return await findTeamsPending({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
-
-  // Internal endpoint for now.
-  deleteTeamPending: authenticatedProcedure
-    // .meta({
-    //   openapi: {
-    //     method: 'POST',
-    //     path: '/team/pending/{pendingTeamId}/delete',
-    //     summary: 'Delete pending team',
-    //     description: '',
-    //     tags: ['Teams'],
-    //   },
-    // })
-    .input(ZDeleteTeamPendingMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      return await deleteTeamPending({
-        userId: ctx.user.id,
-        ...input,
-      });
-    }),
+      }),
+    verification: {
+      send: authenticatedProcedure
+        .input(ZCreateTeamEmailVerificationMutationSchema)
+        .mutation(async ({ input, ctx }) => {
+          return await createTeamEmailVerification({
+            teamId: input.teamId,
+            userId: ctx.user.id,
+            data: {
+              email: input.email,
+              name: input.name,
+            },
+          });
+        }),
+      resend: authenticatedProcedure
+        .input(ZResendTeamEmailVerificationMutationSchema)
+        .mutation(async ({ input, ctx }) => {
+          await resendTeamEmailVerification({
+            userId: ctx.user.id,
+            ...input,
+          });
+        }),
+      delete: authenticatedProcedure
+        .input(ZDeleteTeamEmailVerificationMutationSchema)
+        .mutation(async ({ input, ctx }) => {
+          return await deleteTeamEmailVerification({
+            userId: ctx.user.id,
+            ...input,
+          });
+        }),
+    },
+  },
 });
diff --git a/packages/trpc/server/team-router/schema.ts b/packages/trpc/server/team-router/schema.ts
index e7880b448..1fa9ae931 100644
--- a/packages/trpc/server/team-router/schema.ts
+++ b/packages/trpc/server/team-router/schema.ts
@@ -2,9 +2,6 @@ import { TeamMemberRole } from '@prisma/client';
 import { z } from 'zod';
 
 import { PROTECTED_TEAM_URLS } from '@documenso/lib/constants/teams';
-import { ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
-
-import { ZUpdatePublicProfileMutationSchema } from '../profile-router/schema';
 
 /**
  * Restrict team URLs schema.
@@ -43,44 +40,12 @@ export const ZTeamNameSchema = z
   .min(3, { message: 'Team name must be at least 3 characters long.' })
   .max(30, { message: 'Team name must not exceed 30 characters.' });
 
-export const ZAcceptTeamInvitationMutationSchema = z.object({
-  teamId: z.number(),
-});
-
-export const ZDeclineTeamInvitationMutationSchema = z.object({
-  teamId: z.number(),
-});
-
-export const ZCreateTeamBillingPortalMutationSchema = z.object({
-  teamId: z.number(),
-});
-
-export const ZCreateTeamMutationSchema = z.object({
-  teamName: ZTeamNameSchema,
-  teamUrl: ZTeamUrlSchema,
-});
-
 export const ZCreateTeamEmailVerificationMutationSchema = z.object({
   teamId: z.number(),
   name: z.string().trim().min(1, { message: 'Please enter a valid name.' }),
   email: z.string().trim().email().toLowerCase().min(1, 'Please enter a valid email.'),
 });
 
-export const ZCreateTeamMemberInvitesMutationSchema = z.object({
-  teamId: z.number(),
-  invitations: z.array(
-    z.object({
-      email: z.string().email().toLowerCase(),
-      role: z.nativeEnum(TeamMemberRole),
-    }),
-  ),
-});
-
-export const ZCreateTeamPendingCheckoutMutationSchema = z.object({
-  interval: z.union([z.literal('monthly'), z.literal('yearly')]),
-  pendingTeamId: z.number(),
-});
-
 export const ZDeleteTeamEmailMutationSchema = z.object({
   teamId: z.number(),
 });
@@ -89,64 +54,10 @@ export const ZDeleteTeamEmailVerificationMutationSchema = z.object({
   teamId: z.number(),
 });
 
-export const ZDeleteTeamMembersMutationSchema = z.object({
-  teamId: z.number(),
-  teamMemberIds: z.array(z.number()),
-});
-
-export const ZDeleteTeamMemberInvitationsMutationSchema = z.object({
-  teamId: z.number(),
-  invitationIds: z.array(z.number()),
-});
-
-export const ZDeleteTeamMutationSchema = z.object({
-  teamId: z.number(),
-});
-
-export const ZDeleteTeamPendingMutationSchema = z.object({
-  pendingTeamId: z.number(),
-});
-
-export const ZDeleteTeamTransferRequestMutationSchema = z.object({
-  teamId: z.number(),
-});
-
-export const ZFindTeamInvoicesQuerySchema = z.object({
-  teamId: z.number(),
-});
-
-export const ZFindTeamMemberInvitesQuerySchema = ZFindSearchParamsSchema.extend({
-  teamId: z.number(),
-});
-
-export const ZFindTeamMembersQuerySchema = ZFindSearchParamsSchema.extend({
-  teamId: z.number(),
-});
-
-export const ZFindTeamsQuerySchema = ZFindSearchParamsSchema;
-
-export const ZFindTeamsPendingQuerySchema = ZFindSearchParamsSchema;
-
-export const ZGetTeamQuerySchema = z.object({
-  teamId: z.number(),
-});
-
 export const ZGetTeamMembersQuerySchema = z.object({
   teamId: z.number(),
 });
 
-export const ZLeaveTeamMutationSchema = z.object({
-  teamId: z.number(),
-});
-
-export const ZUpdateTeamMutationSchema = z.object({
-  teamId: z.number(),
-  data: z.object({
-    name: ZTeamNameSchema,
-    url: ZTeamUrlSchema,
-  }),
-});
-
 export const ZUpdateTeamEmailMutationSchema = z.object({
   teamId: z.number(),
   data: z.object({
@@ -162,73 +73,17 @@ export const ZUpdateTeamMemberMutationSchema = z.object({
   }),
 });
 
-export const ZUpdateTeamPublicProfileMutationSchema = ZUpdatePublicProfileMutationSchema.pick({
-  bio: true,
-  enabled: true,
-}).extend({
-  teamId: z.number(),
-});
-
-export const ZRequestTeamOwnerhsipTransferMutationSchema = z.object({
-  teamId: z.number(),
-  newOwnerUserId: z.number(),
-  clearPaymentMethods: z.boolean(),
-});
-
 export const ZResendTeamEmailVerificationMutationSchema = z.object({
   teamId: z.number(),
 });
 
-export const ZResendTeamMemberInvitationMutationSchema = z.object({
-  teamId: z.number(),
-  invitationId: z.number(),
-});
-
-export const ZUpdateTeamBrandingSettingsMutationSchema = z.object({
-  teamId: z.number(),
-  settings: z.object({
-    brandingEnabled: z.boolean().optional().default(false),
-    brandingLogo: z.string().optional().default(''),
-    brandingUrl: z.string().optional().default(''),
-    brandingCompanyDetails: z.string().optional().default(''),
-  }),
-});
-
-export type TCreateTeamMutationSchema = z.infer<typeof ZCreateTeamMutationSchema>;
 export type TCreateTeamEmailVerificationMutationSchema = z.infer<
   typeof ZCreateTeamEmailVerificationMutationSchema
 >;
-export type TCreateTeamMemberInvitesMutationSchema = z.infer<
-  typeof ZCreateTeamMemberInvitesMutationSchema
->;
-export type TCreateTeamPendingCheckoutMutationSchema = z.infer<
-  typeof ZCreateTeamPendingCheckoutMutationSchema
->;
+
 export type TDeleteTeamEmailMutationSchema = z.infer<typeof ZDeleteTeamEmailMutationSchema>;
-export type TDeleteTeamMembersMutationSchema = z.infer<typeof ZDeleteTeamMembersMutationSchema>;
-export type TDeleteTeamMutationSchema = z.infer<typeof ZDeleteTeamMutationSchema>;
-export type TDeleteTeamPendingMutationSchema = z.infer<typeof ZDeleteTeamPendingMutationSchema>;
-export type TDeleteTeamTransferRequestMutationSchema = z.infer<
-  typeof ZDeleteTeamTransferRequestMutationSchema
->;
-export type TFindTeamMemberInvitesQuerySchema = z.infer<typeof ZFindTeamMembersQuerySchema>;
-export type TFindTeamMembersQuerySchema = z.infer<typeof ZFindTeamMembersQuerySchema>;
-export type TFindTeamsQuerySchema = z.infer<typeof ZFindTeamsQuerySchema>;
-export type TFindTeamsPendingQuerySchema = z.infer<typeof ZFindTeamsPendingQuerySchema>;
-export type TGetTeamQuerySchema = z.infer<typeof ZGetTeamQuerySchema>;
 export type TGetTeamMembersQuerySchema = z.infer<typeof ZGetTeamMembersQuerySchema>;
-export type TLeaveTeamMutationSchema = z.infer<typeof ZLeaveTeamMutationSchema>;
-export type TUpdateTeamMutationSchema = z.infer<typeof ZUpdateTeamMutationSchema>;
 export type TUpdateTeamEmailMutationSchema = z.infer<typeof ZUpdateTeamEmailMutationSchema>;
-export type TRequestTeamOwnerhsipTransferMutationSchema = z.infer<
-  typeof ZRequestTeamOwnerhsipTransferMutationSchema
->;
 export type TResendTeamEmailVerificationMutationSchema = z.infer<
   typeof ZResendTeamEmailVerificationMutationSchema
 >;
-export type TResendTeamMemberInvitationMutationSchema = z.infer<
-  typeof ZResendTeamMemberInvitationMutationSchema
->;
-export type TUpdateTeamBrandingSettingsMutationSchema = z.infer<
-  typeof ZUpdateTeamBrandingSettingsMutationSchema
->;
diff --git a/packages/trpc/server/team-router/update-team-document-settings.ts b/packages/trpc/server/team-router/update-team-document-settings.ts
deleted file mode 100644
index ce3525b59..000000000
--- a/packages/trpc/server/team-router/update-team-document-settings.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { prisma } from '@documenso/prisma';
-
-import { authenticatedProcedure } from '../trpc';
-import {
-  ZUpdateTeamDocumentSettingsRequestSchema,
-  ZUpdateTeamDocumentSettingsResponseSchema,
-} from './update-team-document-settings.types';
-
-/**
- * Private route.
- */
-export const updateTeamDocumentSettingsRoute = authenticatedProcedure
-  .input(ZUpdateTeamDocumentSettingsRequestSchema)
-  .output(ZUpdateTeamDocumentSettingsResponseSchema)
-  .mutation(async ({ ctx, input }) => {
-    const { user } = ctx;
-    const { teamId, settings } = input;
-
-    const {
-      documentVisibility,
-      documentLanguage,
-      includeSenderDetails,
-      includeSigningCertificate,
-      typedSignatureEnabled,
-      uploadSignatureEnabled,
-      drawSignatureEnabled,
-    } = settings;
-
-    const member = await prisma.teamMember.findFirst({
-      where: {
-        userId: user.id,
-        teamId,
-        role: {
-          in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP.MANAGE_TEAM,
-        },
-      },
-    });
-
-    if (!member) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: 'You do not have permission to update this team.',
-      });
-    }
-
-    return await prisma.teamGlobalSettings.upsert({
-      where: {
-        teamId,
-      },
-      create: {
-        teamId,
-        documentVisibility,
-        documentLanguage,
-        includeSenderDetails,
-        includeSigningCertificate,
-        typedSignatureEnabled,
-        uploadSignatureEnabled,
-        drawSignatureEnabled,
-      },
-      update: {
-        documentVisibility,
-        documentLanguage,
-        includeSenderDetails,
-        includeSigningCertificate,
-        typedSignatureEnabled,
-        uploadSignatureEnabled,
-        drawSignatureEnabled,
-      },
-    });
-  });
diff --git a/packages/trpc/server/team-router/update-team-document-settings.types.ts b/packages/trpc/server/team-router/update-team-document-settings.types.ts
deleted file mode 100644
index 14263ce56..000000000
--- a/packages/trpc/server/team-router/update-team-document-settings.types.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { z } from 'zod';
-
-import { SUPPORTED_LANGUAGE_CODES } from '@documenso/lib/constants/i18n';
-import { DocumentVisibility } from '@documenso/lib/types/document-visibility';
-import TeamGlobalSettingsSchema from '@documenso/prisma/generated/zod/modelSchema/TeamGlobalSettingsSchema';
-
-export const ZUpdateTeamDocumentSettingsRequestSchema = z.object({
-  teamId: z.number(),
-  settings: z.object({
-    documentVisibility: z
-      .nativeEnum(DocumentVisibility)
-      .optional()
-      .default(DocumentVisibility.EVERYONE),
-    documentLanguage: z.enum(SUPPORTED_LANGUAGE_CODES).optional().default('en'),
-    includeSenderDetails: z.boolean().optional().default(false),
-    includeSigningCertificate: z.boolean().optional().default(true),
-    typedSignatureEnabled: z.boolean().optional().default(true),
-    uploadSignatureEnabled: z.boolean().optional().default(true),
-    drawSignatureEnabled: z.boolean().optional().default(true),
-  }),
-});
-
-export const ZUpdateTeamDocumentSettingsResponseSchema = TeamGlobalSettingsSchema;
diff --git a/packages/trpc/server/team-router/update-team-group.ts b/packages/trpc/server/team-router/update-team-group.ts
new file mode 100644
index 000000000..4c10ff18b
--- /dev/null
+++ b/packages/trpc/server/team-router/update-team-group.ts
@@ -0,0 +1,76 @@
+import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { getMemberRoles } from '@documenso/lib/server-only/team/get-member-roles';
+import { buildTeamWhereQuery, isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
+import { prisma } from '@documenso/prisma';
+import { OrganisationGroupType } from '@documenso/prisma/generated/types';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZUpdateTeamGroupRequestSchema,
+  ZUpdateTeamGroupResponseSchema,
+} from './update-team-group.types';
+
+export const updateTeamGroupRoute = authenticatedProcedure
+  // .meta(updateTeamGroupMeta)
+  .input(ZUpdateTeamGroupRequestSchema)
+  .output(ZUpdateTeamGroupResponseSchema)
+  .mutation(async ({ input, ctx }) => {
+    const { id, data } = input;
+    const { user } = ctx;
+
+    const teamGroup = await prisma.teamGroup.findFirst({
+      where: {
+        id,
+        team: buildTeamWhereQuery({
+          teamId: undefined,
+          userId: user.id,
+          roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+        }),
+      },
+      include: {
+        organisationGroup: true,
+      },
+    });
+
+    if (!teamGroup) {
+      throw new AppError(AppErrorCode.NOT_FOUND, {
+        message: 'Team group not found',
+      });
+    }
+
+    if (teamGroup.organisationGroup.type === OrganisationGroupType.INTERNAL_ORGANISATION) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'You are not allowed to update internal organisation groups',
+      });
+    }
+
+    const { teamRole: currentUserTeamRole } = await getMemberRoles({
+      teamId: teamGroup.teamId,
+      reference: {
+        type: 'User',
+        id: user.id,
+      },
+    });
+
+    if (!isTeamRoleWithinUserHierarchy(currentUserTeamRole, teamGroup.teamRole)) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'You are not allowed to update this team group',
+      });
+    }
+
+    if (!isTeamRoleWithinUserHierarchy(currentUserTeamRole, data.teamRole)) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'You are not allowed to set a team role higher than your own',
+      });
+    }
+
+    await prisma.teamGroup.update({
+      where: {
+        id,
+      },
+      data: {
+        teamRole: data.teamRole,
+      },
+    });
+  });
diff --git a/packages/trpc/server/team-router/update-team-group.types.ts b/packages/trpc/server/team-router/update-team-group.types.ts
new file mode 100644
index 000000000..3be528333
--- /dev/null
+++ b/packages/trpc/server/team-router/update-team-group.types.ts
@@ -0,0 +1,24 @@
+import { TeamMemberRole } from '@prisma/client';
+import { z } from 'zod';
+
+// export const updateTeamGroupMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/team/groups/{id}',
+//     summary: 'Update team group',
+//     description: 'Update an existing group for a team',
+//     tags: ['Team'],
+//     requiredScopes: ['personal:team:write'],
+//   },
+// };
+
+export const ZUpdateTeamGroupRequestSchema = z.object({
+  id: z.string(),
+  data: z.object({
+    teamRole: z.nativeEnum(TeamMemberRole),
+  }),
+});
+
+export const ZUpdateTeamGroupResponseSchema = z.void();
+
+export type TUpdateTeamGroupRequest = z.infer<typeof ZUpdateTeamGroupRequestSchema>;
diff --git a/packages/trpc/server/team-router/update-team-member.ts b/packages/trpc/server/team-router/update-team-member.ts
new file mode 100644
index 000000000..e418fb5be
--- /dev/null
+++ b/packages/trpc/server/team-router/update-team-member.ts
@@ -0,0 +1,167 @@
+import { match } from 'ts-pattern';
+
+import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { getMemberRoles } from '@documenso/lib/server-only/team/get-member-roles';
+import { generateDatabaseId } from '@documenso/lib/universal/id';
+import { buildTeamWhereQuery, isTeamRoleWithinUserHierarchy } from '@documenso/lib/utils/teams';
+import { prisma } from '@documenso/prisma';
+import { OrganisationGroupType, TeamMemberRole } from '@documenso/prisma/generated/types';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZUpdateTeamMemberRequestSchema,
+  ZUpdateTeamMemberResponseSchema,
+} from './update-team-member.types';
+
+export const updateTeamMemberRoute = authenticatedProcedure
+  //   .meta(updateTeamMemberMeta)
+  .input(ZUpdateTeamMemberRequestSchema)
+  .output(ZUpdateTeamMemberResponseSchema)
+  .mutation(async ({ ctx, input }) => {
+    const { teamId, memberId, data } = input;
+    const userId = ctx.user.id;
+
+    const team = await prisma.team.findFirst({
+      where: {
+        AND: [
+          buildTeamWhereQuery({
+            teamId,
+            userId,
+            roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+          }),
+          {
+            organisation: {
+              members: {
+                some: {
+                  id: memberId,
+                },
+              },
+            },
+          },
+        ],
+      },
+      include: {
+        teamGroups: {
+          where: {
+            organisationGroup: {
+              type: OrganisationGroupType.INTERNAL_TEAM,
+            },
+          },
+          include: {
+            organisationGroup: {
+              include: {
+                organisationGroupMembers: {
+                  include: {
+                    organisationMember: true,
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    });
+
+    if (!team) {
+      throw new AppError(AppErrorCode.NOT_FOUND, { message: 'Team not found' });
+    }
+
+    const internalTeamGroupToRemoveMemberFrom = team.teamGroups.find(
+      (group) =>
+        group.organisationGroup.type === OrganisationGroupType.INTERNAL_TEAM &&
+        group.teamId === teamId &&
+        group.organisationGroup.organisationGroupMembers.some(
+          (member) => member.organisationMemberId === memberId,
+        ),
+    );
+
+    const teamMemberGroup = team.teamGroups.find(
+      (group) =>
+        group.organisationGroup.type === OrganisationGroupType.INTERNAL_TEAM &&
+        group.teamId === teamId &&
+        group.teamRole === TeamMemberRole.MEMBER,
+    );
+
+    const teamManagerGroup = team.teamGroups.find(
+      (group) =>
+        group.organisationGroup.type === OrganisationGroupType.INTERNAL_TEAM &&
+        group.teamId === teamId &&
+        group.teamRole === TeamMemberRole.MANAGER,
+    );
+
+    const teamAdminGroup = team.teamGroups.find(
+      (group) =>
+        group.organisationGroup.type === OrganisationGroupType.INTERNAL_TEAM &&
+        group.teamId === teamId &&
+        group.teamRole === TeamMemberRole.ADMIN,
+    );
+
+    if (!teamMemberGroup || !teamManagerGroup || !teamAdminGroup) {
+      console.error({
+        message: 'Team groups not found.',
+        teamMemberGroup: Boolean(teamMemberGroup),
+        teamManagerGroup: Boolean(teamManagerGroup),
+        teamAdminGroup: Boolean(teamAdminGroup),
+      });
+
+      throw new AppError(AppErrorCode.NOT_FOUND, {
+        message: 'Team groups not found.',
+      });
+    }
+
+    const { teamRole: currentUserTeamRole } = await getMemberRoles({
+      teamId,
+      reference: {
+        type: 'User',
+        id: userId,
+      },
+    });
+
+    const { teamRole: currentMemberToUpdateTeamRole } = await getMemberRoles({
+      teamId,
+      reference: {
+        type: 'Member',
+        id: memberId,
+      },
+    });
+
+    // Check role permissions.
+    if (!isTeamRoleWithinUserHierarchy(currentUserTeamRole, currentMemberToUpdateTeamRole)) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'Cannot update a member with a higher role',
+      });
+    }
+
+    if (!isTeamRoleWithinUserHierarchy(currentUserTeamRole, data.role)) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'Cannot update a member to a role higher than your own',
+      });
+    }
+
+    // Switch member to new internal team group role.
+    await prisma.$transaction(async (tx) => {
+      if (internalTeamGroupToRemoveMemberFrom) {
+        await tx.organisationGroupMember.delete({
+          where: {
+            organisationMemberId_groupId: {
+              organisationMemberId: memberId,
+              groupId: internalTeamGroupToRemoveMemberFrom.organisationGroupId,
+            },
+          },
+        });
+      }
+
+      await tx.organisationGroupMember.create({
+        data: {
+          id: generateDatabaseId('group_member'),
+          organisationMemberId: memberId,
+          groupId: match(data.role)
+            .with(TeamMemberRole.MEMBER, () => teamMemberGroup.organisationGroupId)
+            .with(TeamMemberRole.MANAGER, () => teamManagerGroup.organisationGroupId)
+            .with(TeamMemberRole.ADMIN, () => teamAdminGroup.organisationGroupId)
+            .exhaustive(),
+        },
+      });
+    });
+  });
diff --git a/packages/trpc/server/team-router/update-team-member.types.ts b/packages/trpc/server/team-router/update-team-member.types.ts
new file mode 100644
index 000000000..ca2d3206d
--- /dev/null
+++ b/packages/trpc/server/team-router/update-team-member.types.ts
@@ -0,0 +1,22 @@
+import { TeamMemberRole } from '@prisma/client';
+import { z } from 'zod';
+
+// export const updateTeamMemberMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/team/member/update',
+//     summary: 'Update team member',
+//     description: 'Update team member',
+//     tags: ['Team'],
+//   },
+// };
+
+export const ZUpdateTeamMemberRequestSchema = z.object({
+  teamId: z.number(),
+  memberId: z.string(),
+  data: z.object({
+    role: z.nativeEnum(TeamMemberRole),
+  }),
+});
+
+export const ZUpdateTeamMemberResponseSchema = z.void();
diff --git a/packages/trpc/server/team-router/update-team-settings.ts b/packages/trpc/server/team-router/update-team-settings.ts
new file mode 100644
index 000000000..7c6083645
--- /dev/null
+++ b/packages/trpc/server/team-router/update-team-settings.ts
@@ -0,0 +1,92 @@
+import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { buildTeamWhereQuery } from '@documenso/lib/utils/teams';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZUpdateTeamSettingsRequestSchema,
+  ZUpdateTeamSettingsResponseSchema,
+} from './update-team-settings.types';
+
+export const updateTeamSettingsRoute = authenticatedProcedure
+  .input(ZUpdateTeamSettingsRequestSchema)
+  .output(ZUpdateTeamSettingsResponseSchema)
+  .mutation(async ({ ctx, input }) => {
+    const { user } = ctx;
+    const { teamId, data } = input;
+
+    const {
+      // Document related settings.
+      documentVisibility,
+      documentLanguage,
+      includeSenderDetails,
+      includeSigningCertificate,
+      typedSignatureEnabled,
+      uploadSignatureEnabled,
+      drawSignatureEnabled,
+
+      // Branding related settings.
+      brandingEnabled,
+      brandingLogo,
+      brandingUrl,
+      brandingCompanyDetails,
+    } = data;
+
+    if (Object.values(data).length === 0) {
+      throw new AppError(AppErrorCode.INVALID_BODY, {
+        message: 'No settings to update',
+      });
+    }
+
+    // Signatures will only be inherited if all are NULL.
+    if (
+      typedSignatureEnabled === false &&
+      uploadSignatureEnabled === false &&
+      drawSignatureEnabled === false
+    ) {
+      throw new AppError(AppErrorCode.INVALID_BODY, {
+        message: 'At least one signature type must be enabled',
+      });
+    }
+
+    const team = await prisma.team.findFirst({
+      where: buildTeamWhereQuery({
+        teamId,
+        userId: user.id,
+        roles: TEAM_MEMBER_ROLE_PERMISSIONS_MAP['MANAGE_TEAM'],
+      }),
+    });
+
+    if (!team) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'You do not have permission to update this team.',
+      });
+    }
+
+    await prisma.team.update({
+      where: {
+        id: teamId,
+      },
+      data: {
+        teamGlobalSettings: {
+          update: {
+            // Document related settings.
+            documentVisibility,
+            documentLanguage,
+            includeSenderDetails,
+            includeSigningCertificate,
+            typedSignatureEnabled,
+            uploadSignatureEnabled,
+            drawSignatureEnabled,
+
+            // Branding related settings.
+            brandingEnabled,
+            brandingLogo,
+            brandingUrl,
+            brandingCompanyDetails,
+          },
+        },
+      },
+    });
+  });
diff --git a/packages/trpc/server/team-router/update-team-settings.types.ts b/packages/trpc/server/team-router/update-team-settings.types.ts
new file mode 100644
index 000000000..5b7781b92
--- /dev/null
+++ b/packages/trpc/server/team-router/update-team-settings.types.ts
@@ -0,0 +1,30 @@
+import { z } from 'zod';
+
+import { SUPPORTED_LANGUAGE_CODES } from '@documenso/lib/constants/i18n';
+import { DocumentVisibility } from '@documenso/lib/types/document-visibility';
+
+/**
+ * Null = Inherit from organisation.
+ * Undefined = Do nothing
+ */
+export const ZUpdateTeamSettingsRequestSchema = z.object({
+  teamId: z.number(),
+  data: z.object({
+    // Document related settings.
+    documentVisibility: z.nativeEnum(DocumentVisibility).nullish(),
+    documentLanguage: z.enum(SUPPORTED_LANGUAGE_CODES).nullish(),
+    includeSenderDetails: z.boolean().nullish(),
+    includeSigningCertificate: z.boolean().nullish(),
+    typedSignatureEnabled: z.boolean().nullish(),
+    uploadSignatureEnabled: z.boolean().nullish(),
+    drawSignatureEnabled: z.boolean().nullish(),
+
+    // Branding related settings.
+    brandingEnabled: z.boolean().nullish(),
+    brandingLogo: z.string().nullish(),
+    brandingUrl: z.string().nullish(),
+    brandingCompanyDetails: z.string().nullish(),
+  }),
+});
+
+export const ZUpdateTeamSettingsResponseSchema = z.void();
diff --git a/packages/trpc/server/team-router/update-team.ts b/packages/trpc/server/team-router/update-team.ts
new file mode 100644
index 000000000..8aa9ab197
--- /dev/null
+++ b/packages/trpc/server/team-router/update-team.ts
@@ -0,0 +1,37 @@
+import { updateTeam } from '@documenso/lib/server-only/team/update-team';
+import { updateTeamPublicProfile } from '@documenso/lib/server-only/team/update-team-public-profile';
+
+import { authenticatedProcedure } from '../trpc';
+import { ZUpdateTeamRequestSchema, ZUpdateTeamResponseSchema } from './update-team.types';
+
+export const updateTeamRoute = authenticatedProcedure
+  //   .meta(updateTeamMeta)
+  .input(ZUpdateTeamRequestSchema)
+  .output(ZUpdateTeamResponseSchema)
+  .mutation(async ({ input, ctx }) => {
+    const { teamId, data } = input;
+
+    const { name, url, profileBio, profileEnabled } = data;
+
+    if (name || url) {
+      await updateTeam({
+        userId: ctx.user.id,
+        teamId,
+        data: {
+          name,
+          url,
+        },
+      });
+    }
+
+    if (profileBio || profileEnabled !== undefined) {
+      await updateTeamPublicProfile({
+        userId: ctx.user.id,
+        teamId,
+        data: {
+          bio: profileBio,
+          enabled: profileEnabled,
+        },
+      });
+    }
+  });
diff --git a/packages/trpc/server/team-router/update-team.types.ts b/packages/trpc/server/team-router/update-team.types.ts
new file mode 100644
index 000000000..c75abdf30
--- /dev/null
+++ b/packages/trpc/server/team-router/update-team.types.ts
@@ -0,0 +1,34 @@
+import { z } from 'zod';
+
+import { ZTeamNameSchema, ZTeamUrlSchema } from './schema';
+
+export const MAX_PROFILE_BIO_LENGTH = 256;
+
+// If we enable this, consider whether we should move the profile updates to
+// a separate endpoint since that's a separate action.
+// export const updateTeamMeta: TrpcOpenApiMeta = {
+//   openapi: {
+//     method: 'POST',
+//     path: '/team/{teamId}',
+//     summary: 'Update team',
+//     description: 'Update an team',
+//     tags: ['team'],
+//   },
+// };
+
+export const ZUpdateTeamRequestSchema = z.object({
+  teamId: z.number(),
+  data: z.object({
+    name: ZTeamNameSchema.optional(),
+    url: ZTeamUrlSchema.optional(),
+    profileBio: z
+      .string()
+      .max(MAX_PROFILE_BIO_LENGTH, {
+        message: `Bio must be shorter than ${MAX_PROFILE_BIO_LENGTH + 1} characters`,
+      })
+      .optional(),
+    profileEnabled: z.boolean().optional(),
+  }),
+});
+
+export const ZUpdateTeamResponseSchema = z.void();
diff --git a/packages/trpc/server/template-router/router.ts b/packages/trpc/server/template-router/router.ts
index b11fae91a..b10412c58 100644
--- a/packages/trpc/server/template-router/router.ts
+++ b/packages/trpc/server/template-router/router.ts
@@ -21,7 +21,6 @@ import { deleteTemplateDirectLink } from '@documenso/lib/server-only/template/de
 import { duplicateTemplate } from '@documenso/lib/server-only/template/duplicate-template';
 import { findTemplates } from '@documenso/lib/server-only/template/find-templates';
 import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
-import { moveTemplateToTeam } from '@documenso/lib/server-only/template/move-template-to-team';
 import { toggleTemplateDirectLink } from '@documenso/lib/server-only/template/toggle-template-direct-link';
 import { updateTemplate } from '@documenso/lib/server-only/template/update-template';
 
@@ -43,8 +42,6 @@ import {
   ZFindTemplatesResponseSchema,
   ZGetTemplateByIdRequestSchema,
   ZGetTemplateByIdResponseSchema,
-  ZMoveTemplateToTeamRequestSchema,
-  ZMoveTemplateToTeamResponseSchema,
   ZToggleTemplateDirectLinkRequestSchema,
   ZToggleTemplateDirectLinkResponseSchema,
   ZUpdateTemplateRequestSchema,
@@ -231,7 +228,7 @@ export const templateRouter = router({
       const { templateId, recipients, distributeDocument, customDocumentDataId, prefillFields } =
         input;
 
-      const limits = await getServerLimits({ email: ctx.user.email, teamId });
+      const limits = await getServerLimits({ userId: ctx.user.id, teamId });
 
       if (limits.remaining.documents === 0) {
         throw new Error('You have reached your document limit.');
@@ -335,7 +332,7 @@ export const templateRouter = router({
 
       const template = await getTemplateById({ id: templateId, teamId, userId: ctx.user.id });
 
-      const limits = await getServerLimits({ email: ctx.user.email, teamId: template.teamId });
+      const limits = await getServerLimits({ userId: ctx.user.id, teamId: template.teamId });
 
       if (limits.remaining.directTemplates === 0) {
         throw new AppError(AppErrorCode.LIMIT_EXCEEDED, {
@@ -396,32 +393,6 @@ export const templateRouter = router({
       return await toggleTemplateDirectLink({ userId, teamId, templateId, enabled });
     }),
 
-  /**
-   * @public
-   */
-  moveTemplateToTeam: authenticatedProcedure
-    .meta({
-      openapi: {
-        method: 'POST',
-        path: '/template/move',
-        summary: 'Move template',
-        description: 'Move a template to a team',
-        tags: ['Template'],
-      },
-    })
-    .input(ZMoveTemplateToTeamRequestSchema)
-    .output(ZMoveTemplateToTeamResponseSchema)
-    .mutation(async ({ input, ctx }) => {
-      const { templateId, teamId } = input;
-      const userId = ctx.user.id;
-
-      return await moveTemplateToTeam({
-        templateId,
-        teamId,
-        userId,
-      });
-    }),
-
   /**
    * @private
    */
diff --git a/packages/trpc/server/template-router/schema.ts b/packages/trpc/server/template-router/schema.ts
index ebaf70249..e0804ed9b 100644
--- a/packages/trpc/server/template-router/schema.ts
+++ b/packages/trpc/server/template-router/schema.ts
@@ -196,16 +196,9 @@ export const ZGetTemplateByIdRequestSchema = z.object({
 
 export const ZGetTemplateByIdResponseSchema = ZTemplateSchema;
 
-export const ZMoveTemplateToTeamRequestSchema = z.object({
-  templateId: z.number().describe('The ID of the template to move to.'),
-  teamId: z.number().describe('The ID of the team to move the template to.'),
-});
-
-export const ZMoveTemplateToTeamResponseSchema = ZTemplateLiteSchema;
-
 export const ZBulkSendTemplateMutationSchema = z.object({
   templateId: z.number(),
-  teamId: z.number().optional(),
+  teamId: z.number(),
   csv: z.string().min(1),
   sendImmediately: z.boolean(),
 });
diff --git a/packages/trpc/server/trpc.ts b/packages/trpc/server/trpc.ts
index 28e7e2127..8e081390c 100644
--- a/packages/trpc/server/trpc.ts
+++ b/packages/trpc/server/trpc.ts
@@ -83,7 +83,7 @@ export const authenticatedMiddleware = t.middleware(async ({ ctx, next }) => {
       ctx: {
         ...ctx,
         user: apiToken.user,
-        teamId: apiToken.teamId || undefined,
+        teamId: apiToken.teamId,
         session: null,
         metadata: {
           ...ctx.metadata,
diff --git a/packages/trpc/server/webhook-router/router.ts b/packages/trpc/server/webhook-router/router.ts
index 730b23885..9323963ed 100644
--- a/packages/trpc/server/webhook-router/router.ts
+++ b/packages/trpc/server/webhook-router/router.ts
@@ -3,24 +3,19 @@ import { deleteWebhookById } from '@documenso/lib/server-only/webhooks/delete-we
 import { editWebhook } from '@documenso/lib/server-only/webhooks/edit-webhook';
 import { getWebhookById } from '@documenso/lib/server-only/webhooks/get-webhook-by-id';
 import { getWebhooksByTeamId } from '@documenso/lib/server-only/webhooks/get-webhooks-by-team-id';
-import { getWebhooksByUserId } from '@documenso/lib/server-only/webhooks/get-webhooks-by-user-id';
 
 import { authenticatedProcedure, router } from '../trpc';
 import {
-  ZCreateWebhookMutationSchema,
-  ZDeleteWebhookMutationSchema,
-  ZEditWebhookMutationSchema,
-  ZGetTeamWebhooksQuerySchema,
-  ZGetWebhookByIdQuerySchema,
+  ZCreateWebhookRequestSchema,
+  ZDeleteWebhookRequestSchema,
+  ZEditWebhookRequestSchema,
+  ZGetTeamWebhooksRequestSchema,
+  ZGetWebhookByIdRequestSchema,
 } from './schema';
 
 export const webhookRouter = router({
-  getWebhooks: authenticatedProcedure.query(async ({ ctx }) => {
-    return await getWebhooksByUserId(ctx.user.id);
-  }),
-
   getTeamWebhooks: authenticatedProcedure
-    .input(ZGetTeamWebhooksQuerySchema)
+    .input(ZGetTeamWebhooksRequestSchema)
     .query(async ({ ctx, input }) => {
       const { teamId } = input;
 
@@ -28,7 +23,7 @@ export const webhookRouter = router({
     }),
 
   getWebhookById: authenticatedProcedure
-    .input(ZGetWebhookByIdQuerySchema)
+    .input(ZGetWebhookByIdRequestSchema)
     .query(async ({ input, ctx }) => {
       const { id, teamId } = input;
 
@@ -40,7 +35,7 @@ export const webhookRouter = router({
     }),
 
   createWebhook: authenticatedProcedure
-    .input(ZCreateWebhookMutationSchema)
+    .input(ZCreateWebhookRequestSchema)
     .mutation(async ({ input, ctx }) => {
       const { enabled, eventTriggers, secret, webhookUrl, teamId } = input;
 
@@ -55,7 +50,7 @@ export const webhookRouter = router({
     }),
 
   deleteWebhook: authenticatedProcedure
-    .input(ZDeleteWebhookMutationSchema)
+    .input(ZDeleteWebhookRequestSchema)
     .mutation(async ({ input, ctx }) => {
       const { id, teamId } = input;
 
@@ -67,7 +62,7 @@ export const webhookRouter = router({
     }),
 
   editWebhook: authenticatedProcedure
-    .input(ZEditWebhookMutationSchema)
+    .input(ZEditWebhookRequestSchema)
     .mutation(async ({ input, ctx }) => {
       const { id, teamId, ...data } = input;
 
diff --git a/packages/trpc/server/webhook-router/schema.ts b/packages/trpc/server/webhook-router/schema.ts
index 85902d893..d6b411aaa 100644
--- a/packages/trpc/server/webhook-router/schema.ts
+++ b/packages/trpc/server/webhook-router/schema.ts
@@ -1,40 +1,40 @@
 import { WebhookTriggerEvents } from '@prisma/client';
 import { z } from 'zod';
 
-export const ZGetTeamWebhooksQuerySchema = z.object({
+export const ZGetTeamWebhooksRequestSchema = z.object({
   teamId: z.number(),
 });
 
-export type TGetTeamWebhooksQuerySchema = z.infer<typeof ZGetTeamWebhooksQuerySchema>;
+export type TGetTeamWebhooksRequestSchema = z.infer<typeof ZGetTeamWebhooksRequestSchema>;
 
-export const ZCreateWebhookMutationSchema = z.object({
+export const ZCreateWebhookRequestSchema = z.object({
   webhookUrl: z.string().url(),
   eventTriggers: z
     .array(z.nativeEnum(WebhookTriggerEvents))
     .min(1, { message: 'At least one event trigger is required' }),
   secret: z.string().nullable(),
   enabled: z.boolean(),
-  teamId: z.number().optional(),
+  teamId: z.number(),
 });
 
-export type TCreateWebhookFormSchema = z.infer<typeof ZCreateWebhookMutationSchema>;
+export type TCreateWebhookFormSchema = z.infer<typeof ZCreateWebhookRequestSchema>;
 
-export const ZGetWebhookByIdQuerySchema = z.object({
+export const ZGetWebhookByIdRequestSchema = z.object({
   id: z.string(),
-  teamId: z.number().optional(),
+  teamId: z.number(),
 });
 
-export type TGetWebhookByIdQuerySchema = z.infer<typeof ZGetWebhookByIdQuerySchema>;
+export type TGetWebhookByIdRequestSchema = z.infer<typeof ZGetWebhookByIdRequestSchema>;
 
-export const ZEditWebhookMutationSchema = ZCreateWebhookMutationSchema.extend({
+export const ZEditWebhookRequestSchema = ZCreateWebhookRequestSchema.extend({
   id: z.string(),
 });
 
-export type TEditWebhookMutationSchema = z.infer<typeof ZEditWebhookMutationSchema>;
+export type TEditWebhookRequestSchema = z.infer<typeof ZEditWebhookRequestSchema>;
 
-export const ZDeleteWebhookMutationSchema = z.object({
+export const ZDeleteWebhookRequestSchema = z.object({
   id: z.string(),
-  teamId: z.number().optional(),
+  teamId: z.number(),
 });
 
-export type TDeleteWebhookMutationSchema = z.infer<typeof ZDeleteWebhookMutationSchema>;
+export type TDeleteWebhookRequestSchema = z.infer<typeof ZDeleteWebhookRequestSchema>;
diff --git a/packages/ui/primitives/alert.tsx b/packages/ui/primitives/alert.tsx
index 5b5fa770a..5cab60cda 100644
--- a/packages/ui/primitives/alert.tsx
+++ b/packages/ui/primitives/alert.tsx
@@ -39,7 +39,7 @@ const Alert = React.forwardRef<
   <div
     ref={ref}
     role="alert"
-    className={cn(alertVariants({ variant, padding }), className)}
+    className={cn('space-y-2', alertVariants({ variant, padding }), className)}
     {...props}
   />
 ));
@@ -58,7 +58,7 @@ const AlertDescription = React.forwardRef<
   HTMLParagraphElement,
   React.HTMLAttributes<HTMLParagraphElement>
 >(({ className, ...props }, ref) => (
-  <div ref={ref} className={cn('mt-2 text-sm', className)} {...props} />
+  <div ref={ref} className={cn('text-sm', className)} {...props} />
 ));
 
 AlertDescription.displayName = 'AlertDescription';
diff --git a/packages/ui/primitives/data-table.tsx b/packages/ui/primitives/data-table.tsx
index d27dab0aa..2fad7e048 100644
--- a/packages/ui/primitives/data-table.tsx
+++ b/packages/ui/primitives/data-table.tsx
@@ -26,6 +26,7 @@ export interface DataTableProps<TData, TValue> {
   totalPages?: number;
   onPaginationChange?: (_page: number, _perPage: number) => void;
   onClearFilters?: () => void;
+  emptyState?: React.ReactNode;
   hasFilters?: boolean;
   children?: DataTableChildren<TData>;
   skeleton?: {
@@ -52,6 +53,7 @@ export function DataTable<TData, TValue>({
   onClearFilters,
   onPaginationChange,
   children,
+  emptyState,
 }: DataTableProps<TData, TValue>) {
   const pagination = useMemo<PaginationState>(() => {
     if (currentPage !== undefined && perPage !== undefined) {
@@ -142,17 +144,21 @@ export function DataTable<TData, TValue>({
             ) : (
               <TableRow>
                 <TableCell colSpan={columns.length} className="h-32 text-center">
-                  <p>
-                    <Trans>No results found</Trans>
-                  </p>
+                  {emptyState ?? (
+                    <>
+                      <p>
+                        <Trans>No results found</Trans>
+                      </p>
 
-                  {hasFilters && onClearFilters !== undefined && (
-                    <button
-                      onClick={() => onClearFilters()}
-                      className="text-foreground mt-1 text-sm"
-                    >
-                      <Trans>Clear filters</Trans>
-                    </button>
+                      {hasFilters && onClearFilters !== undefined && (
+                        <button
+                          onClick={() => onClearFilters()}
+                          className="text-foreground mt-1 text-sm"
+                        >
+                          <Trans>Clear filters</Trans>
+                        </button>
+                      )}
+                    </>
                   )}
                 </TableCell>
               </TableRow>
diff --git a/packages/ui/primitives/document-dropzone.tsx b/packages/ui/primitives/document-dropzone.tsx
index a05a36880..043ec1ef1 100644
--- a/packages/ui/primitives/document-dropzone.tsx
+++ b/packages/ui/primitives/document-dropzone.tsx
@@ -7,6 +7,7 @@ import { AlertTriangle, Plus } from 'lucide-react';
 import { useDropzone } from 'react-dropzone';
 import { Link } from 'react-router';
 
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT, IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { megabytesToBytes } from '@documenso/lib/universal/unit-convertions';
 
@@ -44,6 +45,8 @@ export const DocumentDropzone = ({
 }: DocumentDropzoneProps) => {
   const { _ } = useLingui();
 
+  const organisation = useCurrentOrganisation();
+
   const { getRootProps, getInputProps } = useDropzone({
     accept: {
       'application/pdf': ['.pdf'],
@@ -158,7 +161,7 @@ export const DocumentDropzone = ({
 
           {disabled && IS_BILLING_ENABLED() && (
             <Button className="hover:bg-warning/80 bg-warning mt-4 w-32" asChild>
-              <Link to="/settings/billing">
+              <Link to={`/o/${organisation.url}/settings/billing`}>
                 <Trans>Upgrade</Trans>
               </Link>
             </Button>
diff --git a/packages/ui/primitives/document-flow/add-fields.tsx b/packages/ui/primitives/document-flow/add-fields.tsx
index 83cfc363e..8325b3053 100644
--- a/packages/ui/primitives/document-flow/add-fields.tsx
+++ b/packages/ui/primitives/document-flow/add-fields.tsx
@@ -85,7 +85,7 @@ export type AddFieldsFormProps = {
   onSubmit: (_data: TAddFieldsFormSchema) => void;
   canGoBack?: boolean;
   isDocumentPdfLoaded: boolean;
-  teamId?: number;
+  teamId: number;
 };
 
 export const AddFieldsFormPartial = ({
@@ -604,7 +604,6 @@ export const AddFieldsFormPartial = ({
           onAdvancedSettings={handleAdvancedSettings}
           isDocumentPdfLoaded={isDocumentPdfLoaded}
           onSave={handleSavedFieldSettings}
-          teamId={teamId}
         />
       ) : (
         <>
diff --git a/packages/ui/primitives/document-flow/add-settings.tsx b/packages/ui/primitives/document-flow/add-settings.tsx
index 16aeb691f..3ad28d17f 100644
--- a/packages/ui/primitives/document-flow/add-settings.tsx
+++ b/packages/ui/primitives/document-flow/add-settings.tsx
@@ -9,6 +9,7 @@ import { InfoIcon } from 'lucide-react';
 import { useForm } from 'react-hook-form';
 import { match } from 'ts-pattern';
 
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { DATE_FORMATS, DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
 import { DOCUMENT_SIGNATURE_TYPES } from '@documenso/lib/constants/document';
 import { SUPPORTED_LANGUAGES } from '@documenso/lib/constants/i18n';
@@ -69,7 +70,6 @@ export type AddSettingsFormProps = {
   documentFlow: DocumentFlowStep;
   recipients: Recipient[];
   fields: Field[];
-  isDocumentEnterprise: boolean;
   isDocumentPdfLoaded: boolean;
   document: TDocument;
   currentTeamMemberRole?: TeamMemberRole;
@@ -80,7 +80,6 @@ export const AddSettingsFormPartial = ({
   documentFlow,
   recipients,
   fields,
-  isDocumentEnterprise,
   isDocumentPdfLoaded,
   document,
   currentTeamMemberRole,
@@ -88,6 +87,8 @@ export const AddSettingsFormPartial = ({
 }: AddSettingsFormProps) => {
   const { t } = useLingui();
 
+  const organisation = useCurrentOrganisation();
+
   const { documentAuthOption } = extractDocumentAuthMethods({
     documentAuth: document.authOptions,
   });
@@ -288,7 +289,7 @@ export const AddSettingsFormPartial = ({
               />
             )}
 
-            {isDocumentEnterprise && (
+            {organisation.organisationClaim.flags.cfr21 && (
               <FormField
                 control={form.control}
                 name="globalActionAuth"
diff --git a/packages/ui/primitives/document-flow/add-signers.tsx b/packages/ui/primitives/document-flow/add-signers.tsx
index 685ae0937..6b280f90f 100644
--- a/packages/ui/primitives/document-flow/add-signers.tsx
+++ b/packages/ui/primitives/document-flow/add-signers.tsx
@@ -14,6 +14,7 @@ import { useFieldArray, useForm } from 'react-hook-form';
 import { prop, sortBy } from 'remeda';
 
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { useSession } from '@documenso/lib/client-only/providers/session';
 import { ZRecipientAuthOptionsSchema } from '@documenso/lib/types/document-auth';
 import { nanoid } from '@documenso/lib/universal/id';
@@ -53,7 +54,6 @@ export type AddSignersFormProps = {
   fields: Field[];
   signingOrder?: DocumentSigningOrder | null;
   allowDictateNextSigner?: boolean;
-  isDocumentEnterprise: boolean;
   onSubmit: (_data: TAddSignersFormSchema) => void;
   isDocumentPdfLoaded: boolean;
 };
@@ -64,7 +64,6 @@ export const AddSignersFormPartial = ({
   fields,
   signingOrder,
   allowDictateNextSigner,
-  isDocumentEnterprise,
   onSubmit,
   isDocumentPdfLoaded,
 }: AddSignersFormProps) => {
@@ -78,6 +77,8 @@ export const AddSignersFormPartial = ({
 
   const { currentStep, totalSteps, previousStep } = useStep();
 
+  const organisation = useCurrentOrganisation();
+
   const defaultRecipients = [
     {
       formId: initialId,
@@ -633,36 +634,37 @@ export const AddSignersFormPartial = ({
                                 )}
                               />
 
-                              {showAdvancedSettings && isDocumentEnterprise && (
-                                <FormField
-                                  control={form.control}
-                                  name={`signers.${index}.actionAuth`}
-                                  render={({ field }) => (
-                                    <FormItem
-                                      className={cn('col-span-8', {
-                                        'mb-6':
-                                          form.formState.errors.signers?.[index] &&
-                                          !form.formState.errors.signers[index]?.actionAuth,
-                                        'col-span-10': isSigningOrderSequential,
-                                      })}
-                                    >
-                                      <FormControl>
-                                        <RecipientActionAuthSelect
-                                          {...field}
-                                          onValueChange={field.onChange}
-                                          disabled={
-                                            snapshot.isDragging ||
-                                            isSubmitting ||
-                                            !canRecipientBeModified(signer.nativeId)
-                                          }
-                                        />
-                                      </FormControl>
+                              {showAdvancedSettings &&
+                                organisation.organisationClaim.flags.cfr21 && (
+                                  <FormField
+                                    control={form.control}
+                                    name={`signers.${index}.actionAuth`}
+                                    render={({ field }) => (
+                                      <FormItem
+                                        className={cn('col-span-8', {
+                                          'mb-6':
+                                            form.formState.errors.signers?.[index] &&
+                                            !form.formState.errors.signers[index]?.actionAuth,
+                                          'col-span-10': isSigningOrderSequential,
+                                        })}
+                                      >
+                                        <FormControl>
+                                          <RecipientActionAuthSelect
+                                            {...field}
+                                            onValueChange={field.onChange}
+                                            disabled={
+                                              snapshot.isDragging ||
+                                              isSubmitting ||
+                                              !canRecipientBeModified(signer.nativeId)
+                                            }
+                                          />
+                                        </FormControl>
 
-                                      <FormMessage />
-                                    </FormItem>
-                                  )}
-                                />
-                              )}
+                                        <FormMessage />
+                                      </FormItem>
+                                    )}
+                                  />
+                                )}
 
                               <div className="col-span-2 flex gap-x-2">
                                 <FormField
@@ -760,7 +762,7 @@ export const AddSignersFormPartial = ({
               </Button>
             </div>
 
-            {!alwaysShowAdvancedSettings && isDocumentEnterprise && (
+            {!alwaysShowAdvancedSettings && organisation.organisationClaim.flags.cfr21 && (
               <div className="mt-4 flex flex-row items-center">
                 <Checkbox
                   id="showAdvancedRecipientSettings"
diff --git a/packages/ui/primitives/document-flow/field-item-advanced-settings.tsx b/packages/ui/primitives/document-flow/field-item-advanced-settings.tsx
index fdfd87c32..2b14059ed 100644
--- a/packages/ui/primitives/document-flow/field-item-advanced-settings.tsx
+++ b/packages/ui/primitives/document-flow/field-item-advanced-settings.tsx
@@ -41,7 +41,6 @@ import { RadioFieldAdvancedSettings } from './field-items-advanced-settings/radi
 import { TextFieldAdvancedSettings } from './field-items-advanced-settings/text-field';
 
 export type FieldAdvancedSettingsProps = {
-  teamId?: number;
   title: MessageDescriptor;
   description: MessageDescriptor;
   field: FieldFormType;
diff --git a/packages/ui/primitives/document-upload.tsx b/packages/ui/primitives/document-upload.tsx
index 57fb24a0a..975c593d4 100644
--- a/packages/ui/primitives/document-upload.tsx
+++ b/packages/ui/primitives/document-upload.tsx
@@ -6,8 +6,11 @@ import { Upload } from 'lucide-react';
 import { useDropzone } from 'react-dropzone';
 import { Link } from 'react-router';
 
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
+import { useSession } from '@documenso/lib/client-only/providers/session';
 import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT, IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { megabytesToBytes } from '@documenso/lib/universal/unit-convertions';
+import { isPersonalLayout } from '@documenso/lib/utils/organisations';
 
 import { Button } from './button';
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './tooltip';
@@ -15,6 +18,7 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './tool
 export type DocumentDropzoneProps = {
   className?: string;
   disabled?: boolean;
+  loading?: boolean;
   disabledMessage?: MessageDescriptor;
   onDrop?: (_file: File) => void | Promise<void>;
   onDropRejected?: () => void | Promise<void>;
@@ -24,6 +28,7 @@ export type DocumentDropzoneProps = {
 
 export const DocumentDropzone = ({
   className,
+  loading,
   onDrop,
   onDropRejected,
   disabled,
@@ -33,6 +38,12 @@ export const DocumentDropzone = ({
 }: DocumentDropzoneProps) => {
   const { _ } = useLingui();
 
+  const { organisations } = useSession();
+
+  const organisation = useCurrentOrganisation();
+
+  const isPersonalLayoutMode = isPersonalLayout(organisations);
+
   const { getRootProps, getInputProps } = useDropzone({
     accept: {
       'application/pdf': ['.pdf'],
@@ -63,7 +74,13 @@ export const DocumentDropzone = ({
         <Tooltip>
           <TooltipTrigger asChild>
             <Button className="hover:bg-warning/80 bg-warning" asChild>
-              <Link to="/settings/billing">
+              <Link
+                to={
+                  isPersonalLayoutMode
+                    ? `/settings/billing`
+                    : `/o/${organisation.url}/settings/billing`
+                }
+              >
                 <Trans>Upgrade</Trans>
               </Link>
             </Button>
@@ -77,10 +94,10 @@ export const DocumentDropzone = ({
   }
 
   return (
-    <Button aria-disabled={disabled} {...getRootProps()} {...props}>
+    <Button loading={loading} aria-disabled={disabled} {...getRootProps()} {...props}>
       <div className="flex items-center gap-2">
         <input {...getInputProps()} />
-        <Upload className="h-4 w-4" />
+        {!loading && <Upload className="h-4 w-4" />}
         {disabled ? _(disabledMessage) : _(heading[type])}
       </div>
     </Button>
diff --git a/packages/ui/primitives/multi-select-combobox.tsx b/packages/ui/primitives/multi-select-combobox.tsx
index 160f7f18e..64e109b28 100644
--- a/packages/ui/primitives/multi-select-combobox.tsx
+++ b/packages/ui/primitives/multi-select-combobox.tsx
@@ -26,6 +26,7 @@ type MultiSelectComboboxProps<T = OptionValue> = {
   enableClearAllButton?: boolean;
   enableSearch?: boolean;
   className?: string;
+  contentClassName?: string;
   loading?: boolean;
   inputPlaceholder?: MessageDescriptor;
   onChange: (_values: T[]) => void;
@@ -46,6 +47,7 @@ export function MultiSelectCombobox<T = OptionValue>({
   enableClearAllButton,
   enableSearch = true,
   className,
+  contentClassName,
   inputPlaceholder,
   loading,
   onChange,
@@ -149,7 +151,7 @@ export function MultiSelectCombobox<T = OptionValue>({
         )}
       </div>
 
-      <PopoverContent className="w-[200px] p-0">
+      <PopoverContent className={cn('z-[50000000] w-full p-0', contentClassName)}>
         <Command>
           {enableSearch && <CommandInput placeholder={inputPlaceholder && _(inputPlaceholder)} />}
           <CommandEmpty>
diff --git a/packages/ui/primitives/spinner.tsx b/packages/ui/primitives/spinner.tsx
new file mode 100644
index 000000000..8a817fd53
--- /dev/null
+++ b/packages/ui/primitives/spinner.tsx
@@ -0,0 +1,55 @@
+import * as React from 'react';
+
+import { cva } from 'class-variance-authority';
+import { Loader } from 'lucide-react';
+
+import { cn } from '../lib/utils';
+
+const spinnerVariants = cva('text-muted-foreground animate-spin', {
+  variants: {
+    size: {
+      default: 'h-6 w-6',
+      sm: 'h-4 w-4',
+      lg: 'h-8 w-8',
+    },
+  },
+  defaultVariants: {
+    size: 'default',
+  },
+});
+
+type SpinnerSize = 'default' | 'sm' | 'lg';
+
+export interface SpinnerProps extends Omit<React.ComponentPropsWithoutRef<typeof Loader>, 'size'> {
+  size?: SpinnerSize;
+}
+
+const Spinner = React.forwardRef<SVGSVGElement, SpinnerProps>(
+  ({ className, size = 'default', ...props }, ref) => {
+    return <Loader ref={ref} className={cn(spinnerVariants({ size }), className)} {...props} />;
+  },
+);
+
+Spinner.displayName = 'Spinner';
+
+export interface SpinnerBoxProps extends React.HTMLAttributes<HTMLDivElement> {
+  spinnerProps?: SpinnerProps;
+}
+
+const SpinnerBox = React.forwardRef<HTMLDivElement, SpinnerBoxProps>(
+  ({ className, spinnerProps, ...props }, ref) => {
+    return (
+      <div
+        ref={ref}
+        className={cn('flex items-center justify-center rounded-lg', className)}
+        {...props}
+      >
+        <Spinner {...spinnerProps} />
+      </div>
+    );
+  },
+);
+
+SpinnerBox.displayName = 'SpinnerBox';
+
+export { Spinner, SpinnerBox, spinnerVariants };
diff --git a/packages/ui/primitives/template-flow/add-template-fields.tsx b/packages/ui/primitives/template-flow/add-template-fields.tsx
index de8c017ea..7ef91da19 100644
--- a/packages/ui/primitives/template-flow/add-template-fields.tsx
+++ b/packages/ui/primitives/template-flow/add-template-fields.tsx
@@ -71,7 +71,7 @@ export type AddTemplateFieldsFormProps = {
   recipients: Recipient[];
   fields: Field[];
   onSubmit: (_data: TAddTemplateFieldsFormSchema) => void;
-  teamId?: number;
+  teamId: number;
 };
 
 export const AddTemplateFieldsFormPartial = ({
@@ -510,7 +510,6 @@ export const AddTemplateFieldsFormPartial = ({
           fields={localFields}
           onAdvancedSettings={handleAdvancedSettings}
           onSave={handleSavedFieldSettings}
-          teamId={teamId}
         />
       ) : (
         <>
diff --git a/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx b/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
index 0af7ae560..5016199e9 100644
--- a/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
+++ b/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
@@ -12,6 +12,7 @@ import { motion } from 'framer-motion';
 import { GripVerticalIcon, HelpCircle, Link2Icon, Plus, Trash } from 'lucide-react';
 import { useFieldArray, useForm } from 'react-hook-form';
 
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { useSession } from '@documenso/lib/client-only/providers/session';
 import { ZRecipientAuthOptionsSchema } from '@documenso/lib/types/document-auth';
 import { nanoid } from '@documenso/lib/universal/id';
@@ -52,14 +53,12 @@ export type AddTemplatePlaceholderRecipientsFormProps = {
   signingOrder?: DocumentSigningOrder | null;
   allowDictateNextSigner?: boolean;
   templateDirectLink?: TemplateDirectLink | null;
-  isEnterprise: boolean;
   onSubmit: (_data: TAddTemplatePlacholderRecipientsFormSchema) => void;
   isDocumentPdfLoaded: boolean;
 };
 
 export const AddTemplatePlaceholderRecipientsFormPartial = ({
   documentFlow,
-  isEnterprise,
   recipients,
   templateDirectLink,
   fields,
@@ -74,6 +73,8 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
   const { _ } = useLingui();
   const { user } = useSession();
 
+  const organisation = useCurrentOrganisation();
+
   const [placeholderRecipientCount, setPlaceholderRecipientCount] = useState(() =>
     recipients.length > 1 ? recipients.length + 1 : 2,
   );
@@ -649,29 +650,30 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
                                 )}
                               />
 
-                              {showAdvancedSettings && isEnterprise && (
-                                <FormField
-                                  control={form.control}
-                                  name={`signers.${index}.actionAuth`}
-                                  render={({ field }) => (
-                                    <FormItem
-                                      className={cn('col-span-8', {
-                                        'col-span-10': isSigningOrderSequential,
-                                      })}
-                                    >
-                                      <FormControl>
-                                        <RecipientActionAuthSelect
-                                          {...field}
-                                          onValueChange={field.onChange}
-                                          disabled={isSubmitting}
-                                        />
-                                      </FormControl>
+                              {showAdvancedSettings &&
+                                organisation.organisationClaim.flags.cfr21 && (
+                                  <FormField
+                                    control={form.control}
+                                    name={`signers.${index}.actionAuth`}
+                                    render={({ field }) => (
+                                      <FormItem
+                                        className={cn('col-span-8', {
+                                          'col-span-10': isSigningOrderSequential,
+                                        })}
+                                      >
+                                        <FormControl>
+                                          <RecipientActionAuthSelect
+                                            {...field}
+                                            onValueChange={field.onChange}
+                                            disabled={isSubmitting}
+                                          />
+                                        </FormControl>
 
-                                      <FormMessage />
-                                    </FormItem>
-                                  )}
-                                />
-                              )}
+                                        <FormMessage />
+                                      </FormItem>
+                                    )}
+                                  />
+                                )}
 
                               <div className="col-span-2 flex gap-x-2">
                                 <FormField
@@ -773,7 +775,7 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
               </Button>
             </div>
 
-            {!alwaysShowAdvancedSettings && isEnterprise && (
+            {!alwaysShowAdvancedSettings && organisation.organisationClaim.flags.cfr21 && (
               <div className="mt-4 flex flex-row items-center">
                 <Checkbox
                   id="showAdvancedRecipientSettings"
diff --git a/packages/ui/primitives/template-flow/add-template-settings.tsx b/packages/ui/primitives/template-flow/add-template-settings.tsx
index ebbc13498..16e40f3d6 100644
--- a/packages/ui/primitives/template-flow/add-template-settings.tsx
+++ b/packages/ui/primitives/template-flow/add-template-settings.tsx
@@ -9,6 +9,7 @@ import { InfoIcon } from 'lucide-react';
 import { useForm } from 'react-hook-form';
 import { match } from 'ts-pattern';
 
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { DATE_FORMATS, DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
 import {
   DOCUMENT_DISTRIBUTION_METHODS,
@@ -77,7 +78,6 @@ export type AddTemplateSettingsFormProps = {
   documentFlow: DocumentFlowStep;
   recipients: Recipient[];
   fields: Field[];
-  isEnterprise: boolean;
   isDocumentPdfLoaded: boolean;
   template: TTemplate;
   currentTeamMemberRole?: TeamMemberRole;
@@ -88,7 +88,6 @@ export const AddTemplateSettingsFormPartial = ({
   documentFlow,
   recipients,
   fields,
-  isEnterprise,
   isDocumentPdfLoaded,
   template,
   currentTeamMemberRole,
@@ -96,6 +95,8 @@ export const AddTemplateSettingsFormPartial = ({
 }: AddTemplateSettingsFormProps) => {
   const { t, i18n } = useLingui();
 
+  const organisation = useCurrentOrganisation();
+
   const { documentAuthOption } = extractDocumentAuthMethods({
     documentAuth: template.authOptions,
   });
@@ -370,7 +371,7 @@ export const AddTemplateSettingsFormPartial = ({
               )}
             />
 
-            {isEnterprise && (
+            {organisation.organisationClaim.flags.cfr21 && (
               <FormField
                 control={form.control}
                 name="globalActionAuth"