diff --git a/apps/remix/app/components/general/document/document-audit-log-download-button.tsx b/apps/remix/app/components/general/document/document-audit-log-download-button.tsx
index ee35389ed..a0e640294 100644
--- a/apps/remix/app/components/general/document/document-audit-log-download-button.tsx
+++ b/apps/remix/app/components/general/document/document-audit-log-download-button.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import { DownloadIcon } from 'lucide-react';
diff --git a/apps/remix/app/components/general/document/document-page-view-information.tsx b/apps/remix/app/components/general/document/document-page-view-information.tsx
index 5d98a89d0..491facb65 100644
--- a/apps/remix/app/components/general/document/document-page-view-information.tsx
+++ b/apps/remix/app/components/general/document/document-page-view-information.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { useMemo } from 'react';
 
 import { Trans, msg } from '@lingui/macro';
diff --git a/apps/remix/app/components/general/document/document-page-view-recent-activity.tsx b/apps/remix/app/components/general/document/document-page-view-recent-activity.tsx
index c6e0787bb..55cebf3c4 100644
--- a/apps/remix/app/components/general/document/document-page-view-recent-activity.tsx
+++ b/apps/remix/app/components/general/document/document-page-view-recent-activity.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { useMemo } from 'react';
 
 import { Trans, msg } from '@lingui/macro';
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 d40208dc9..69c7fc77c 100644
--- a/apps/remix/app/components/general/teams/team-email-dropdown.tsx
+++ b/apps/remix/app/components/general/teams/team-email-dropdown.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
 import { Edit, Loader, Mail, MoreHorizontal, X } from 'lucide-react';
diff --git a/apps/remix/package.json b/apps/remix/package.json
index b68c58181..fc4966430 100644
--- a/apps/remix/package.json
+++ b/apps/remix/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "build": "cross-env NODE_ENV=production react-router build",
+    "build": "cross-env NODE_ENV=production bunx --bun vite build",
     "dev": "bunx --bun vite",
     "dev:node": "react-router dev",
     "start": "cross-env NODE_ENV=production node dist/server/index.js",
@@ -12,6 +12,15 @@
     "copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs"
   },
   "dependencies": {
+    "@documenso/auth": "*",
+    "@documenso/api": "*",
+    "@documenso/assets": "*",
+    "@documenso/ee": "*",
+    "@documenso/lib": "*",
+    "@documenso/prisma": "*",
+    "@documenso/trpc": "*",
+    "@documenso/ui": "*",
+    "@documenso/tailwind-config": "*",
     "@epic-web/remember": "^1.1.0",
     "@hono/node-server": "^1.13.7",
     "@hono/trpc-server": "^0.3.4",
diff --git a/apps/remix/server/index.ts b/apps/remix/server/index.ts
index e2b9261af..4e55dda1c 100644
--- a/apps/remix/server/index.ts
+++ b/apps/remix/server/index.ts
@@ -1,4 +1,3 @@
-// server/index.ts
 import { Hono } from 'hono';
 import { PDFDocument } from 'pdf-lib';
 
diff --git a/apps/remix/tsconfig.json b/apps/remix/tsconfig.json
index 2e8eacc21..23642ab9f 100644
--- a/apps/remix/tsconfig.json
+++ b/apps/remix/tsconfig.json
@@ -10,17 +10,7 @@
     "rootDirs": [".", "./.react-router/types"],
     "baseUrl": ".",
     "paths": {
-      "~/*": ["./app/*"],
-      // Todo fix this stuff
-      "@documenso/api": ["../../packages/api"],
-      "@documenso/assets": ["../../packages/assets"],
-      "@documenso/auth": ["../../packages/auth"],
-      "@documenso/ee": ["../../packages/ee"],
-      "@documenso/lib": ["../../packages/lib"],
-      "@documenso/prisma": ["../../packages/prisma"],
-      "@documenso/trpc": ["../../packages/trpc"],
-      "@documenso/ui": ["../../packages/ui"],
-      "@documenso/tailwind-config": ["../../packages/tailwind-config"]
+      "~/*": ["./app/*"]
     },
     "esModuleInterop": true,
     "verbatimModuleSyntax": true,
diff --git a/apps/remix/vite.config.ts b/apps/remix/vite.config.ts
index cf26eddc6..8cb397c90 100644
--- a/apps/remix/vite.config.ts
+++ b/apps/remix/vite.config.ts
@@ -54,23 +54,14 @@ export default defineConfig({
   ],
   optimizeDeps: {
     exclude: ['superjson'],
-    force: true,
+    // force: true,
   },
   build: {
     commonjsOptions: {
       include: ['superjson'],
     },
+    rollupOptions: {
+      external: ['@node-rs/bcrypt'],
+    },
   },
-  // optimizeDeps: {
-  //   exclude: [
-  //     '@node-rs/bcrypt-wasm32-wasi',
-  //     '@noble/ciphers/chacha',
-  //     '@noble/ciphers/utils',
-  //     '@noble/ciphers/webcrypto/utils',
-  //     '@noble/hashes/sha256a',
-  //     'crypto',
-  //     '@node-rs/bcrypt',
-  //   ], // Todo: Probably remove.
-  //   force: true,
-  // },
 });
diff --git a/package-lock.json b/package-lock.json
index 5db6ec70b..5d8b0b683 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -108,6 +108,15 @@
     "apps/remix": {
       "name": "@documenso/remix",
       "dependencies": {
+        "@documenso/api": "*",
+        "@documenso/assets": "*",
+        "@documenso/auth": "*",
+        "@documenso/ee": "*",
+        "@documenso/lib": "*",
+        "@documenso/prisma": "*",
+        "@documenso/tailwind-config": "*",
+        "@documenso/trpc": "*",
+        "@documenso/ui": "*",
         "@epic-web/remember": "^1.1.0",
         "@hono/node-server": "^1.13.7",
         "@hono/trpc-server": "^0.3.4",
diff --git a/packages/email/providers/branding.tsx b/packages/email/providers/branding.tsx
index 84e022be1..9824ce28f 100644
--- a/packages/email/providers/branding.tsx
+++ b/packages/email/providers/branding.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { createContext, useContext } from 'react';
 
 type BrandingContextValue = {
diff --git a/packages/lib/client-only/hooks/use-document-element.ts b/packages/lib/client-only/hooks/use-document-element.ts
index bd4dc513e..6366a7eee 100644
--- a/packages/lib/client-only/hooks/use-document-element.ts
+++ b/packages/lib/client-only/hooks/use-document-element.ts
@@ -1,5 +1,3 @@
-'use client';
-
 import { useCallback } from 'react';
 
 import { getBoundingClientRect } from '@documenso/lib/client-only/get-bounding-client-rect';
diff --git a/packages/lib/client-only/providers/feature-flag.tsx b/packages/lib/client-only/providers/feature-flag.tsx
index e732bebbd..aeb222766 100644
--- a/packages/lib/client-only/providers/feature-flag.tsx
+++ b/packages/lib/client-only/providers/feature-flag.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { createContext, useCallback, useContext, useEffect, useState } from 'react';
 
 import {
@@ -9,7 +7,7 @@ import {
 } from '@documenso/lib/constants/feature-flags';
 import { getAllFlags } from '@documenso/lib/universal/get-feature-flag';
 
-import { TFeatureFlagValue } from './feature-flag.types';
+import type { TFeatureFlagValue } from './feature-flag.types';
 
 export type FeatureFlagContextValue = {
   getFlag: (_key: string) => TFeatureFlagValue;
diff --git a/packages/lib/client-only/providers/i18n.client.tsx b/packages/lib/client-only/providers/i18n.client.tsx
index b3c92bfc8..3e1b7f7d9 100644
--- a/packages/lib/client-only/providers/i18n.client.tsx
+++ b/packages/lib/client-only/providers/i18n.client.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { useState } from 'react';
 
 import { type Messages, setupI18n } from '@lingui/core';
diff --git a/packages/lib/server-only/document-data/create-document-data.ts b/packages/lib/server-only/document-data/create-document-data.ts
index 1cdbfda10..9cf2d7979 100644
--- a/packages/lib/server-only/document-data/create-document-data.ts
+++ b/packages/lib/server-only/document-data/create-document-data.ts
@@ -1,5 +1,3 @@
-'use server';
-
 import type { DocumentDataType } from '@prisma/client';
 
 import { prisma } from '@documenso/prisma';
diff --git a/packages/ui/components/animate/animate-generic-fade-in-out.tsx b/packages/ui/components/animate/animate-generic-fade-in-out.tsx
index 78487b953..b38491fab 100644
--- a/packages/ui/components/animate/animate-generic-fade-in-out.tsx
+++ b/packages/ui/components/animate/animate-generic-fade-in-out.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { motion } from 'framer-motion';
 
 type AnimateGenericFadeInOutProps = {
diff --git a/packages/ui/components/common/copy-text-button.tsx b/packages/ui/components/common/copy-text-button.tsx
index 608318690..d82b756cd 100644
--- a/packages/ui/components/common/copy-text-button.tsx
+++ b/packages/ui/components/common/copy-text-button.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { useState } from 'react';
 
 import { motion } from 'framer-motion';
diff --git a/packages/ui/components/document/document-global-auth-access-select.tsx b/packages/ui/components/document/document-global-auth-access-select.tsx
index 0c55730ca..37bf8a0bf 100644
--- a/packages/ui/components/document/document-global-auth-access-select.tsx
+++ b/packages/ui/components/document/document-global-auth-access-select.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React, { forwardRef } from 'react';
 
 import { Trans, msg } from '@lingui/macro';
diff --git a/packages/ui/components/document/document-global-auth-action-select.tsx b/packages/ui/components/document/document-global-auth-action-select.tsx
index 4458dd1d4..351f2bc60 100644
--- a/packages/ui/components/document/document-global-auth-action-select.tsx
+++ b/packages/ui/components/document/document-global-auth-action-select.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React, { forwardRef } from 'react';
 
 import { Trans, msg } from '@lingui/macro';
diff --git a/packages/ui/components/document/document-send-email-message-helper.tsx b/packages/ui/components/document/document-send-email-message-helper.tsx
index 532a6ea25..1259fe5d6 100644
--- a/packages/ui/components/document/document-send-email-message-helper.tsx
+++ b/packages/ui/components/document/document-send-email-message-helper.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React from 'react';
 
 import { Trans } from '@lingui/macro';
diff --git a/packages/ui/components/document/document-share-button.tsx b/packages/ui/components/document/document-share-button.tsx
index 9d6a27b03..9a44c01b2 100644
--- a/packages/ui/components/document/document-share-button.tsx
+++ b/packages/ui/components/document/document-share-button.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import type { HTMLAttributes } from 'react';
 import React, { useState } from 'react';
 
diff --git a/packages/ui/components/field/field.tsx b/packages/ui/components/field/field.tsx
index 35aa6d0b8..bf0607e4d 100644
--- a/packages/ui/components/field/field.tsx
+++ b/packages/ui/components/field/field.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React, { useEffect, useMemo, useState } from 'react';
 
 import type { Field } from '@prisma/client';
diff --git a/packages/ui/components/recipient/recipient-action-auth-select.tsx b/packages/ui/components/recipient/recipient-action-auth-select.tsx
index e21605ee8..5a6ce6b14 100644
--- a/packages/ui/components/recipient/recipient-action-auth-select.tsx
+++ b/packages/ui/components/recipient/recipient-action-auth-select.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React from 'react';
 
 import { Trans, msg } from '@lingui/macro';
diff --git a/packages/ui/components/recipient/recipient-role-select.tsx b/packages/ui/components/recipient/recipient-role-select.tsx
index 8e80bc77f..54ed79025 100644
--- a/packages/ui/components/recipient/recipient-role-select.tsx
+++ b/packages/ui/components/recipient/recipient-role-select.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React, { forwardRef } from 'react';
 
 import { Trans } from '@lingui/macro';
diff --git a/packages/ui/primitives/accordion.tsx b/packages/ui/primitives/accordion.tsx
index 6da6cfe1e..c4f5dadff 100644
--- a/packages/ui/primitives/accordion.tsx
+++ b/packages/ui/primitives/accordion.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as AccordionPrimitive from '@radix-ui/react-accordion';
diff --git a/packages/ui/primitives/alert-dialog.tsx b/packages/ui/primitives/alert-dialog.tsx
index 7a77e7e7a..55b8714fd 100644
--- a/packages/ui/primitives/alert-dialog.tsx
+++ b/packages/ui/primitives/alert-dialog.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog';
diff --git a/packages/ui/primitives/aspect-ratio.tsx b/packages/ui/primitives/aspect-ratio.tsx
index aaabffbc4..5dfdf1e67 100644
--- a/packages/ui/primitives/aspect-ratio.tsx
+++ b/packages/ui/primitives/aspect-ratio.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as AspectRatioPrimitive from '@radix-ui/react-aspect-ratio';
 
 const AspectRatio = AspectRatioPrimitive.Root;
diff --git a/packages/ui/primitives/auto-sized-text.tsx b/packages/ui/primitives/auto-sized-text.tsx
index a2b9e8cef..8b5e612a9 100644
--- a/packages/ui/primitives/auto-sized-text.tsx
+++ b/packages/ui/primitives/auto-sized-text.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { useLayoutEffect, useRef } from 'react';
 
 import { cn } from '../lib/utils';
diff --git a/packages/ui/primitives/avatar.tsx b/packages/ui/primitives/avatar.tsx
index f8a018a6b..8dc67767c 100644
--- a/packages/ui/primitives/avatar.tsx
+++ b/packages/ui/primitives/avatar.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as AvatarPrimitive from '@radix-ui/react-avatar';
diff --git a/packages/ui/primitives/calendar.tsx b/packages/ui/primitives/calendar.tsx
index 0c0110441..11ddad59c 100644
--- a/packages/ui/primitives/calendar.tsx
+++ b/packages/ui/primitives/calendar.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import { ChevronLeft, ChevronRight } from 'lucide-react';
diff --git a/packages/ui/primitives/card.tsx b/packages/ui/primitives/card.tsx
index 155597562..b83a09164 100644
--- a/packages/ui/primitives/card.tsx
+++ b/packages/ui/primitives/card.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import { motion, useMotionTemplate, useMotionValue } from 'framer-motion';
diff --git a/packages/ui/primitives/checkbox.tsx b/packages/ui/primitives/checkbox.tsx
index d76b8123b..33dee629a 100644
--- a/packages/ui/primitives/checkbox.tsx
+++ b/packages/ui/primitives/checkbox.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as CheckboxPrimitive from '@radix-ui/react-checkbox';
diff --git a/packages/ui/primitives/collapsible.tsx b/packages/ui/primitives/collapsible.tsx
index 86ab87d88..9605c4e41 100644
--- a/packages/ui/primitives/collapsible.tsx
+++ b/packages/ui/primitives/collapsible.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as CollapsiblePrimitive from '@radix-ui/react-collapsible';
 
 const Collapsible = CollapsiblePrimitive.Root;
diff --git a/packages/ui/primitives/command.tsx b/packages/ui/primitives/command.tsx
index 89084ac12..983ec474c 100644
--- a/packages/ui/primitives/command.tsx
+++ b/packages/ui/primitives/command.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import type { DialogProps } from '@radix-ui/react-dialog';
@@ -96,7 +94,7 @@ const CommandGroup = React.forwardRef<
   <CommandPrimitive.Group
     ref={ref}
     className={cn(
-      'text-foreground [&_[cmdk-group-heading]]:text-muted-foreground overflow-hidden border-b p-1 last:border-0 [&_[cmdk-group-heading]]:mt-2 [&_[cmdk-group-heading]]:px-0 [&_[cmdk-group-heading]]:py-2 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-normal [&_[cmdk-group-heading]]:opacity-50 ',
+      'text-foreground [&_[cmdk-group-heading]]:text-muted-foreground overflow-hidden border-b p-1 last:border-0 [&_[cmdk-group-heading]]:mt-2 [&_[cmdk-group-heading]]:px-0 [&_[cmdk-group-heading]]:py-2 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-normal [&_[cmdk-group-heading]]:opacity-50',
       className,
     )}
     {...props}
diff --git a/packages/ui/primitives/context-menu.tsx b/packages/ui/primitives/context-menu.tsx
index 25dd2a53a..900efef99 100644
--- a/packages/ui/primitives/context-menu.tsx
+++ b/packages/ui/primitives/context-menu.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as ContextMenuPrimitive from '@radix-ui/react-context-menu';
diff --git a/packages/ui/primitives/data-table.tsx b/packages/ui/primitives/data-table.tsx
index 242197319..753cd261e 100644
--- a/packages/ui/primitives/data-table.tsx
+++ b/packages/ui/primitives/data-table.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React, { useMemo } from 'react';
 
 import { Trans } from '@lingui/macro';
diff --git a/packages/ui/primitives/dialog.tsx b/packages/ui/primitives/dialog.tsx
index ce15515e1..70d3f4afd 100644
--- a/packages/ui/primitives/dialog.tsx
+++ b/packages/ui/primitives/dialog.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as DialogPrimitive from '@radix-ui/react-dialog';
diff --git a/packages/ui/primitives/document-flow/add-settings.tsx b/packages/ui/primitives/document-flow/add-settings.tsx
index 869833f15..5f0d1d5f4 100644
--- a/packages/ui/primitives/document-flow/add-settings.tsx
+++ b/packages/ui/primitives/document-flow/add-settings.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { useEffect } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
diff --git a/packages/ui/primitives/document-flow/add-subject.tsx b/packages/ui/primitives/document-flow/add-subject.tsx
index a11d23d94..3415d54a3 100644
--- a/packages/ui/primitives/document-flow/add-subject.tsx
+++ b/packages/ui/primitives/document-flow/add-subject.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Trans, msg } from '@lingui/macro';
 import { useLingui } from '@lingui/react';
diff --git a/packages/ui/primitives/document-flow/document-flow-root.tsx b/packages/ui/primitives/document-flow/document-flow-root.tsx
index 14ea52547..4783c3164 100644
--- a/packages/ui/primitives/document-flow/document-flow-root.tsx
+++ b/packages/ui/primitives/document-flow/document-flow-root.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import type { HTMLAttributes } from 'react';
 import React from 'react';
 
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 5b158f126..3d48d6c0b 100644
--- a/packages/ui/primitives/document-flow/field-item-advanced-settings.tsx
+++ b/packages/ui/primitives/document-flow/field-item-advanced-settings.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { forwardRef, useEffect, useState } from 'react';
 
 import type { MessageDescriptor } from '@lingui/core';
diff --git a/packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx b/packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
index d936adc3b..f6be3be56 100644
--- a/packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
+++ b/packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { useEffect, useState } from 'react';
 
 import { Trans, msg } from '@lingui/macro';
diff --git a/packages/ui/primitives/document-flow/field-items-advanced-settings/dropdown-field.tsx b/packages/ui/primitives/document-flow/field-items-advanced-settings/dropdown-field.tsx
index 10a84eb0e..547a3a2dd 100644
--- a/packages/ui/primitives/document-flow/field-items-advanced-settings/dropdown-field.tsx
+++ b/packages/ui/primitives/document-flow/field-items-advanced-settings/dropdown-field.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { useEffect, useState } from 'react';
 
 import { Trans, msg } from '@lingui/macro';
@@ -172,7 +170,7 @@ export const DropdownFieldAdvancedSettings = ({
               />
               <button
                 type="button"
-                className="col-span-1 mt-auto inline-flex h-10 w-10 items-center  text-slate-500 hover:opacity-80 disabled:cursor-not-allowed disabled:opacity-50"
+                className="col-span-1 mt-auto inline-flex h-10 w-10 items-center text-slate-500 hover:opacity-80 disabled:cursor-not-allowed disabled:opacity-50"
                 onClick={() => removeValue(index)}
               >
                 <Trash className="h-5 w-5" />
diff --git a/packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx b/packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx
index cf193c6e3..ab344235a 100644
--- a/packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx
+++ b/packages/ui/primitives/document-flow/field-items-advanced-settings/number-field.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { useState } from 'react';
 
 import { Trans, msg } from '@lingui/macro';
@@ -38,12 +36,12 @@ export const NumberFieldAdvancedSettings = ({
   const [showValidation, setShowValidation] = useState(false);
 
   const handleInput = (field: keyof NumberFieldMeta, value: string | boolean) => {
-    const userValue = field === 'value' ? value : fieldState.value ?? 0;
+    const userValue = field === 'value' ? value : (fieldState.value ?? 0);
     const userMinValue = field === 'minValue' ? Number(value) : Number(fieldState.minValue ?? 0);
     const userMaxValue = field === 'maxValue' ? Number(value) : Number(fieldState.maxValue ?? 0);
     const readOnly = field === 'readOnly' ? Boolean(value) : Boolean(fieldState.readOnly);
     const required = field === 'required' ? Boolean(value) : Boolean(fieldState.required);
-    const numberFormat = field === 'numberFormat' ? String(value) : fieldState.numberFormat ?? '';
+    const numberFormat = field === 'numberFormat' ? String(value) : (fieldState.numberFormat ?? '');
     const fontSize = field === 'fontSize' ? Number(value) : Number(fieldState.fontSize ?? 14);
 
     const valueErrors = validateNumberField(String(userValue), {
diff --git a/packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx b/packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
index 04529098a..0e115dd5e 100644
--- a/packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
+++ b/packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { useEffect, useState } from 'react';
 
 import { Trans } from '@lingui/macro';
diff --git a/packages/ui/primitives/document-flow/missing-signature-field-dialog.tsx b/packages/ui/primitives/document-flow/missing-signature-field-dialog.tsx
index db3209c1d..bc1b98911 100644
--- a/packages/ui/primitives/document-flow/missing-signature-field-dialog.tsx
+++ b/packages/ui/primitives/document-flow/missing-signature-field-dialog.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { Trans } from '@lingui/macro';
 import { DialogClose } from '@radix-ui/react-dialog';
 
diff --git a/packages/ui/primitives/dropdown-menu.tsx b/packages/ui/primitives/dropdown-menu.tsx
index 8756613a9..3465e5d03 100644
--- a/packages/ui/primitives/dropdown-menu.tsx
+++ b/packages/ui/primitives/dropdown-menu.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
diff --git a/packages/ui/primitives/element-visible.tsx b/packages/ui/primitives/element-visible.tsx
index f5f4fe1b8..032f3c115 100644
--- a/packages/ui/primitives/element-visible.tsx
+++ b/packages/ui/primitives/element-visible.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import React, { useEffect, useState } from 'react';
 
 export type ElementVisibleProps = {
diff --git a/packages/ui/primitives/hover-card.tsx b/packages/ui/primitives/hover-card.tsx
index f4334d92b..feac1830a 100644
--- a/packages/ui/primitives/hover-card.tsx
+++ b/packages/ui/primitives/hover-card.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as HoverCardPrimitive from '@radix-ui/react-hover-card';
diff --git a/packages/ui/primitives/label.tsx b/packages/ui/primitives/label.tsx
index 4b75deba9..4cc5ae465 100644
--- a/packages/ui/primitives/label.tsx
+++ b/packages/ui/primitives/label.tsx
@@ -1,9 +1,8 @@
-'use client';
-
 import * as React from 'react';
 
 import * as LabelPrimitive from '@radix-ui/react-label';
-import { VariantProps, cva } from 'class-variance-authority';
+import type { VariantProps } from 'class-variance-authority';
+import { cva } from 'class-variance-authority';
 
 import { cn } from '../lib/utils';
 
diff --git a/packages/ui/primitives/lazy-pdf-viewer.tsx b/packages/ui/primitives/lazy-pdf-viewer.tsx
index 17783072c..945a06f30 100644
--- a/packages/ui/primitives/lazy-pdf-viewer.tsx
+++ b/packages/ui/primitives/lazy-pdf-viewer.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import dynamic from 'next/dynamic';
 
 import { Trans } from '@lingui/macro';
diff --git a/packages/ui/primitives/menubar.tsx b/packages/ui/primitives/menubar.tsx
index 85ad37eec..874745b6b 100644
--- a/packages/ui/primitives/menubar.tsx
+++ b/packages/ui/primitives/menubar.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as MenubarPrimitive from '@radix-ui/react-menubar';
diff --git a/packages/ui/primitives/multi-select-combobox.tsx b/packages/ui/primitives/multi-select-combobox.tsx
index 01d2e44f1..67b566d3b 100644
--- a/packages/ui/primitives/multi-select-combobox.tsx
+++ b/packages/ui/primitives/multi-select-combobox.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import type { MessageDescriptor } from '@lingui/core';
diff --git a/packages/ui/primitives/pin-input.tsx b/packages/ui/primitives/pin-input.tsx
index 1d80dd3ad..01704accc 100644
--- a/packages/ui/primitives/pin-input.tsx
+++ b/packages/ui/primitives/pin-input.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import { OTPInput, OTPInputContext } from 'input-otp';
diff --git a/packages/ui/primitives/popover.tsx b/packages/ui/primitives/popover.tsx
index 62462322b..d6d7a8f81 100644
--- a/packages/ui/primitives/popover.tsx
+++ b/packages/ui/primitives/popover.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as PopoverPrimitive from '@radix-ui/react-popover';
diff --git a/packages/ui/primitives/progress.tsx b/packages/ui/primitives/progress.tsx
index 9d7f74e7c..29da089ab 100644
--- a/packages/ui/primitives/progress.tsx
+++ b/packages/ui/primitives/progress.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as ProgressPrimitive from '@radix-ui/react-progress';
diff --git a/packages/ui/primitives/radio-group.tsx b/packages/ui/primitives/radio-group.tsx
index 1daa806e1..931d3aa40 100644
--- a/packages/ui/primitives/radio-group.tsx
+++ b/packages/ui/primitives/radio-group.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as RadioGroupPrimitive from '@radix-ui/react-radio-group';
diff --git a/packages/ui/primitives/scroll-area.tsx b/packages/ui/primitives/scroll-area.tsx
index 30b02c83a..76726cef8 100644
--- a/packages/ui/primitives/scroll-area.tsx
+++ b/packages/ui/primitives/scroll-area.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';
diff --git a/packages/ui/primitives/select.tsx b/packages/ui/primitives/select.tsx
index fba05f7ef..61220d7ba 100644
--- a/packages/ui/primitives/select.tsx
+++ b/packages/ui/primitives/select.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as SelectPrimitive from '@radix-ui/react-select';
diff --git a/packages/ui/primitives/separator.tsx b/packages/ui/primitives/separator.tsx
index 546e82d42..d0cc7cfd6 100644
--- a/packages/ui/primitives/separator.tsx
+++ b/packages/ui/primitives/separator.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as SeparatorPrimitive from '@radix-ui/react-separator';
diff --git a/packages/ui/primitives/sheet.tsx b/packages/ui/primitives/sheet.tsx
index ef5348e59..257a9a60f 100644
--- a/packages/ui/primitives/sheet.tsx
+++ b/packages/ui/primitives/sheet.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as SheetPrimitive from '@radix-ui/react-dialog';
diff --git a/packages/ui/primitives/signature-pad/signature-pad.tsx b/packages/ui/primitives/signature-pad/signature-pad.tsx
index 5c94a6a7d..b00841bda 100644
--- a/packages/ui/primitives/signature-pad/signature-pad.tsx
+++ b/packages/ui/primitives/signature-pad/signature-pad.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import type { HTMLAttributes, MouseEvent, PointerEvent, TouchEvent } from 'react';
 import { useEffect, useMemo, useRef, useState } from 'react';
 
diff --git a/packages/ui/primitives/slider.tsx b/packages/ui/primitives/slider.tsx
index eb0016bd7..e17c33b91 100644
--- a/packages/ui/primitives/slider.tsx
+++ b/packages/ui/primitives/slider.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as SliderPrimitive from '@radix-ui/react-slider';
diff --git a/packages/ui/primitives/tabs.tsx b/packages/ui/primitives/tabs.tsx
index ec2f395b9..03dd53c23 100644
--- a/packages/ui/primitives/tabs.tsx
+++ b/packages/ui/primitives/tabs.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as TabsPrimitive from '@radix-ui/react-tabs';
diff --git a/packages/ui/primitives/template-flow/add-template-settings.tsx b/packages/ui/primitives/template-flow/add-template-settings.tsx
index 312019d19..3b28da357 100644
--- a/packages/ui/primitives/template-flow/add-template-settings.tsx
+++ b/packages/ui/primitives/template-flow/add-template-settings.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { useEffect } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
diff --git a/packages/ui/primitives/toaster.tsx b/packages/ui/primitives/toaster.tsx
index d05a83a40..b4d809ace 100644
--- a/packages/ui/primitives/toaster.tsx
+++ b/packages/ui/primitives/toaster.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import {
   Toast,
   ToastClose,
diff --git a/packages/ui/primitives/toggle.tsx b/packages/ui/primitives/toggle.tsx
index 543d96a79..580090e09 100644
--- a/packages/ui/primitives/toggle.tsx
+++ b/packages/ui/primitives/toggle.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as TogglePrimitive from '@radix-ui/react-toggle';
diff --git a/packages/ui/primitives/tooltip.tsx b/packages/ui/primitives/tooltip.tsx
index e44fc537e..5daa4dbaa 100644
--- a/packages/ui/primitives/tooltip.tsx
+++ b/packages/ui/primitives/tooltip.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import * as React from 'react';
 
 import * as TooltipPrimitive from '@radix-ui/react-tooltip';