fix: reconnect functionality in google sheet integration

2026-02-18 10:09:49 -06:00 · 2026-02-18 12:32:27 +05:30
40 changed files with 434 additions and 404 deletions
--- a/apps/web/app/(app)/environments/[environmentId]/workspace/integrations/google-sheets/actions.ts
+++ b/apps/web/app/(app)/environments/[environmentId]/workspace/integrations/google-sheets/actions.ts
@@ -1,12 +1,49 @@
 "use server";

 import { z } from "zod";
-import { ZIntegrationGoogleSheets } from "@formbricks/types/integration/google-sheet";
-import { getSpreadsheetNameById } from "@/lib/googleSheet/service";
+import { ZId } from "@formbricks/types/common";
+import {
+  TIntegrationGoogleSheets,
+  ZIntegrationGoogleSheets,
+} from "@formbricks/types/integration/google-sheet";
+import { getSpreadsheetNameById, validateGoogleSheetsConnection } from "@/lib/googleSheet/service";
+import { getIntegrationByType } from "@/lib/integration/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
 import { getOrganizationIdFromEnvironmentId, getProjectIdFromEnvironmentId } from "@/lib/utils/helper";

+const ZValidateGoogleSheetsConnectionAction = z.object({
+  environmentId: ZId,
+});
+
+export const validateGoogleSheetsConnectionAction = authenticatedActionClient
+  .schema(ZValidateGoogleSheetsConnectionAction)
+  .action(async ({ ctx, parsedInput }) => {
+    await checkAuthorizationUpdated({
+      userId: ctx.user.id,
+      organizationId: await getOrganizationIdFromEnvironmentId(parsedInput.environmentId),
+      access: [
+        {
+          type: "organization",
+          roles: ["owner", "manager"],
+        },
+        {
+          type: "projectTeam",
+          projectId: await getProjectIdFromEnvironmentId(parsedInput.environmentId),
+          minPermission: "readWrite",
+        },
+      ],
+    });
+
+    const integration = await getIntegrationByType(parsedInput.environmentId, "googleSheets");
+    if (!integration) {
+      return { data: false };
+    }
+
+    await validateGoogleSheetsConnection(integration as TIntegrationGoogleSheets);
+    return { data: true };
+  });
+
 const ZGetSpreadsheetNameByIdAction = z.object({
  googleSheetIntegration: ZIntegrationGoogleSheets,
  environmentId: z.string(),
--- a/apps/web/app/(app)/environments/[environmentId]/workspace/integrations/google-sheets/components/AddIntegrationModal.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/workspace/integrations/google-sheets/components/AddIntegrationModal.tsx
@@ -118,6 +118,17 @@ export const AddIntegrationModal = ({
    resetForm();
  }, [selectedIntegration, surveys]);

+  const showErrorMessageToast = (response: Awaited<ReturnType<typeof getSpreadsheetNameByIdAction>>) => {
+    const errorMessage = getFormattedErrorMessage(response);
+    if (errorMessage === "invalid_grant") {
+      toast.error(t("environments.integrations.google_sheets.token_expired_error"));
+    } else if (errorMessage === "insufficient_permission") {
+      toast.error(t("environments.integrations.google_sheets.spreadsheet_permission_error"));
+    } else {
+      toast.error(errorMessage);
+    }
+  };
+
  const linkSheet = async () => {
    try {
      if (!isValidGoogleSheetsUrl(spreadsheetUrl)) {
@@ -129,6 +140,7 @@ export const AddIntegrationModal = ({
      if (selectedElements.length === 0) {
        throw new Error(t("environments.integrations.select_at_least_one_question_error"));
      }
+      setIsLinkingSheet(true);
      const spreadsheetId = extractSpreadsheetIdFromUrl(spreadsheetUrl);
      const spreadsheetNameResponse = await getSpreadsheetNameByIdAction({
        googleSheetIntegration,
@@ -137,13 +149,11 @@ export const AddIntegrationModal = ({
      });

      if (!spreadsheetNameResponse?.data) {
-        const errorMessage = getFormattedErrorMessage(spreadsheetNameResponse);
-        throw new Error(errorMessage);
+        showErrorMessageToast(spreadsheetNameResponse);
+        return;
      }

      const spreadsheetName = spreadsheetNameResponse.data;
-
-      setIsLinkingSheet(true);
      integrationData.spreadsheetId = spreadsheetId;
      integrationData.spreadsheetName = spreadsheetName;
      integrationData.surveyId = selectedSurvey.id;
@@ -280,7 +290,7 @@ export const AddIntegrationModal = ({
                <div className="space-y-4">
                  <div>
                    <Label htmlFor="Surveys">{t("common.questions")}</Label>
-                    <div className="mt-1 max-h-[15vh] overflow-x-hidden overflow-y-auto rounded-lg border border-slate-200">
+                    <div className="mt-1 max-h-[15vh] overflow-y-auto overflow-x-hidden rounded-lg border border-slate-200">
                      <div className="grid content-center rounded-lg bg-slate-50 p-3 text-left text-sm text-slate-900">
                        {surveyElements.map((question) => (
                          <div key={question.id} className="my-1 flex items-center space-x-2">
--- a/apps/web/app/(app)/environments/[environmentId]/workspace/integrations/google-sheets/components/GoogleSheetWrapper.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/workspace/integrations/google-sheets/components/GoogleSheetWrapper.tsx
@@ -1,6 +1,6 @@
 "use client";

-import { useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { TEnvironment } from "@formbricks/types/environment";
 import {
  TIntegrationGoogleSheets,
@@ -8,6 +8,7 @@ import {
 } from "@formbricks/types/integration/google-sheet";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { TUserLocale } from "@formbricks/types/user";
+import { validateGoogleSheetsConnectionAction } from "@/app/(app)/environments/[environmentId]/workspace/integrations/google-sheets/actions";
 import { ManageIntegration } from "@/app/(app)/environments/[environmentId]/workspace/integrations/google-sheets/components/ManageIntegration";
 import { authorize } from "@/app/(app)/environments/[environmentId]/workspace/integrations/google-sheets/lib/google";
 import googleSheetLogo from "@/images/googleSheetsLogo.png";
@@ -35,10 +36,23 @@ export const GoogleSheetWrapper = ({
    googleSheetIntegration ? googleSheetIntegration.config?.key : false
  );
  const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
+  const [showReconnectButton, setShowReconnectButton] = useState<boolean>(false);
  const [selectedIntegration, setSelectedIntegration] = useState<
    (TIntegrationGoogleSheetsConfigData & { index: number }) | null
  >(null);

+  const validateConnection = useCallback(async () => {
+    if (!isConnected || !googleSheetIntegration) return;
+    const response = await validateGoogleSheetsConnectionAction({ environmentId: environment.id });
+    if (response?.serverError === "invalid_grant") {
+      setShowReconnectButton(true);
+    }
+  }, [environment.id, isConnected, googleSheetIntegration]);
+
+  useEffect(() => {
+    validateConnection();
+  }, [validateConnection]);
+
  const handleGoogleAuthorization = async () => {
    authorize(environment.id, webAppUrl).then((url: string) => {
      if (url) {
@@ -64,6 +78,8 @@ export const GoogleSheetWrapper = ({
            setOpenAddIntegrationModal={setIsModalOpen}
            setIsConnected={setIsConnected}
            setSelectedIntegration={setSelectedIntegration}
+            showReconnectButton={showReconnectButton}
+            handleGoogleAuthorization={handleGoogleAuthorization}
            locale={locale}
          />
        </>
--- a/apps/web/app/(app)/environments/[environmentId]/workspace/integrations/google-sheets/components/ManageIntegration.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/workspace/integrations/google-sheets/components/ManageIntegration.tsx
@@ -1,6 +1,6 @@
 "use client";

-import { Trash2Icon } from "lucide-react";
+import { RefreshCcwIcon, Trash2Icon } from "lucide-react";
 import { useState } from "react";
 import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
@@ -12,15 +12,19 @@ import { TUserLocale } from "@formbricks/types/user";
 import { deleteIntegrationAction } from "@/app/(app)/environments/[environmentId]/workspace/integrations/actions";
 import { timeSince } from "@/lib/time";
 import { getFormattedErrorMessage } from "@/lib/utils/helper";
+import { Alert, AlertButton, AlertDescription } from "@/modules/ui/components/alert";
 import { Button } from "@/modules/ui/components/button";
 import { DeleteDialog } from "@/modules/ui/components/delete-dialog";
 import { EmptyState } from "@/modules/ui/components/empty-state";
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/modules/ui/components/tooltip";

 interface ManageIntegrationProps {
  googleSheetIntegration: TIntegrationGoogleSheets;
  setOpenAddIntegrationModal: (v: boolean) => void;
  setIsConnected: (v: boolean) => void;
  setSelectedIntegration: (v: (TIntegrationGoogleSheetsConfigData & { index: number }) | null) => void;
+  showReconnectButton: boolean;
+  handleGoogleAuthorization: () => void;
  locale: TUserLocale;
 }

@@ -29,6 +33,8 @@ export const ManageIntegration = ({
  setOpenAddIntegrationModal,
  setIsConnected,
  setSelectedIntegration,
+  showReconnectButton,
+  handleGoogleAuthorization,
  locale,
 }: ManageIntegrationProps) => {
  const { t } = useTranslation();
@@ -68,7 +74,17 @@ export const ManageIntegration = ({

  return (
    <div className="mt-6 flex w-full flex-col items-center justify-center p-6">
-      <div className="flex w-full justify-end">
+      {showReconnectButton && (
+        <Alert variant="warning" size="small" className="mb-4 w-full">
+          <AlertDescription>
+            {t("environments.integrations.google_sheets.reconnect_button_description")}
+          </AlertDescription>
+          <AlertButton onClick={handleGoogleAuthorization}>
+            {t("environments.integrations.google_sheets.reconnect_button")}
+          </AlertButton>
+        </Alert>
+      )}
+      <div className="flex w-full justify-end space-x-2">
        <div className="mr-6 flex items-center">
          <span className="mr-4 h-4 w-4 rounded-full bg-green-600"></span>
          <span className="text-slate-500">
@@ -77,6 +93,19 @@ export const ManageIntegration = ({
            })}
          </span>
        </div>
+        <TooltipProvider>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <Button variant="outline" onClick={handleGoogleAuthorization}>
+                <RefreshCcwIcon className="mr-2 h-4 w-4" />
+                {t("environments.integrations.google_sheets.reconnect_button")}
+              </Button>
+            </TooltipTrigger>
+            <TooltipContent>
+              {t("environments.integrations.google_sheets.reconnect_button_tooltip")}
+            </TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
        <Button
          onClick={() => {
            setSelectedIntegration(null);
--- a/apps/web/app/api/google-sheet/callback/route.ts
+++ b/apps/web/app/api/google-sheet/callback/route.ts
@@ -1,5 +1,6 @@
 import { google } from "googleapis";
 import { getServerSession } from "next-auth";
+import { TIntegrationGoogleSheetsConfig } from "@formbricks/types/integration/google-sheet";
 import { responses } from "@/app/lib/api/response";
 import {
  GOOGLE_SHEETS_CLIENT_ID,
@@ -8,7 +9,7 @@ import {
  WEBAPP_URL,
 } from "@/lib/constants";
 import { hasUserEnvironmentAccess } from "@/lib/environment/auth";
-import { createOrUpdateIntegration } from "@/lib/integration/service";
+import { createOrUpdateIntegration, getIntegrationByType } from "@/lib/integration/service";
 import { authOptions } from "@/modules/auth/lib/authOptions";

 export const GET = async (req: Request) => {
@@ -42,33 +43,39 @@ export const GET = async (req: Request) => {
  if (!redirect_uri) return responses.internalServerErrorResponse("Google redirect url is missing");
  const oAuth2Client = new google.auth.OAuth2(client_id, client_secret, redirect_uri);

-  let key;
-  let userEmail;
+  if (!code) {
+    return Response.redirect(
+      `${WEBAPP_URL}/environments/${environmentId}/workspace/integrations/google-sheets`
+    );
+  }

-  if (code) {
-    const token = await oAuth2Client.getToken(code);
-    key = token.res?.data;
+  const token = await oAuth2Client.getToken(code);
+  const key = token.res?.data;
+  if (!key) {
+    return Response.redirect(
+      `${WEBAPP_URL}/environments/${environmentId}/workspace/integrations/google-sheets`
+    );
+  }

-    // Set credentials using the provided token
-    oAuth2Client.setCredentials({
-      access_token: key.access_token,
-    });
+  oAuth2Client.setCredentials({ access_token: key.access_token });
+  const oauth2 = google.oauth2({ auth: oAuth2Client, version: "v2" });
+  const userInfo = await oauth2.userinfo.get();
+  const userEmail = userInfo.data.email;

-    // Fetch user's email
-    const oauth2 = google.oauth2({
-      auth: oAuth2Client,
-      version: "v2",
-    });
-    const userInfo = await oauth2.userinfo.get();
-    userEmail = userInfo.data.email;
+  const integrationType = "googleSheets" as const;
+  const existingIntegration = await getIntegrationByType(environmentId, integrationType);
+  const existingConfig = existingIntegration?.config as TIntegrationGoogleSheetsConfig;
+
+  if (!userEmail) {
+    return responses.internalServerErrorResponse("Failed to get user email");
  }

  const googleSheetIntegration = {
-    type: "googleSheets" as "googleSheets",
+    type: integrationType,
    environment: environmentId,
    config: {
      key,
-      data: [],
+      data: existingConfig?.data ?? [],
      email: userEmail,
    },
  };
--- a/apps/web/i18n.lock
+++ b/apps/web/i18n.lock
@@ -711,7 +711,12 @@ checksums:
    environments/integrations/google_sheets/link_google_sheet: fa78146ae26ce5b1d2aaf2678f628943
    environments/integrations/google_sheets/link_new_sheet: 8ad2ea8708f50ed184c00b84577b325e
    environments/integrations/google_sheets/no_integrations_yet: ea46f7747937baf48a47a4c1b1776aee
+    environments/integrations/google_sheets/reconnect_button: 8992a0f250278c116cb26be448b68ba2
+    environments/integrations/google_sheets/reconnect_button_description: 851fd2fda57211293090f371d5b2c734
+    environments/integrations/google_sheets/reconnect_button_tooltip: 210dd97470fde8264d2c076db3c98fde
+    environments/integrations/google_sheets/spreadsheet_permission_error: 94f0007a187d3b9a7ab8200fe26aad20
    environments/integrations/google_sheets/spreadsheet_url: b1665f96e6ecce23ea2d9196f4a3e5dd
+    environments/integrations/google_sheets/token_expired_error: 555d34c18c554ec8ac66614f21bd44fc
    environments/integrations/include_created_at: 8011355b13e28e638d74e6f3d68a2bbf
    environments/integrations/include_hidden_fields: 25f0ea5ca1c6ead2cd121f8754cb8d72
    environments/integrations/include_metadata: 750091d965d7cc8d02468b5239816dc5
@@ -2036,12 +2041,12 @@ checksums:
    environments/workspace/look/advanced_styling_field_headline_size_description: 13debc3855e4edae992c7a1ebff599c3
    environments/workspace/look/advanced_styling_field_headline_weight: 0c8b8262945c61f8e2978502362e0a42
    environments/workspace/look/advanced_styling_field_headline_weight_description: 1a9c40bd76ff5098b1e48b1d3893171b
-    environments/workspace/look/advanced_styling_field_height: 40ca2224bb2936ad1329091b35a9ffe2
+    environments/workspace/look/advanced_styling_field_height: f4da6d7ecd26e3fa75cfea03abb60c00
    environments/workspace/look/advanced_styling_field_indicator_bg: 00febda2901af0f1b0c17e44f9917c38
    environments/workspace/look/advanced_styling_field_indicator_bg_description: 7eb3b54a8b331354ec95c0dc1545c620
    environments/workspace/look/advanced_styling_field_input_border_radius_description: 0007f1bb572b35d9a3720daeb7a55617
    environments/workspace/look/advanced_styling_field_input_font_size_description: 5311f95dcbd083623e35c98ea5374c3b
-    environments/workspace/look/advanced_styling_field_input_height_description: e19ec0dc432478def0fd1199ad765e38
+    environments/workspace/look/advanced_styling_field_input_height_description: b704fc67e805223992c811d6f86a9c00
    environments/workspace/look/advanced_styling_field_input_padding_x_description: 10e14296468321c13fda77fd1ba58dfd
    environments/workspace/look/advanced_styling_field_input_padding_y_description: 98b4aeff2940516d05ea61bdc1211d0d
    environments/workspace/look/advanced_styling_field_input_placeholder_opacity_description: f55a6700884d24014404e58876121ddf
@@ -2104,7 +2109,6 @@ checksums:
    environments/workspace/look/show_powered_by_formbricks: a0e96edadec8ef326423feccc9d06be7
    environments/workspace/look/styling_updated_successfully: b8b74b50dde95abcd498633e9d0c891f
    environments/workspace/look/suggest_colors: ddc4543b416ab774007b10a3434343cd
-    environments/workspace/look/suggested_colors_applied_please_save: 226fa70af5efc8ffa0a3755909c8163e
    environments/workspace/look/theme: 21fe00b7a518089576fb83c08631107a
    environments/workspace/look/theme_settings_description: 9fc45322818c3774ab4a44ea14d7836e
    environments/workspace/tags/add: 87c4a663507f2bcbbf79934af8164e13
--- a/apps/web/lib/googleSheet/service.ts
+++ b/apps/web/lib/googleSheet/service.ts
@@ -2,7 +2,12 @@ import "server-only";
 import { Prisma } from "@prisma/client";
 import { z } from "zod";
 import { ZString } from "@formbricks/types/common";
-import { DatabaseError, UnknownError } from "@formbricks/types/errors";
+import {
+  AuthenticationError,
+  DatabaseError,
+  OperationNotAllowedError,
+  UnknownError,
+} from "@formbricks/types/errors";
 import {
  TIntegrationGoogleSheets,
  ZIntegrationGoogleSheets,
@@ -11,8 +16,8 @@ import {
  GOOGLE_SHEETS_CLIENT_ID,
  GOOGLE_SHEETS_CLIENT_SECRET,
  GOOGLE_SHEETS_REDIRECT_URL,
+  GOOGLE_SHEET_MESSAGE_LIMIT,
 } from "@/lib/constants";
-import { GOOGLE_SHEET_MESSAGE_LIMIT } from "@/lib/constants";
 import { createOrUpdateIntegration } from "@/lib/integration/service";
 import { truncateText } from "../utils/strings";
 import { validateInputs } from "../utils/validate";
@@ -81,6 +86,17 @@ export const writeData = async (
  }
 };

+export const validateGoogleSheetsConnection = async (
+  googleSheetIntegrationData: TIntegrationGoogleSheets
+): Promise<void> => {
+  validateInputs([googleSheetIntegrationData, ZIntegrationGoogleSheets]);
+  const integrationData = structuredClone(googleSheetIntegrationData);
+  integrationData.config.data.forEach((data) => {
+    data.createdAt = new Date(data.createdAt);
+  });
+  await authorize(integrationData);
+};
+
 export const getSpreadsheetNameById = async (
  googleSheetIntegrationData: TIntegrationGoogleSheets,
  spreadsheetId: string
@@ -94,7 +110,17 @@ export const getSpreadsheetNameById = async (
    return new Promise((resolve, reject) => {
      sheets.spreadsheets.get({ spreadsheetId }, (err, response) => {
        if (err) {
-          reject(new UnknownError(`Error while fetching spreadsheet data: ${err.message}`));
+          const msg = err.message?.toLowerCase() ?? "";
+          const isPermissionError =
+            msg.includes("permission") ||
+            msg.includes("caller does not have") ||
+            msg.includes("insufficient permission") ||
+            msg.includes("access denied");
+          if (isPermissionError) {
+            reject(new OperationNotAllowedError("insufficient_permission"));
+          } else {
+            reject(new UnknownError(`Error while fetching spreadsheet data: ${err.message}`));
+          }
          return;
        }
        const spreadsheetTitle = response.data.properties.title;
@@ -109,6 +135,11 @@ export const getSpreadsheetNameById = async (
  }
 };

+const isInvalidGrantError = (error: unknown): boolean => {
+  const err = error as { message?: string; response?: { data?: { error?: string } } };
+  return typeof err?.message === "string" && err.message.toLowerCase().includes("invalid_grant");
+};
+
 const authorize = async (googleSheetIntegrationData: TIntegrationGoogleSheets) => {
  const client_id = GOOGLE_SHEETS_CLIENT_ID;
  const client_secret = GOOGLE_SHEETS_CLIENT_SECRET;
@@ -118,17 +149,29 @@ const authorize = async (googleSheetIntegrationData: TIntegrationGoogleSheets) =
  oAuth2Client.setCredentials({
    refresh_token,
  });
-  const { credentials } = await oAuth2Client.refreshAccessToken();
-  await createOrUpdateIntegration(googleSheetIntegrationData.environmentId, {
-    type: "googleSheets",
-    config: {
-      data: googleSheetIntegrationData.config?.data ?? [],
-      email: googleSheetIntegrationData.config?.email ?? "",
-      key: credentials,
-    },
-  });

-  oAuth2Client.setCredentials(credentials);
+  try {
+    const { credentials } = await oAuth2Client.refreshAccessToken();
+    const mergedCredentials = {
+      ...credentials,
+      refresh_token: credentials.refresh_token ?? refresh_token,
+    };
+    await createOrUpdateIntegration(googleSheetIntegrationData.environmentId, {
+      type: "googleSheets",
+      config: {
+        data: googleSheetIntegrationData.config?.data ?? [],
+        email: googleSheetIntegrationData.config?.email ?? "",
+        key: mergedCredentials,
+      },
+    });

-  return oAuth2Client;
+    oAuth2Client.setCredentials(mergedCredentials);
+
+    return oAuth2Client;
+  } catch (error) {
+    if (isInvalidGrantError(error)) {
+      throw new AuthenticationError("invalid_grant");
+    }
+    throw error;
+  }
 };
--- a/apps/web/lib/styling/constants.ts
+++ b/apps/web/lib/styling/constants.ts
@@ -118,10 +118,10 @@ export const STYLE_DEFAULTS: TProjectStyling = {
  // Inputs
  inputTextColor: { light: _colors["inputTextColor.light"] },
  inputBorderRadius: 8,
-  inputHeight: 20,
+  inputHeight: 40,
  inputFontSize: 14,
-  inputPaddingX: 8,
-  inputPaddingY: 8,
+  inputPaddingX: 16,
+  inputPaddingY: 16,
  inputPlaceholderOpacity: 0.5,
  inputShadow: "0 1px 2px 0 rgb(0 0 0 / 0.05)",

@@ -149,42 +149,6 @@ export const STYLE_DEFAULTS: TProjectStyling = {
  progressIndicatorBgColor: { light: _colors["progressIndicatorBgColor.light"] },
 };

-/**
- * Fills in new v4.7 color fields from legacy v4.6 fields when they are missing.
- *
- * v4.6 stored: brandColor, questionColor, inputColor, inputBorderColor.
- * v4.7 adds: elementHeadlineColor, buttonBgColor, optionBgColor, etc.
- *
- * When loading v4.6 data the new fields are absent. Without this helper the
- * form would fall back to STYLE_DEFAULTS (derived from the *default* brand
- * colour), causing a visible mismatch.  This function derives the new fields
- * from the actually-saved legacy fields so the preview and form stay coherent.
- *
- * Only sets a field when the legacy source exists AND the new field is absent.
- */
-export const deriveNewFieldsFromLegacy = (saved: Record<string, unknown>): Record<string, unknown> => {
-  const light = (key: string): string | undefined =>
-    (saved[key] as { light?: string } | null | undefined)?.light;
-
-  const q = light("questionColor");
-  const b = light("brandColor");
-  const i = light("inputColor");
-
-  return {
-    ...(q && !saved.elementHeadlineColor && { elementHeadlineColor: { light: q } }),
-    ...(q && !saved.elementDescriptionColor && { elementDescriptionColor: { light: q } }),
-    ...(q && !saved.elementUpperLabelColor && { elementUpperLabelColor: { light: q } }),
-    ...(q && !saved.inputTextColor && { inputTextColor: { light: q } }),
-    ...(q && !saved.optionLabelColor && { optionLabelColor: { light: q } }),
-    ...(b && !saved.buttonBgColor && { buttonBgColor: { light: b } }),
-    ...(b && !saved.buttonTextColor && { buttonTextColor: { light: isLight(b) ? "#0f172a" : "#ffffff" } }),
-    ...(i && !saved.optionBgColor && { optionBgColor: { light: i } }),
-    ...(b && !saved.progressIndicatorBgColor && { progressIndicatorBgColor: { light: b } }),
-    ...(b &&
-      !saved.progressTrackBgColor && { progressTrackBgColor: { light: mixColor(b, "#ffffff", 0.8) } }),
-  };
-};
-
 /**
 * Builds a complete TProjectStyling object from a single brand color.
 *
--- a/apps/web/lib/utils/validate.ts
+++ b/apps/web/lib/utils/validate.ts
@@ -12,18 +12,11 @@ export function validateInputs<T extends ValidationPair<any>[]>(
  for (const [value, schema] of pairs) {
    const inputValidation = schema.safeParse(value);
    if (!inputValidation.success) {
-      const zodDetails = inputValidation.error.issues
-        .map((issue) => {
-          const path = issue?.path?.join(".") ?? "";
-          return `${path}${issue.message}`;
-        })
-        .join("; ");
-
      logger.error(
        inputValidation.error,
        `Validation failed for ${JSON.stringify(value).substring(0, 100)} and ${JSON.stringify(schema)}`
      );
-      throw new ValidationError(`Validation failed: ${zodDetails}`);
+      throw new ValidationError("Validation failed");
    }
    parsedData.push(inputValidation.data);
  }
--- a/apps/web/locales/de-DE.json
+++ b/apps/web/locales/de-DE.json
@@ -752,7 +752,12 @@
        "link_google_sheet": "Tabelle verlinken",
        "link_new_sheet": "Neues Blatt verknüpfen",
        "no_integrations_yet": "Deine verknüpften Tabellen werden hier angezeigt, sobald Du sie hinzufügst ⏲️",
-        "spreadsheet_url": "Tabellen-URL"
+        "reconnect_button": "Erneut verbinden",
+        "reconnect_button_description": "Deine Google Sheets-Verbindung ist abgelaufen. Bitte verbinde dich erneut, um weiterhin Antworten zu synchronisieren. Deine bestehenden Tabellen-Links und Daten bleiben erhalten.",
+        "reconnect_button_tooltip": "Verbinde die Integration erneut, um deinen Zugriff zu aktualisieren. Deine bestehenden Tabellen-Links und Daten bleiben erhalten.",
+        "spreadsheet_permission_error": "Du hast keine Berechtigung, auf diese Tabelle zuzugreifen. Bitte stelle sicher, dass die Tabelle mit deinem Google-Konto geteilt ist und du Schreibzugriff auf die Tabelle hast.",
+        "spreadsheet_url": "Tabellen-URL",
+        "token_expired_error": "Das Google Sheets-Aktualisierungstoken ist abgelaufen oder wurde widerrufen. Bitte verbinde die Integration erneut."
      },
      "include_created_at": "Erstellungsdatum einbeziehen",
      "include_hidden_fields": "Versteckte Felder (hidden fields) einbeziehen",
@@ -2153,12 +2158,12 @@
        "advanced_styling_field_headline_size_description": "Skaliert den Überschriftentext.",
        "advanced_styling_field_headline_weight": "Schriftstärke der Überschrift",
        "advanced_styling_field_headline_weight_description": "Macht den Überschriftentext heller oder fetter.",
-        "advanced_styling_field_height": "Mindesthöhe",
+        "advanced_styling_field_height": "Höhe",
        "advanced_styling_field_indicator_bg": "Indikator-Hintergrund",
        "advanced_styling_field_indicator_bg_description": "Färbt den gefüllten Teil des Balkens.",
        "advanced_styling_field_input_border_radius_description": "Rundet die Eingabeecken ab.",
        "advanced_styling_field_input_font_size_description": "Skaliert den eingegebenen Text in Eingabefeldern.",
-        "advanced_styling_field_input_height_description": "Legt die Mindesthöhe des Eingabefelds fest.",
+        "advanced_styling_field_input_height_description": "Steuert die Höhe des Eingabefelds.",
        "advanced_styling_field_input_padding_x_description": "Fügt links und rechts Abstand hinzu.",
        "advanced_styling_field_input_padding_y_description": "Fügt oben und unten Abstand hinzu.",
        "advanced_styling_field_input_placeholder_opacity_description": "Blendet den Platzhaltertext aus.",
@@ -2221,7 +2226,6 @@
        "show_powered_by_formbricks": "\"Powered by Formbricks\"-Signatur anzeigen",
        "styling_updated_successfully": "Styling erfolgreich aktualisiert",
        "suggest_colors": "Farben vorschlagen",
-        "suggested_colors_applied_please_save": "Vorgeschlagene Farben erfolgreich generiert. Drücke \"Speichern\", um die Änderungen zu übernehmen.",
        "theme": "Theme",
        "theme_settings_description": "Erstelle ein Style-Theme für alle Umfragen. Du kannst für jede Umfrage individuelles Styling aktivieren."
      },
--- a/apps/web/locales/en-US.json
+++ b/apps/web/locales/en-US.json
@@ -752,7 +752,12 @@
        "link_google_sheet": "Link Google Sheet",
        "link_new_sheet": "Link new Sheet",
        "no_integrations_yet": "Your google sheet integrations will appear here as soon as you add them. ⏲️",
-        "spreadsheet_url": "Spreadsheet URL"
+        "reconnect_button": "Reconnect",
+        "reconnect_button_description": "Your Google Sheets connection has expired. Please reconnect to continue syncing responses. Your existing spreadsheet links and data will be preserved.",
+        "reconnect_button_tooltip": "Reconnect the integration to refresh your access. Your existing spreadsheet links and data will be preserved.",
+        "spreadsheet_permission_error": "You don't have permission to access this spreadsheet. Please ensure the spreadsheet is shared with your Google account and you have write access to the spreadsheet.",
+        "spreadsheet_url": "Spreadsheet URL",
+        "token_expired_error": "Google Sheets refresh token has expired or been revoked. Please reconnect the integration."
      },
      "include_created_at": "Include Created At",
      "include_hidden_fields": "Include Hidden Fields",
@@ -2153,12 +2158,12 @@
        "advanced_styling_field_headline_size_description": "Scales the headline text.",
        "advanced_styling_field_headline_weight": "Headline Font Weight",
        "advanced_styling_field_headline_weight_description": "Makes headline text lighter or bolder.",
-        "advanced_styling_field_height": "Minimum Height",
+        "advanced_styling_field_height": "Height",
        "advanced_styling_field_indicator_bg": "Indicator Background",
        "advanced_styling_field_indicator_bg_description": "Colors the filled portion of the bar.",
        "advanced_styling_field_input_border_radius_description": "Rounds the input corners.",
        "advanced_styling_field_input_font_size_description": "Scales the typed text in inputs.",
-        "advanced_styling_field_input_height_description": "Controls the minimum height of the input field.",
+        "advanced_styling_field_input_height_description": "Controls the input field height.",
        "advanced_styling_field_input_padding_x_description": "Adds space on the left and right.",
        "advanced_styling_field_input_padding_y_description": "Adds space on the top and bottom.",
        "advanced_styling_field_input_placeholder_opacity_description": "Fades the placeholder hint text.",
@@ -2221,7 +2226,6 @@
        "show_powered_by_formbricks": "Show “Powered by Formbricks” Signature",
        "styling_updated_successfully": "Styling updated successfully",
        "suggest_colors": "Suggest colors",
-        "suggested_colors_applied_please_save": "Suggested colors generated successfully. Press \"Save\" to persist the changes.",
        "theme": "Theme",
        "theme_settings_description": "Create a style theme for all surveys. You can enable custom styling for each survey."
      },
--- a/apps/web/locales/es-ES.json
+++ b/apps/web/locales/es-ES.json
@@ -752,7 +752,12 @@
        "link_google_sheet": "Vincular Google Sheet",
        "link_new_sheet": "Vincular nueva hoja",
        "no_integrations_yet": "Tus integraciones de Google Sheet aparecerán aquí tan pronto como las añadas. ⏲️",
-        "spreadsheet_url": "URL de la hoja de cálculo"
+        "reconnect_button": "Reconectar",
+        "reconnect_button_description": "Tu conexión con Google Sheets ha caducado. Reconecta para continuar sincronizando respuestas. Tus enlaces de hojas de cálculo y datos existentes se conservarán.",
+        "reconnect_button_tooltip": "Reconecta la integración para actualizar tu acceso. Tus enlaces de hojas de cálculo y datos existentes se conservarán.",
+        "spreadsheet_permission_error": "No tienes permiso para acceder a esta hoja de cálculo. Asegúrate de que la hoja de cálculo esté compartida con tu cuenta de Google y de que tengas acceso de escritura a la hoja de cálculo.",
+        "spreadsheet_url": "URL de la hoja de cálculo",
+        "token_expired_error": "El token de actualización de Google Sheets ha caducado o ha sido revocado. Reconecta la integración."
      },
      "include_created_at": "Incluir fecha de creación",
      "include_hidden_fields": "Incluir campos ocultos",
@@ -2153,12 +2158,12 @@
        "advanced_styling_field_headline_size_description": "Escala el texto del titular.",
        "advanced_styling_field_headline_weight": "Grosor de fuente del titular",
        "advanced_styling_field_headline_weight_description": "Hace el texto del titular más ligero o más grueso.",
-        "advanced_styling_field_height": "Altura mínima",
+        "advanced_styling_field_height": "Altura",
        "advanced_styling_field_indicator_bg": "Fondo del indicador",
        "advanced_styling_field_indicator_bg_description": "Colorea la porción rellena de la barra.",
        "advanced_styling_field_input_border_radius_description": "Redondea las esquinas del campo.",
        "advanced_styling_field_input_font_size_description": "Escala el texto escrito en los campos.",
-        "advanced_styling_field_input_height_description": "Controla la altura mínima del campo de entrada.",
+        "advanced_styling_field_input_height_description": "Controla la altura del campo de entrada.",
        "advanced_styling_field_input_padding_x_description": "Añade espacio a la izquierda y a la derecha.",
        "advanced_styling_field_input_padding_y_description": "Añade espacio en la parte superior e inferior.",
        "advanced_styling_field_input_placeholder_opacity_description": "Atenúa el texto de sugerencia del marcador de posición.",
@@ -2221,7 +2226,6 @@
        "show_powered_by_formbricks": "Mostrar firma 'Powered by Formbricks'",
        "styling_updated_successfully": "Estilo actualizado correctamente",
        "suggest_colors": "Sugerir colores",
-        "suggested_colors_applied_please_save": "Colores sugeridos generados correctamente. Pulsa \"Guardar\" para conservar los cambios.",
        "theme": "Tema",
        "theme_settings_description": "Crea un tema de estilo para todas las encuestas. Puedes activar el estilo personalizado para cada encuesta."
      },
--- a/apps/web/locales/fr-FR.json
+++ b/apps/web/locales/fr-FR.json
@@ -752,7 +752,12 @@
        "link_google_sheet": "Lien Google Sheet",
        "link_new_sheet": "Lier une nouvelle feuille",
        "no_integrations_yet": "Vos intégrations Google Sheets apparaîtront ici dès que vous les ajouterez. ⏲️",
-        "spreadsheet_url": "URL de la feuille de calcul"
+        "reconnect_button": "Reconnecter",
+        "reconnect_button_description": "Votre connexion Google Sheets a expiré. Veuillez vous reconnecter pour continuer à synchroniser les réponses. Vos liens de feuilles de calcul et données existants seront préservés.",
+        "reconnect_button_tooltip": "Reconnectez l'intégration pour actualiser votre accès. Vos liens de feuilles de calcul et données existants seront préservés.",
+        "spreadsheet_permission_error": "Vous n'avez pas la permission d'accéder à cette feuille de calcul. Veuillez vous assurer que la feuille de calcul est partagée avec votre compte Google et que vous disposez d'un accès en écriture.",
+        "spreadsheet_url": "URL de la feuille de calcul",
+        "token_expired_error": "Le jeton d'actualisation Google Sheets a expiré ou a été révoqué. Veuillez reconnecter l'intégration."
      },
      "include_created_at": "Inclure la date de création",
      "include_hidden_fields": "Inclure les champs cachés",
@@ -2153,12 +2158,12 @@
        "advanced_styling_field_headline_size_description": "Ajuste la taille du texte du titre.",
        "advanced_styling_field_headline_weight": "Graisse de police du titre",
        "advanced_styling_field_headline_weight_description": "Rend le texte du titre plus léger ou plus gras.",
-        "advanced_styling_field_height": "Hauteur minimale",
+        "advanced_styling_field_height": "Hauteur",
        "advanced_styling_field_indicator_bg": "Arrière-plan de l'indicateur",
        "advanced_styling_field_indicator_bg_description": "Colore la partie remplie de la barre.",
        "advanced_styling_field_input_border_radius_description": "Arrondit les coins du champ de saisie.",
        "advanced_styling_field_input_font_size_description": "Ajuste la taille du texte saisi dans les champs.",
-        "advanced_styling_field_input_height_description": "Contrôle la hauteur minimale du champ de saisie.",
+        "advanced_styling_field_input_height_description": "Contrôle la hauteur du champ de saisie.",
        "advanced_styling_field_input_padding_x_description": "Ajoute de l'espace à gauche et à droite.",
        "advanced_styling_field_input_padding_y_description": "Ajoute de l'espace en haut et en bas.",
        "advanced_styling_field_input_placeholder_opacity_description": "Atténue le texte d'indication du placeholder.",
@@ -2221,7 +2226,6 @@
        "show_powered_by_formbricks": "Afficher la signature « Propulsé par Formbricks »",
        "styling_updated_successfully": "Style mis à jour avec succès",
        "suggest_colors": "Suggérer des couleurs",
-        "suggested_colors_applied_please_save": "Couleurs suggérées générées avec succès. Appuyez sur « Enregistrer » pour conserver les modifications.",
        "theme": "Thème",
        "theme_settings_description": "Créez un thème de style pour toutes les enquêtes. Vous pouvez activer un style personnalisé pour chaque enquête."
      },
--- a/apps/web/locales/hu-HU.json
+++ b/apps/web/locales/hu-HU.json
@@ -752,7 +752,12 @@
        "link_google_sheet": "Google Táblázatok összekapcsolása",
        "link_new_sheet": "Új táblázat összekapcsolása",
        "no_integrations_yet": "A Google Táblázatok integrációi itt fognak megjelenni, amint hozzáadja azokat. ⏲️",
-        "spreadsheet_url": "Táblázat URL-e"
+        "reconnect_button": "Újrakapcsolódás",
+        "reconnect_button_description": "A Google Táblázatok kapcsolata lejárt. Kérjük, csatlakozzon újra a válaszok szinkronizálásának folytatásához. A meglévő táblázathivatkozások és adatok megmaradnak.",
+        "reconnect_button_tooltip": "Csatlakoztassa újra az integrációt a hozzáférés frissítéséhez. A meglévő táblázathivatkozások és adatok megmaradnak.",
+        "spreadsheet_permission_error": "Nincs jogosultsága a táblázat eléréséhez. Kérjük, győződjön meg arról, hogy a táblázat meg van osztva a Google-fiókjával, és írási jogosultsággal rendelkezik a táblázathoz.",
+        "spreadsheet_url": "Táblázat URL-e",
+        "token_expired_error": "A Google Táblázatok frissítési tokenje lejárt vagy visszavonásra került. Kérjük, csatlakoztassa újra az integrációt."
      },
      "include_created_at": "Létrehozva felvétele",
      "include_hidden_fields": "Rejtett mezők felvétele",
@@ -2153,12 +2158,12 @@
        "advanced_styling_field_headline_size_description": "Átméretezi a címsor szövegét.",
        "advanced_styling_field_headline_weight": "Címsor betűvastagsága",
        "advanced_styling_field_headline_weight_description": "Vékonyabbá vagy vastagabbá teszi a címsor szövegét.",
-        "advanced_styling_field_height": "Minimális magasság",
+        "advanced_styling_field_height": "Magasság",
        "advanced_styling_field_indicator_bg": "Jelző háttere",
        "advanced_styling_field_indicator_bg_description": "Kiszínezi a sáv kitöltött részét.",
        "advanced_styling_field_input_border_radius_description": "Lekerekíti a beviteli mező sarkait.",
        "advanced_styling_field_input_font_size_description": "Átméretezi a beviteli mezőkbe beírt szöveget.",
-        "advanced_styling_field_input_height_description": "A beviteli mező minimális magasságát szabályozza.",
+        "advanced_styling_field_input_height_description": "A beviteli mező magasságát vezérli.",
        "advanced_styling_field_input_padding_x_description": "Térközt ad hozzá balra és jobbra.",
        "advanced_styling_field_input_padding_y_description": "Térközt ad hozzá fent és lent.",
        "advanced_styling_field_input_placeholder_opacity_description": "Elhalványítja a helykitöltő súgószöveget.",
@@ -2221,7 +2226,6 @@
        "show_powered_by_formbricks": "Az „A gépházban: Formbricks” aláírás megjelenítése",
        "styling_updated_successfully": "A stílus sikeresen frissítve",
        "suggest_colors": "Színek ajánlása",
-        "suggested_colors_applied_please_save": "A javasolt színek sikeresen generálva. Nyomd meg a \"Mentés\" gombot a változtatások véglegesítéséhez.",
        "theme": "Téma",
        "theme_settings_description": "Stílustéma létrehozása az összes kérdőívhez. Egyéni stílust engedélyezhet minden egyes kérdőívhez."
      },
--- a/apps/web/locales/ja-JP.json
+++ b/apps/web/locales/ja-JP.json
@@ -752,7 +752,12 @@
        "link_google_sheet": "スプレッドシートをリンク",
        "link_new_sheet": "新しいシートをリンク",
        "no_integrations_yet": "Google スプレッドシート連携は、追加するとここに表示されます。⏲️",
-        "spreadsheet_url": "スプレッドシートURL"
+        "reconnect_button": "再接続",
+        "reconnect_button_description": "Google Sheetsの接続が期限切れになりました。回答の同期を続けるには再接続してください。既存のスプレッドシートリンクとデータは保持されます。",
+        "reconnect_button_tooltip": "統合を再接続してアクセスを更新します。既存のスプレッドシートリンクとデータは保持されます。",
+        "spreadsheet_permission_error": "このスプレッドシートにアクセスする権限がありません。スプレッドシートがGoogleアカウントと共有されており、書き込みアクセス権があることを確認してください。",
+        "spreadsheet_url": "スプレッドシートURL",
+        "token_expired_error": "Google Sheetsのリフレッシュトークンが期限切れになったか、取り消されました。統合を再接続してください。"
      },
      "include_created_at": "作成日時を含める",
      "include_hidden_fields": "非表示フィールドを含める",
@@ -2153,12 +2158,12 @@
        "advanced_styling_field_headline_size_description": "見出しテキストのサイズを調整します。",
        "advanced_styling_field_headline_weight": "見出しのフォントの太さ",
        "advanced_styling_field_headline_weight_description": "見出しテキストを細くまたは太くします。",
-        "advanced_styling_field_height": "最小の高さ",
+        "advanced_styling_field_height": "高さ",
        "advanced_styling_field_indicator_bg": "インジケーターの背景",
        "advanced_styling_field_indicator_bg_description": "バーの塗りつぶし部分に色を付けます。",
        "advanced_styling_field_input_border_radius_description": "入力フィールドの角を丸めます。",
        "advanced_styling_field_input_font_size_description": "入力フィールド内の入力テキストのサイズを調整します。",
-        "advanced_styling_field_input_height_description": "入力フィールドの最小の高さを制御します。",
+        "advanced_styling_field_input_height_description": "入力フィールドの高さを調整します。",
        "advanced_styling_field_input_padding_x_description": "左右にスペースを追加します。",
        "advanced_styling_field_input_padding_y_description": "上下にスペースを追加します。",
        "advanced_styling_field_input_placeholder_opacity_description": "プレースホルダーのヒントテキストを薄くします。",
@@ -2221,7 +2226,6 @@
        "show_powered_by_formbricks": "「Powered by Formbricks」署名を表示",
        "styling_updated_successfully": "スタイルを正常に更新しました",
        "suggest_colors": "カラーを提案",
-        "suggested_colors_applied_please_save": "推奨カラーが正常に生成されました。変更を保存するには「保存」を押してください。",
        "theme": "テーマ",
        "theme_settings_description": "すべてのアンケート用のスタイルテーマを作成します。各アンケートでカスタムスタイルを有効にできます。"
      },
--- a/apps/web/locales/nl-NL.json
+++ b/apps/web/locales/nl-NL.json
@@ -752,7 +752,12 @@
        "link_google_sheet": "Link Google Spreadsheet",
        "link_new_sheet": "Nieuw blad koppelen",
        "no_integrations_yet": "Uw Google Spreadsheet-integraties verschijnen hier zodra u ze toevoegt. ⏲️",
-        "spreadsheet_url": "Spreadsheet-URL"
+        "reconnect_button": "Maak opnieuw verbinding",
+        "reconnect_button_description": "Je Google Sheets-verbinding is verlopen. Maak opnieuw verbinding om door te gaan met het synchroniseren van antwoorden. Je bestaande spreadsheetlinks en gegevens blijven behouden.",
+        "reconnect_button_tooltip": "Maak opnieuw verbinding met de integratie om je toegang te vernieuwen. Je bestaande spreadsheetlinks en gegevens blijven behouden.",
+        "spreadsheet_permission_error": "Je hebt geen toestemming om deze spreadsheet te openen. Zorg ervoor dat de spreadsheet is gedeeld met je Google-account en dat je schrijftoegang hebt tot de spreadsheet.",
+        "spreadsheet_url": "Spreadsheet-URL",
+        "token_expired_error": "Het vernieuwingstoken van Google Sheets is verlopen of ingetrokken. Maak opnieuw verbinding met de integratie."
      },
      "include_created_at": "Inclusief gemaakt op",
      "include_hidden_fields": "Inclusief verborgen velden",
@@ -2153,12 +2158,12 @@
        "advanced_styling_field_headline_size_description": "Schaalt de koptekst.",
        "advanced_styling_field_headline_weight": "Letterdikte kop",
        "advanced_styling_field_headline_weight_description": "Maakt koptekst lichter of vetter.",
-        "advanced_styling_field_height": "Minimale hoogte",
+        "advanced_styling_field_height": "Hoogte",
        "advanced_styling_field_indicator_bg": "Indicatorachtergrond",
        "advanced_styling_field_indicator_bg_description": "Kleurt het gevulde deel van de balk.",
        "advanced_styling_field_input_border_radius_description": "Rondt de invoerhoeken af.",
        "advanced_styling_field_input_font_size_description": "Schaalt de getypte tekst in invoervelden.",
-        "advanced_styling_field_input_height_description": "Bepaalt de minimale hoogte van het invoerveld.",
+        "advanced_styling_field_input_height_description": "Bepaalt de hoogte van het invoerveld.",
        "advanced_styling_field_input_padding_x_description": "Voegt ruimte toe aan de linker- en rechterkant.",
        "advanced_styling_field_input_padding_y_description": "Voegt ruimte toe aan de boven- en onderkant.",
        "advanced_styling_field_input_placeholder_opacity_description": "Vervaagt de tijdelijke aanwijzingstekst.",
@@ -2221,7 +2226,6 @@
        "show_powered_by_formbricks": "Toon 'Powered by Formbricks' handtekening",
        "styling_updated_successfully": "Styling succesvol bijgewerkt",
        "suggest_colors": "Kleuren voorstellen",
-        "suggested_colors_applied_please_save": "Voorgestelde kleuren succesvol gegenereerd. Druk op \"Opslaan\" om de wijzigingen te behouden.",
        "theme": "Thema",
        "theme_settings_description": "Maak een stijlthema voor alle enquêtes. Je kunt aangepaste styling inschakelen voor elke enquête."
      },
--- a/apps/web/locales/pt-BR.json
+++ b/apps/web/locales/pt-BR.json
@@ -752,7 +752,12 @@
        "link_google_sheet": "Link da Planilha do Google",
        "link_new_sheet": "Vincular nova planilha",
        "no_integrations_yet": "Suas integrações do Google Sheets vão aparecer aqui assim que você adicioná-las. ⏲️",
-        "spreadsheet_url": "URL da planilha"
+        "reconnect_button": "Reconectar",
+        "reconnect_button_description": "Sua conexão com o Google Sheets expirou. Reconecte para continuar sincronizando respostas. Seus links de planilhas e dados existentes serão preservados.",
+        "reconnect_button_tooltip": "Reconecte a integração para atualizar seu acesso. Seus links de planilhas e dados existentes serão preservados.",
+        "spreadsheet_permission_error": "Você não tem permissão para acessar esta planilha. Certifique-se de que a planilha está compartilhada com sua conta do Google e que você tem acesso de escrita à planilha.",
+        "spreadsheet_url": "URL da planilha",
+        "token_expired_error": "O token de atualização do Google Sheets expirou ou foi revogado. Reconecte a integração."
      },
      "include_created_at": "Incluir Data de Criação",
      "include_hidden_fields": "Incluir Campos Ocultos",
@@ -2153,12 +2158,12 @@
        "advanced_styling_field_headline_size_description": "Ajusta o tamanho do texto do título.",
        "advanced_styling_field_headline_weight": "Peso da fonte do título",
        "advanced_styling_field_headline_weight_description": "Torna o texto do título mais leve ou mais negrito.",
-        "advanced_styling_field_height": "Altura mínima",
+        "advanced_styling_field_height": "Altura",
        "advanced_styling_field_indicator_bg": "Fundo do indicador",
        "advanced_styling_field_indicator_bg_description": "Colore a porção preenchida da barra.",
        "advanced_styling_field_input_border_radius_description": "Arredonda os cantos do campo.",
        "advanced_styling_field_input_font_size_description": "Ajusta o tamanho do texto digitado nos campos.",
-        "advanced_styling_field_input_height_description": "Controla a altura mínima do campo de entrada.",
+        "advanced_styling_field_input_height_description": "Controla a altura do campo de entrada.",
        "advanced_styling_field_input_padding_x_description": "Adiciona espaço à esquerda e à direita.",
        "advanced_styling_field_input_padding_y_description": "Adiciona espaço na parte superior e inferior.",
        "advanced_styling_field_input_placeholder_opacity_description": "Esmaece o texto de dica do placeholder.",
@@ -2221,7 +2226,6 @@
        "show_powered_by_formbricks": "Mostrar assinatura 'Powered by Formbricks'",
        "styling_updated_successfully": "Estilo atualizado com sucesso",
        "suggest_colors": "Sugerir cores",
-        "suggested_colors_applied_please_save": "Cores sugeridas geradas com sucesso. Pressione \"Salvar\" para manter as alterações.",
        "theme": "Tema",
        "theme_settings_description": "Crie um tema de estilo para todas as pesquisas. Você pode ativar estilo personalizado para cada pesquisa."
      },
--- a/apps/web/locales/pt-PT.json
+++ b/apps/web/locales/pt-PT.json
@@ -752,7 +752,12 @@
        "link_google_sheet": "Ligar Folha do Google",
        "link_new_sheet": "Ligar nova Folha",
        "no_integrations_yet": "As suas integrações com o Google Sheets aparecerão aqui assim que as adicionar. ⏲️",
-        "spreadsheet_url": "URL da folha de cálculo"
+        "reconnect_button": "Reconectar",
+        "reconnect_button_description": "A tua ligação ao Google Sheets expirou. Por favor, reconecta para continuar a sincronizar respostas. As tuas ligações de folhas de cálculo e dados existentes serão preservados.",
+        "reconnect_button_tooltip": "Reconecta a integração para atualizar o teu acesso. As tuas ligações de folhas de cálculo e dados existentes serão preservados.",
+        "spreadsheet_permission_error": "Não tens permissão para aceder a esta folha de cálculo. Por favor, certifica-te de que a folha de cálculo está partilhada com a tua conta Google e que tens acesso de escrita à folha de cálculo.",
+        "spreadsheet_url": "URL da folha de cálculo",
+        "token_expired_error": "O token de atualização do Google Sheets expirou ou foi revogado. Por favor, reconecta a integração."
      },
      "include_created_at": "Incluir Criado Em",
      "include_hidden_fields": "Incluir Campos Ocultos",
@@ -2153,12 +2158,12 @@
        "advanced_styling_field_headline_size_description": "Ajusta o tamanho do texto do título.",
        "advanced_styling_field_headline_weight": "Peso da fonte do título",
        "advanced_styling_field_headline_weight_description": "Torna o texto do título mais leve ou mais negrito.",
-        "advanced_styling_field_height": "Altura mínima",
+        "advanced_styling_field_height": "Altura",
        "advanced_styling_field_indicator_bg": "Fundo do indicador",
        "advanced_styling_field_indicator_bg_description": "Colore a porção preenchida da barra.",
        "advanced_styling_field_input_border_radius_description": "Arredonda os cantos do campo.",
        "advanced_styling_field_input_font_size_description": "Ajusta o tamanho do texto digitado nos campos.",
-        "advanced_styling_field_input_height_description": "Controla a altura mínima do campo de entrada.",
+        "advanced_styling_field_input_height_description": "Controla a altura do campo de entrada.",
        "advanced_styling_field_input_padding_x_description": "Adiciona espaço à esquerda e à direita.",
        "advanced_styling_field_input_padding_y_description": "Adiciona espaço no topo e na base.",
        "advanced_styling_field_input_placeholder_opacity_description": "Atenua o texto de sugestão do placeholder.",
@@ -2221,7 +2226,6 @@
        "show_powered_by_formbricks": "Mostrar assinatura 'Powered by Formbricks'",
        "styling_updated_successfully": "Estilo atualizado com sucesso",
        "suggest_colors": "Sugerir cores",
-        "suggested_colors_applied_please_save": "Cores sugeridas geradas com sucesso. Pressiona \"Guardar\" para manter as alterações.",
        "theme": "Tema",
        "theme_settings_description": "Crie um tema de estilo para todos os inquéritos. Pode ativar estilos personalizados para cada inquérito."
      },
--- a/apps/web/locales/ro-RO.json
+++ b/apps/web/locales/ro-RO.json
@@ -752,7 +752,12 @@
        "link_google_sheet": "Leagă Google Sheet",
        "link_new_sheet": "Leagă un nou Sheet",
        "no_integrations_yet": "Integrațiile tale Google Sheet vor apărea aici de îndată ce le vei adăuga. ⏲️",
-        "spreadsheet_url": "URL foaie de calcul"
+        "reconnect_button": "Reconectează",
+        "reconnect_button_description": "Conexiunea ta cu Google Sheets a expirat. Te rugăm să te reconectezi pentru a continua sincronizarea răspunsurilor. Linkurile și datele existente din foile de calcul vor fi păstrate.",
+        "reconnect_button_tooltip": "Reconectează integrarea pentru a-ți reîmprospăta accesul. Linkurile și datele existente din foile de calcul vor fi păstrate.",
+        "spreadsheet_permission_error": "Nu ai permisiunea de a accesa această foaie de calcul. Asigură-te că foaia de calcul este partajată cu contul tău Google și că ai acces de scriere la aceasta.",
+        "spreadsheet_url": "URL foaie de calcul",
+        "token_expired_error": "Tokenul de reîmprospătare Google Sheets a expirat sau a fost revocat. Te rugăm să reconectezi integrarea."
      },
      "include_created_at": "Include data creării",
      "include_hidden_fields": "Include câmpuri ascunse",
@@ -2153,12 +2158,12 @@
        "advanced_styling_field_headline_size_description": "Scalează textul titlului.",
        "advanced_styling_field_headline_weight": "Grosime font titlu",
        "advanced_styling_field_headline_weight_description": "Face textul titlului mai subțire sau mai îngroșat.",
-        "advanced_styling_field_height": "Înălțime minimă",
+        "advanced_styling_field_height": "Înălțime",
        "advanced_styling_field_indicator_bg": "Fundal indicator",
        "advanced_styling_field_indicator_bg_description": "Colorează partea umplută a barei.",
        "advanced_styling_field_input_border_radius_description": "Rotunjește colțurile câmpurilor de introducere.",
        "advanced_styling_field_input_font_size_description": "Scalează textul introdus în câmpuri.",
-        "advanced_styling_field_input_height_description": "Controlează înălțimea minimă a câmpului de introducere.",
+        "advanced_styling_field_input_height_description": "Controlează înălțimea câmpului de introducere.",
        "advanced_styling_field_input_padding_x_description": "Adaugă spațiu la stânga și la dreapta.",
        "advanced_styling_field_input_padding_y_description": "Adaugă spațiu deasupra și dedesubt.",
        "advanced_styling_field_input_placeholder_opacity_description": "Estompează textul de sugestie din placeholder.",
@@ -2221,7 +2226,6 @@
        "show_powered_by_formbricks": "Afișează semnătura „Powered by Formbricks”",
        "styling_updated_successfully": "Stilizarea a fost actualizată cu succes",
        "suggest_colors": "Sugerează culori",
-        "suggested_colors_applied_please_save": "Culorile sugerate au fost generate cu succes. Apasă pe „Salvează” pentru a păstra modificările.",
        "theme": "Temă",
        "theme_settings_description": "Creează o temă de stil pentru toate sondajele. Poți activa stilizare personalizată pentru fiecare sondaj."
      },
--- a/apps/web/locales/ru-RU.json
+++ b/apps/web/locales/ru-RU.json
@@ -752,7 +752,12 @@
        "link_google_sheet": "Связать с Google Sheet",
        "link_new_sheet": "Связать с новой таблицей",
        "no_integrations_yet": "Ваши интеграции с Google Sheet появятся здесь, как только вы их добавите. ⏲️",
-        "spreadsheet_url": "URL таблицы"
+        "reconnect_button": "Переподключить",
+        "reconnect_button_description": "Срок действия подключения к Google Sheets истёк. Пожалуйста, переподключись, чтобы продолжить синхронизацию ответов. Все существующие ссылки на таблицы и данные будут сохранены.",
+        "reconnect_button_tooltip": "Переподключи интеграцию, чтобы обновить доступ. Все существующие ссылки на таблицы и данные будут сохранены.",
+        "spreadsheet_permission_error": "У тебя нет доступа к этой таблице. Убедись, что таблица открыта для твоего Google-аккаунта и у тебя есть права на запись.",
+        "spreadsheet_url": "URL таблицы",
+        "token_expired_error": "Срок действия токена обновления Google Sheets истёк или он был отозван. Пожалуйста, переподключи интеграцию."
      },
      "include_created_at": "Включить дату создания",
      "include_hidden_fields": "Включить скрытые поля",
@@ -2153,12 +2158,12 @@
        "advanced_styling_field_headline_size_description": "Масштабирует текст заголовка.",
        "advanced_styling_field_headline_weight": "Толщина шрифта заголовка",
        "advanced_styling_field_headline_weight_description": "Делает текст заголовка тоньше или жирнее.",
-        "advanced_styling_field_height": "Минимальная высота",
+        "advanced_styling_field_height": "Высота",
        "advanced_styling_field_indicator_bg": "Фон индикатора",
        "advanced_styling_field_indicator_bg_description": "Задаёт цвет заполненной части полосы.",
        "advanced_styling_field_input_border_radius_description": "Скругляет углы полей ввода.",
        "advanced_styling_field_input_font_size_description": "Масштабирует введённый текст в полях ввода.",
-        "advanced_styling_field_input_height_description": "Определяет минимальную высоту поля ввода.",
+        "advanced_styling_field_input_height_description": "Определяет высоту поля ввода.",
        "advanced_styling_field_input_padding_x_description": "Добавляет отступы слева и справа.",
        "advanced_styling_field_input_padding_y_description": "Добавляет пространство сверху и снизу.",
        "advanced_styling_field_input_placeholder_opacity_description": "Делает текст подсказки менее заметным.",
@@ -2221,7 +2226,6 @@
        "show_powered_by_formbricks": "Показывать подпись «Работает на Formbricks»",
        "styling_updated_successfully": "Стили успешно обновлены",
        "suggest_colors": "Предложить цвета",
-        "suggested_colors_applied_please_save": "Рекомендованные цвета успешно сгенерированы. Нажми «Сохранить», чтобы применить изменения.",
        "theme": "Тема",
        "theme_settings_description": "Создайте стиль для всех опросов. Вы можете включить индивидуальное оформление для каждого опроса."
      },
--- a/apps/web/locales/sv-SE.json
+++ b/apps/web/locales/sv-SE.json
@@ -752,7 +752,12 @@
        "link_google_sheet": "Länka Google Kalkylark",
        "link_new_sheet": "Länka nytt kalkylark",
        "no_integrations_yet": "Dina Google Kalkylark-integrationer visas här så snart du lägger till dem. ⏲️",
-        "spreadsheet_url": "Kalkylblads-URL"
+        "reconnect_button": "Återanslut",
+        "reconnect_button_description": "Din Google Sheets-anslutning har gått ut. Återanslut för att fortsätta synkronisera svar. Dina befintliga kalkylarkslänkar och data kommer att sparas.",
+        "reconnect_button_tooltip": "Återanslut integrationen för att uppdatera din åtkomst. Dina befintliga kalkylarkslänkar och data kommer att sparas.",
+        "spreadsheet_permission_error": "Du har inte behörighet att komma åt det här kalkylarket. Kontrollera att kalkylarket är delat med ditt Google-konto och att du har skrivrättigheter till kalkylarket.",
+        "spreadsheet_url": "Kalkylblads-URL",
+        "token_expired_error": "Google Sheets refresh token har gått ut eller återkallats. Återanslut integrationen."
      },
      "include_created_at": "Inkludera Skapad vid",
      "include_hidden_fields": "Inkludera dolda fält",
@@ -2153,12 +2158,12 @@
        "advanced_styling_field_headline_size_description": "Ändrar storleken på rubriken.",
        "advanced_styling_field_headline_weight": "Rubrikens teckentjocklek",
        "advanced_styling_field_headline_weight_description": "Gör rubriktexten tunnare eller fetare.",
-        "advanced_styling_field_height": "Minsta höjd",
+        "advanced_styling_field_height": "Höjd",
        "advanced_styling_field_indicator_bg": "Indikatorns bakgrund",
        "advanced_styling_field_indicator_bg_description": "Färglägger den fyllda delen av stapeln.",
        "advanced_styling_field_input_border_radius_description": "Rundar av hörnen på inmatningsfält.",
        "advanced_styling_field_input_font_size_description": "Ändrar storleken på texten i inmatningsfält.",
-        "advanced_styling_field_input_height_description": "Styr den minsta höjden på inmatningsfältet.",
+        "advanced_styling_field_input_height_description": "Styr höjden på inmatningsfältet.",
        "advanced_styling_field_input_padding_x_description": "Lägger till utrymme till vänster och höger.",
        "advanced_styling_field_input_padding_y_description": "Lägger till utrymme upptill och nedtill.",
        "advanced_styling_field_input_placeholder_opacity_description": "Tonar ut platshållartexten.",
@@ -2221,7 +2226,6 @@
        "show_powered_by_formbricks": "Visa 'Powered by Formbricks'-signatur",
        "styling_updated_successfully": "Stiluppdatering lyckades",
        "suggest_colors": "Föreslå färger",
-        "suggested_colors_applied_please_save": "Föreslagna färger har skapats. Tryck på \"Spara\" för att spara ändringarna.",
        "theme": "Tema",
        "theme_settings_description": "Skapa ett stilmall för alla undersökningar. Du kan aktivera anpassad stil för varje undersökning."
      },
--- a/apps/web/locales/zh-Hans-CN.json
+++ b/apps/web/locales/zh-Hans-CN.json
@@ -752,7 +752,12 @@
        "link_google_sheet": "链接 Google 表格",
        "link_new_sheet": "链接 新 表格",
        "no_integrations_yet": "您的 Google Sheet 集成会在您 添加 后 出现在这里。 ⏲️",
-        "spreadsheet_url": "电子表格 URL"
+        "reconnect_button": "重新连接",
+        "reconnect_button_description": "你的 Google Sheets 连接已过期。请重新连接以继续同步回复。你现有的表格链接和数据会被保留。",
+        "reconnect_button_tooltip": "重新连接集成以刷新你的访问权限。你现有的表格链接和数据会被保留。",
+        "spreadsheet_permission_error": "你没有权限访问此表格。请确保该表格已与你的 Google 账号共享，并且你拥有该表格的编辑权限。",
+        "spreadsheet_url": "电子表格 URL",
+        "token_expired_error": "Google Sheets 的刷新令牌已过期或被撤销。请重新连接集成。"
      },
      "include_created_at": "包括 创建 于",
      "include_hidden_fields": "包括 隐藏 字段",
@@ -2153,12 +2158,12 @@
        "advanced_styling_field_headline_size_description": "调整主标题文字大小。",
        "advanced_styling_field_headline_weight": "标题字体粗细",
        "advanced_styling_field_headline_weight_description": "设置主标题文字的粗细。",
-        "advanced_styling_field_height": "最小高度",
+        "advanced_styling_field_height": "高度",
        "advanced_styling_field_indicator_bg": "指示器背景",
        "advanced_styling_field_indicator_bg_description": "设置进度条已填充部分的颜色。",
        "advanced_styling_field_input_border_radius_description": "设置输入框圆角。",
        "advanced_styling_field_input_font_size_description": "调整输入框内文字大小。",
-        "advanced_styling_field_input_height_description": "设置输入框的最小高度。",
+        "advanced_styling_field_input_height_description": "控制输入框高度。",
        "advanced_styling_field_input_padding_x_description": "增加输入框左右间距。",
        "advanced_styling_field_input_padding_y_description": "为输入框上下添加间距。",
        "advanced_styling_field_input_placeholder_opacity_description": "调整占位提示文字的透明度。",
@@ -2221,7 +2226,6 @@
        "show_powered_by_formbricks": "显示“Powered by Formbricks”标识",
        "styling_updated_successfully": "样式更新成功",
        "suggest_colors": "推荐颜色",
-        "suggested_colors_applied_please_save": "已成功生成推荐配色。请点击“保存”以保留更改。",
        "theme": "主题",
        "theme_settings_description": "为所有问卷创建一个样式主题。你可以为每个问卷启用自定义样式。"
      },
--- a/apps/web/locales/zh-Hant-TW.json
+++ b/apps/web/locales/zh-Hant-TW.json
@@ -752,7 +752,12 @@
        "link_google_sheet": "連結 Google 試算表",
        "link_new_sheet": "連結新試算表",
        "no_integrations_yet": "您的 Google 試算表整合將在您新增後立即顯示在此處。⏲️",
-        "spreadsheet_url": "試算表網址"
+        "reconnect_button": "重新連線",
+        "reconnect_button_description": "你的 Google Sheets 連線已過期。請重新連線以繼續同步回應。你現有的試算表連結和資料都會被保留。",
+        "reconnect_button_tooltip": "重新連線整合以刷新存取權限。你現有的試算表連結和資料都會被保留。",
+        "spreadsheet_permission_error": "你沒有權限存取這個試算表。請確認該試算表已與你的 Google 帳戶分享，且你擁有寫入權限。",
+        "spreadsheet_url": "試算表網址",
+        "token_expired_error": "Google Sheets 的刷新權杖已過期或被撤銷。請重新連線整合。"
      },
      "include_created_at": "包含建立於",
      "include_hidden_fields": "包含隱藏欄位",
@@ -2153,12 +2158,12 @@
        "advanced_styling_field_headline_size_description": "調整標題文字的大小。",
        "advanced_styling_field_headline_weight": "標題字體粗細",
        "advanced_styling_field_headline_weight_description": "讓標題文字變細或變粗。",
-        "advanced_styling_field_height": "最小高度",
+        "advanced_styling_field_height": "高度",
        "advanced_styling_field_indicator_bg": "指示器背景",
        "advanced_styling_field_indicator_bg_description": "設定進度條已填滿部分的顏色。",
        "advanced_styling_field_input_border_radius_description": "調整輸入框的圓角。",
        "advanced_styling_field_input_font_size_description": "調整輸入框內輸入文字的大小。",
-        "advanced_styling_field_input_height_description": "設定輸入欄位的最小高度。",
+        "advanced_styling_field_input_height_description": "調整輸入欄位的高度。",
        "advanced_styling_field_input_padding_x_description": "在左右兩側增加間距。",
        "advanced_styling_field_input_padding_y_description": "在上方和下方增加間距。",
        "advanced_styling_field_input_placeholder_opacity_description": "讓提示文字變得更淡。",
@@ -2221,7 +2226,6 @@
        "show_powered_by_formbricks": "顯示「Powered by Formbricks」標記",
        "styling_updated_successfully": "樣式已成功更新",
        "suggest_colors": "建議顏色",
-        "suggested_colors_applied_please_save": "已成功產生建議色彩。請按「儲存」以保存變更。",
        "theme": "主題",
        "theme_settings_description": "為所有調查建立樣式主題。您可以為每個調查啟用自訂樣式。"
      },
--- a/apps/web/modules/core/rate-limit/rate-limit-configs.ts
+++ b/apps/web/modules/core/rate-limit/rate-limit-configs.ts
@@ -30,4 +30,4 @@ export const rateLimitConfigs = {
    upload: { interval: 60, allowedPerInterval: 5, namespace: "storage:upload" }, // 5 per minute
    delete: { interval: 60, allowedPerInterval: 5, namespace: "storage:delete" }, // 5 per minute
  },
-} as const;
+};
--- a/apps/web/modules/ee/contacts/api/v1/client/[environmentId]/user/route.ts
+++ b/apps/web/modules/ee/contacts/api/v1/client/[environmentId]/user/route.ts
@@ -2,26 +2,13 @@ import { NextRequest, userAgent } from "next/server";
 import { logger } from "@formbricks/logger";
 import { TContactAttributesInput } from "@formbricks/types/contact-attribute";
 import { ZEnvironmentId } from "@formbricks/types/environment";
-import { ResourceNotFoundError, ValidationError } from "@formbricks/types/errors";
+import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { TJsPersonState } from "@formbricks/types/js";
 import { responses } from "@/app/lib/api/response";
 import { withV1ApiWrapper } from "@/app/lib/api/with-api-logging";
 import { getIsContactsEnabled } from "@/modules/ee/license-check/lib/utils";
 import { updateUser } from "./lib/update-user";

-const handleError = (err: unknown, url: string): { response: Response } => {
-  if (err instanceof ResourceNotFoundError) {
-    return { response: responses.notFoundResponse(err.resourceType, err.resourceId) };
-  }
-
-  if (err instanceof ValidationError) {
-    return { response: responses.badRequestResponse(err.message, undefined, true) };
-  }
-
-  logger.error({ error: err, url }, "Error in POST /api/v1/client/[environmentId]/user");
-  return { response: responses.internalServerErrorResponse("Unable to fetch user state", true) };
-};
-
 export const OPTIONS = async (): Promise<Response> => {
  return responses.successResponse(
    {},
@@ -136,7 +123,16 @@ export const POST = withV1ApiWrapper({
        response: responses.successResponse(responseJson, true),
      };
    } catch (err) {
-      return handleError(err, req.url);
+      if (err instanceof ResourceNotFoundError) {
+        return {
+          response: responses.notFoundResponse(err.resourceType, err.resourceId),
+        };
+      }
+
+      logger.error({ error: err, url: req.url }, "Error in POST /api/v1/client/[environmentId]/user");
+      return {
+        response: responses.internalServerErrorResponse(err.message ?? "Unable to fetch person state", true),
+      };
    }
  },
 });
--- a/apps/web/modules/ee/contacts/lib/validate-attribute-type.test.ts
+++ b/apps/web/modules/ee/contacts/lib/validate-attribute-type.test.ts
@@ -13,14 +13,22 @@ describe("validateAndParseAttributeValue", () => {
      }
    });

-    test("rejects number values (SDK must pass actual strings)", () => {
+    test("converts numbers to string", () => {
      const result = validateAndParseAttributeValue(42, "string", "testKey");
-      expect(result.valid).toBe(false);
-      if (!result.valid) {
-        expect(result.error.code).toBe("string_type_mismatch");
-        expect(result.error.params.key).toBe("testKey");
-        expect(result.error.params.type).toBe("number");
-        expect(formatValidationError(result.error)).toContain("received a number");
+      expect(result.valid).toBe(true);
+      if (result.valid) {
+        expect(result.parsedValue.value).toBe("42");
+        expect(result.parsedValue.valueNumber).toBeNull();
+      }
+    });
+
+    test("converts Date to ISO string", () => {
+      const date = new Date("2024-01-15T10:30:00.000Z");
+      const result = validateAndParseAttributeValue(date, "string", "testKey");
+      expect(result.valid).toBe(true);
+      if (result.valid) {
+        expect(result.parsedValue.value).toBe("2024-01-15T10:30:00.000Z");
+        expect(result.parsedValue.valueDate).toBeNull();
      }
    });
  });
--- a/apps/web/modules/ee/contacts/lib/validate-attribute-type.ts
+++ b/apps/web/modules/ee/contacts/lib/validate-attribute-type.ts
@@ -27,6 +27,15 @@ export type TAttributeValidationResult =
      error: TAttributeValidationError;
    };

+/**
+ * Converts any value to a string representation
+ */
+const convertToString = (value: TRawValue): string => {
+  if (value instanceof Date) return value.toISOString();
+  if (typeof value === "number") return String(value);
+  return value;
+};
+
 /**
 * Gets a human-readable type name for error messages
 */
@@ -36,28 +45,16 @@ const getTypeName = (value: TRawValue): string => {
 };

 /**
- * Validates and parses a string type attribute.
+ * Validates and parses a string type attribute
 */
-const validateStringType = (value: TRawValue, attributeKey: string): TAttributeValidationResult => {
-  if (typeof value === "string") {
-    return {
-      valid: true,
-      parsedValue: {
-        value,
-        valueNumber: null,
-        valueDate: null,
-      },
-    };
-  }
-
-  return {
-    valid: false,
-    error: {
-      code: "string_type_mismatch",
-      params: { key: attributeKey, type: getTypeName(value) },
-    },
-  };
-};
+const validateStringType = (value: TRawValue): TAttributeValidationResult => ({
+  valid: true,
+  parsedValue: {
+    value: convertToString(value),
+    valueNumber: null,
+    valueDate: null,
+  },
+});

 /**
 * Validates and parses a number type attribute.
@@ -173,13 +170,13 @@ export const validateAndParseAttributeValue = (
 ): TAttributeValidationResult => {
  switch (expectedDataType) {
    case "string":
-      return validateStringType(value, attributeKey);
+      return validateStringType(value);
    case "number":
      return validateNumberType(value, attributeKey);
    case "date":
      return validateDateType(value, attributeKey);
    default:
-      return validateStringType(value, attributeKey);
+      return validateStringType(value);
  }
 };

@@ -188,8 +185,6 @@ export const validateAndParseAttributeValue = (
 * Used for API/SDK responses.
 */
 const VALIDATION_ERROR_TEMPLATES: Record<string, string> = {
-  string_type_mismatch:
-    "Attribute '{key}' expects a string but received a {type}. Pass an actual string value.",
  number_type_mismatch:
    "Attribute '{key}' expects a number but received a string. Pass an actual number value (e.g., 123 instead of \"123\").",
  date_invalid: "Attribute '{key}' expects a valid date. Received: Invalid Date",
--- a/apps/web/modules/projects/settings/look/components/theme-styling.tsx
+++ b/apps/web/modules/projects/settings/look/components/theme-styling.tsx
@@ -11,12 +11,7 @@ import { useTranslation } from "react-i18next";
 import { TProjectStyling, ZProjectStyling } from "@formbricks/types/project";
 import { TSurveyStyling, TSurveyType } from "@formbricks/types/surveys/types";
 import { previewSurvey } from "@/app/lib/templates";
-import {
-  COLOR_DEFAULTS,
-  STYLE_DEFAULTS,
-  deriveNewFieldsFromLegacy,
-  getSuggestedColors,
-} from "@/lib/styling/constants";
+import { STYLE_DEFAULTS, getSuggestedColors } from "@/lib/styling/constants";
 import { getFormattedErrorMessage } from "@/lib/utils/helper";
 import { updateProjectAction } from "@/modules/projects/settings/actions";
 import { FormStylingSettings } from "@/modules/survey/editor/components/form-styling-settings";
@@ -67,23 +62,11 @@ export const ThemeStyling = ({
    ? Object.fromEntries(Object.entries(savedStyling).filter(([, v]) => v != null))
    : {};

-  const legacyFills = deriveNewFieldsFromLegacy(cleanSaved);
-
  const form = useForm<TProjectStyling>({
-    defaultValues: { ...STYLE_DEFAULTS, ...legacyFills, ...cleanSaved },
+    defaultValues: { ...STYLE_DEFAULTS, ...cleanSaved },
    resolver: zodResolver(ZProjectStyling),
  });

-  // Brand color shown in the preview.  Only updated when the user triggers
-  // "Suggest colors", "Save", or "Reset to default" — NOT on every keystroke
-  // in the brand-color picker.  This prevents the loading-spinner / progress
-  // bar from updating while the user is still picking a colour.
-  const [previewBrandColor, setPreviewBrandColor] = useState<string>(
-    (cleanSaved as Partial<TProjectStyling>).brandColor?.light ??
-      STYLE_DEFAULTS.brandColor?.light ??
-      COLOR_DEFAULTS.brandColor
-  );
-
  const [previewSurveyType, setPreviewSurveyType] = useState<TSurveyType>("link");
  const [confirmResetStylingModalOpen, setConfirmResetStylingModalOpen] = useState(false);
  const [confirmSuggestColorsOpen, setConfirmSuggestColorsOpen] = useState(false);
@@ -101,7 +84,6 @@ export const ThemeStyling = ({

    if (updatedProjectResponse?.data) {
      form.reset({ ...STYLE_DEFAULTS });
-      setPreviewBrandColor(STYLE_DEFAULTS.brandColor?.light ?? COLOR_DEFAULTS.brandColor);
      toast.success(t("environments.workspace.look.styling_updated_successfully"));
      router.refresh();
    } else {
@@ -118,10 +100,7 @@ export const ThemeStyling = ({
      form.setValue(key as keyof TProjectStyling, value, { shouldDirty: true });
    }

-    // Commit brand color to the preview now that all derived colours are in sync.
-    setPreviewBrandColor(brandColor ?? STYLE_DEFAULTS.brandColor?.light ?? COLOR_DEFAULTS.brandColor);
-
-    toast.success(t("environments.workspace.look.suggested_colors_applied_please_save"));
+    toast.success(t("environments.workspace.look.styling_updated_successfully"));
    setConfirmSuggestColorsOpen(false);
  };

@@ -134,11 +113,7 @@ export const ThemeStyling = ({
    });

    if (updatedProjectResponse?.data) {
-      const saved = updatedProjectResponse.data.styling;
-      form.reset({ ...saved });
-      setPreviewBrandColor(
-        saved?.brandColor?.light ?? STYLE_DEFAULTS.brandColor?.light ?? COLOR_DEFAULTS.brandColor
-      );
+      form.reset({ ...updatedProjectResponse.data.styling });
      toast.success(t("environments.workspace.look.styling_updated_successfully"));
    } else {
      const errorMessage = getFormattedErrorMessage(updatedProjectResponse);
@@ -274,9 +249,7 @@ export const ThemeStyling = ({
                survey={previewSurvey(project.name, t)}
                project={{
                  ...project,
-                  styling: form.watch("allowStyleOverwrite")
-                    ? { ...form.watch(), brandColor: { light: previewBrandColor } }
-                    : STYLE_DEFAULTS,
+                  styling: form.watch("allowStyleOverwrite") ? form.watch() : STYLE_DEFAULTS,
                }}
                previewType={previewSurveyType}
                setPreviewType={setPreviewSurveyType}
--- a/apps/web/modules/survey/editor/components/styling-view.tsx
+++ b/apps/web/modules/survey/editor/components/styling-view.tsx
@@ -9,7 +9,7 @@ import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
 import { TProjectStyling } from "@formbricks/types/project";
 import { TSurvey, TSurveyStyling } from "@formbricks/types/surveys/types";
-import { STYLE_DEFAULTS, deriveNewFieldsFromLegacy, getSuggestedColors } from "@/lib/styling/constants";
+import { STYLE_DEFAULTS, getSuggestedColors } from "@/lib/styling/constants";
 import { FormStylingSettings } from "@/modules/survey/editor/components/form-styling-settings";
 import { LogoSettingsCard } from "@/modules/survey/editor/components/logo-settings-card";
 import { AlertDialog } from "@/modules/ui/components/alert-dialog";
@@ -68,15 +68,10 @@ export const StylingView = ({
    ? Object.fromEntries(Object.entries(localSurvey.styling).filter(([, v]) => v != null))
    : {};

-  const projectLegacyFills = deriveNewFieldsFromLegacy(cleanProject);
-  const surveyLegacyFills = deriveNewFieldsFromLegacy(cleanSurvey);
-
  const form = useForm<TSurveyStyling>({
    defaultValues: {
      ...STYLE_DEFAULTS,
-      ...projectLegacyFills,
      ...cleanProject,
-      ...surveyLegacyFills,
      ...cleanSurvey,
    },
  });
@@ -99,7 +94,7 @@ export const StylingView = ({
      form.setValue(key as keyof TSurveyStyling, value, { shouldDirty: true });
    }

-    toast.success(t("environments.workspace.look.suggested_colors_applied_please_save"));
+    toast.success(t("environments.workspace.look.styling_updated_successfully"));
    setConfirmSuggestColorsOpen(false);
  };

--- a/apps/web/modules/ui/components/preview-survey/index.tsx
+++ b/apps/web/modules/ui/components/preview-survey/index.tsx
@@ -225,10 +225,10 @@ export const PreviewSurvey = ({
        )}>
        {previewMode === "mobile" && (
          <>
-            <p className="absolute left-0 top-0 m-2 rounded bg-slate-100 px-2 py-1 text-xs text-slate-400">
+            <p className="absolute top-0 left-0 m-2 rounded bg-slate-100 px-2 py-1 text-xs text-slate-400">
              Preview
            </p>
-            <div className="absolute right-0 top-0 m-2">
+            <div className="absolute top-0 right-0 m-2">
              <ResetProgressButton onClick={resetProgress} />
            </div>
            <MediaBackground
@@ -265,7 +265,7 @@ export const PreviewSurvey = ({
                </Modal>
              ) : (
                <div className="flex h-full w-full flex-col justify-center px-1">
-                  <div className="absolute left-5 top-5">
+                  <div className="absolute top-5 left-5">
                    {!styling.isLogoHidden && (
                      <ClientLogo
                        environmentId={environment.id}
@@ -296,7 +296,7 @@ export const PreviewSurvey = ({
          </>
        )}
        {previewMode === "desktop" && (
-          <div className="flex h-full w-full flex-1 flex-col">
+          <div className="flex h-full flex-1 flex-col">
            <div className="flex h-8 w-full items-center rounded-t-lg bg-slate-100">
              <div className="ml-6 flex space-x-2">
                <div className="h-3 w-3 rounded-full bg-red-500"></div>
@@ -373,7 +373,7 @@ export const PreviewSurvey = ({
                styling={styling}
                ContentRef={ContentRef as React.RefObject<HTMLDivElement>}
                isEditorView>
-                <div className="absolute left-5 top-5">
+                <div className="absolute top-5 left-5">
                  {!styling.isLogoHidden && (
                    <ClientLogo
                      environmentId={environment.id}
--- a/apps/web/modules/ui/components/survey/index.tsx
+++ b/apps/web/modules/ui/components/survey/index.tsx
@@ -40,10 +40,7 @@ export const SurveyInline = (props: Omit<SurveyContainerProps, "containerId">) =
    isLoadingScript = true;
    try {
      const scriptUrl = props.appUrl ? `${props.appUrl}/js/surveys.umd.cjs` : "/js/surveys.umd.cjs";
-      const response = await fetch(
-        scriptUrl,
-        process.env.NODE_ENV === "development" ? { cache: "no-store" } : {}
-      );
+      const response = await fetch(scriptUrl);

      if (!response.ok) {
        throw new Error("Failed to load the surveys package");
--- a/apps/web/next.config.mjs
+++ b/apps/web/next.config.mjs
@@ -405,14 +405,6 @@ const nextConfig = {
  },
  async rewrites() {
    return [
-      {
-        source: "/hub",
-        destination: "https://hub.stldocs.app",
-      },
-      {
-        source: "/hub/:path*",
-        destination: "https://hub.stldocs.app/:path*",
-      },
      {
        source: "/api/packages/website",
        destination: "/js/formbricks.umd.cjs",
@@ -490,4 +482,5 @@ const sentryOptions = {
 // Runtime Sentry reporting still depends on DSN being set via environment variables
 const exportConfig = process.env.SENTRY_AUTH_TOKEN ? withSentryConfig(nextConfig, sentryOptions) : nextConfig;

+
 export default exportConfig;
--- a/apps/web/playwright/survey-styling.spec.ts
+++ b/apps/web/playwright/survey-styling.spec.ts
@@ -96,7 +96,6 @@ test.describe("Survey Styling", async () => {
    expect(css).toContain("--fb-input-background-color: #eeeeee");
    expect(css).toContain("--fb-input-border-color: #cccccc");
    expect(css).toContain("--fb-input-text-color: #024eff");
-    expect(css).toContain("--fb-input-placeholder-color:");
    expect(css).toContain("--fb-input-border-radius: 5px");
    expect(css).toContain("--fb-input-height: 50px");
    expect(css).toContain("--fb-input-font-size: 16px");
--- a/docs/self-hosting/advanced/rate-limiting.mdx
+++ b/docs/self-hosting/advanced/rate-limiting.mdx
@@ -1,94 +1,41 @@
 ---
 title: "Rate Limiting"
-description: "Current request rate limits in Formbricks"
+description: "Rate limiting for Formbricks"
 icon: "timer"
 ---

-Formbricks applies request rate limits to protect against abuse and keep API usage fair.
+To protect the platform from abuse and ensure fair usage, rate limiting is enforced by default on an IP-address basis. If a client exceeds the allowed number of requests within the specified time window, the API will return a `429 Too Many Requests` status code.

-Rate limits are scoped by identifier, depending on the endpoint:
+## Default Rate Limits

- IP hash (for unauthenticated/client-side routes and public actions)
- API key ID (for authenticated API calls)
- User ID (for authenticated session-based calls and server actions)
- Organization ID (for follow-up email dispatch)
+The following rate limits apply to various endpoints:

-When a limit is exceeded, the API returns `429 Too Many Requests`.
+| **Endpoint**            | **Rate Limit** | **Time Window** |
+| ----------------------- | -------------- | --------------- |
+| `POST /login`           | 30 requests    | 15 minutes      |
+| `POST /signup`          | 30 requests    | 60 minutes      |
+| `POST /verify-email`    | 10 requests    | 60 minutes      |
+| `POST /forgot-password` | 5 requests     | 60 minutes      |
+| `GET /client-side-api`  | 100 requests   | 1 minute        |
+| `POST /share`           | 100 requests   | 60 minutes      |

-## Management API Rate Limits
-
-These are the current limits for Management APIs:
-
-| **Route Group** | **Limit** | **Window** | **Identifier** |
-| --- | --- | --- | --- |
-| `/api/v1/management/*` (except `/api/v1/management/storage`), `/api/v1/webhooks/*`, `/api/v1/integrations/*`, `/api/v1/management/me` | 100 requests | 1 minute | API key ID or session user ID |
-| `/api/v2/management/*` (and other v2 authenticated routes that use `authenticatedApiClient`) | 100 requests | 1 minute | API key ID |
-| `POST /api/v1/management/storage` | 5 requests | 1 minute | API key ID or session user ID |
-
-## All Enforced Limits
-
-| **Config** | **Limit** | **Window** | **Identifier** | **Used For** |
-| --- | --- | --- | --- | --- |
-| `auth.login` | 10 requests | 15 minutes | IP hash | Email/password login flow (`/api/auth/callback/credentials`) |
-| `auth.signup` | 30 requests | 60 minutes | IP hash | Signup server action |
-| `auth.forgotPassword` | 5 requests | 60 minutes | IP hash | Forgot password server action |
-| `auth.verifyEmail` | 10 requests | 60 minutes | IP hash | Email verification callback + resend verification action |
-| `api.v1` | 100 requests | 1 minute | API key ID or session user ID | v1 management, webhooks, integrations, and `/api/v1/management/me` |
-| `api.v2` | 100 requests | 1 minute | API key ID | v2 authenticated API wrapper (`authenticatedApiClient`) |
-| `api.client` | 100 requests | 1 minute | IP hash | v1 client API routes (except `/api/v1/client/og` and storage upload override), plus v2 routes that re-use those v1 handlers |
-| `storage.upload` | 5 requests | 1 minute | IP hash or authenticated ID | Client storage upload and management storage upload |
-| `storage.delete` | 5 requests | 1 minute | API key ID or session user ID | `DELETE /storage/[environmentId]/[accessType]/[fileName]` |
-| `actions.emailUpdate` | 3 requests | 60 minutes | User ID | Profile email update action |
-| `actions.surveyFollowUp` | 50 requests | 60 minutes | Organization ID | Survey follow-up email processing |
-| `actions.sendLinkSurveyEmail` | 10 requests | 60 minutes | IP hash | Link survey email send action |
-| `actions.licenseRecheck` | 5 requests | 1 minute | User ID | Enterprise license recheck action |
-
-## Current Endpoint Exceptions
-
-The following routes are currently not rate-limited by the server-side limiter:
-
- `GET /api/v1/client/og` (explicitly excluded)
- `POST /api/v2/client/[environmentId]/responses`
- `POST /api/v2/client/[environmentId]/displays`
- `GET /api/v2/health`
-
-## 429 Response Shape
-
-v1-style endpoints return:
+If a request exceeds the defined rate limit, the server will respond with:

 ```json
 {
-  "code": "too_many_requests",
-  "message": "Maximum number of requests reached. Please try again later.",
-  "details": {}
-}
-```
-
-v2-style endpoints return:
-
-```json
-{
-  "error": {
-    "code": 429,
-    "message": "Too Many Requests"
-  }
+  "code": 429,
+  "error": "Too many requests, Please try after a while!"
 }
 ```

 ## Disabling Rate Limiting

-For self-hosters, rate limiting can be disabled if necessary. We strongly recommend keeping it enabled in production.
+For self-hosters, rate limiting can be disabled if necessary. However, we **strongly recommend keeping rate limiting enabled in production environments** to prevent abuse.

-Set:
+To disable rate limiting, set the following environment variable:

 ```bash
 RATE_LIMITING_DISABLED=1
 ```

-After changing this value, restart the server.
-
-## Operational Notes
-
- Redis/Valkey is required for robust rate limiting (`REDIS_URL`).
- If Redis is unavailable at runtime, rate-limiter checks currently fail open (requests are allowed through without enforcement).
- Authentication failure audit logging uses a separate throttle (`shouldLogAuthFailure()`) and is intentionally **fail-closed**: when Redis is unavailable or errors occur, audit log entries are **skipped entirely** rather than written without throttle control. This prevents spam while preserving the hash-integrity chain required for compliance. In other words, if Redis is down, no authentication-failure audit logs will be recorded—requests themselves are still allowed (fail-open rate limiting above), but the audit trail for those failures will not be written.
+After making this change, restart your server to apply the new setting.
--- a/docs/xm-and-surveys/xm/best-practices/cancel-subscription.mdx
+++ b/docs/xm-and-surveys/xm/best-practices/cancel-subscription.mdx
@@ -16,6 +16,8 @@ The Churn Survey is among the most effective ways to identify weaknesses in your

 * Follow-up to prevent bad reviews

+* Coming soon: Make survey mandatory
+
 ## Overview

 To run the Churn Survey in your app you want to proceed as follows:
@@ -78,6 +80,13 @@ Whenever a user visits this page, matches the filter conditions above and the re

 Here is our complete [Actions manual](/xm-and-surveys/surveys/website-app-surveys/actions/) covering [No-Code](/xm-and-surveys/surveys/website-app-surveys/actions#setting-up-no-code-actions) and [Code](/xm-and-surveys/surveys/website-app-surveys/actions#setting-up-code-actions) Actions.

+<Note>
+  Pre-churn flow coming soon We’re currently building full-screen survey
+  pop-ups. You’ll be able to prevent users from closing the survey unless they
+  respond to it. It’s certainly debatable if you want that but you could force
+  them to click through the survey before letting them cancel 🤷
+</Note>
+
 ### 5. Select Action in the “When to ask” card

 ![Select feedback button action](/images/xm-and-surveys/xm/best-practices/cancel-subscription/select-action.webp)
--- a/docs/xm-and-surveys/xm/best-practices/improve-trial-cr.mdx
+++ b/docs/xm-and-surveys/xm/best-practices/improve-trial-cr.mdx
@@ -46,7 +46,13 @@ _Want to change the button color? Adjust it in the project settings!_

 Save, and move over to the **Audience** tab.

-### 3. Pre-segment your audience
+### 3. Pre-segment your audience (coming soon)
+
+<Note>
+### Filter by Attribute Coming Soon
+
+We're working on pre-segmenting users by attributes. This manual will be updated in the coming days.
+</Note>

 Pre-segmentation isn't needed for this survey since you likely want to target all users who cancel their trial. You can use a specific user action, like clicking **Cancel Trial**, to show the survey only to users trying your product.

@@ -56,13 +62,13 @@ How you trigger your survey depends on your product. There are two options:

 - **Trigger by Page view:** If you have a page like `/trial-cancelled` for users who cancel their trial subscription, create a user action with the type "Page View." Select "Limit to specific pages" and apply URL filters with these settings:

-![Add page URL action](/images/xm-and-surveys/xm/best-practices/improve-trial-cr/action-pageurl.webp)
+![Change text content](/images/xm-and-surveys/xm/best-practices/improve-trial-cr/action-pageurl.webp)

 Whenever a user visits this page, the survey will be displayed ✅

 - **Trigger by Button Click:** In a different case, you have a “Cancel Trial" button in your app. You can setup a user Action with the `Inner Text`:

-![Add inner text action](/images/xm-and-surveys/xm/best-practices/improve-trial-cr/action-innertext.webp)
+![Change text content](/images/xm-and-surveys/xm/best-practices/improve-trial-cr/action-innertext.webp)

 Please have a look at our complete [Actions manual](/xm-and-surveys/surveys/website-app-surveys/actions) if you have questions.

--- a/docs/xm-and-surveys/xm/best-practices/interview-prompt.mdx
+++ b/docs/xm-and-surveys/xm/best-practices/interview-prompt.mdx
@@ -54,7 +54,13 @@ In the button settings you have to make sure it is set to “External URL”. In

 Save, and move over to the “Audience” tab.

-### 3. Pre-segment your audience
+### 3. Pre-segment your audience (coming soon)
+
+<Note>
+  ## Filter by attribute coming soon. We're working on pre-segmenting users by
+
+  attributes. We will update this manual in the next few days.
+</Note>

 Once you clicked over to the “Audience” tab you can change the settings. In the **Who To Send** card, select “Filter audience by attribute”. This allows you to only show the prompt to a specific segment of your user base.

--- a/packages/survey-ui/src/styles/globals.css
+++ b/packages/survey-ui/src/styles/globals.css
@@ -127,12 +127,12 @@
  --fb-input-font-size: 14px;
  --fb-input-font-weight: 400;
  --fb-input-color: #414b5a;
-  --fb-input-placeholder-color: var(--fb-input-text-color, var(--fb-input-color));
+  --fb-input-placeholder-color: var(--fb-input-color);
  --fb-input-placeholder-opacity: 0.5;
  --fb-input-width: 100%;
-  --fb-input-height: 20px;
-  --fb-input-padding-x: 8px;
-  --fb-input-padding-y: 8px;
+  --fb-input-height: 40px;
+  --fb-input-padding-x: 16px;
+  --fb-input-padding-y: 16px;
  --fb-input-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05);

  /* ── Progress Bar ──────────────────────────────────────────────────── */
@@ -244,4 +244,4 @@

 #fbjs textarea::-webkit-scrollbar-thumb:hover {
  background-color: hsl(215.4 16.3% 46.9% / 0.5);
-}
+}
--- a/packages/surveys/src/lib/styles.test.ts
+++ b/packages/surveys/src/lib/styles.test.ts
@@ -443,39 +443,6 @@ describe("addCustomThemeToDom", () => {
    expect(variables["--fb-button-font-size"]).toBe("1.5rem");
  });

-  test("should derive input-placeholder-color from inputTextColor when set", () => {
-    const styling: TSurveyStyling = {
-      ...getBaseProjectStyling(),
-      questionColor: { light: "#AABBCC" },
-      inputTextColor: { light: "#112233" },
-    };
-    addCustomThemeToDom({ styling });
-    const styleElement = document.getElementById("formbricks__css__custom") as HTMLStyleElement;
-    const variables = getCssVariables(styleElement);
-
-    // Placeholder should be derived from inputTextColor, not questionColor
-    expect(variables["--fb-input-placeholder-color"]).toBeDefined();
-    expect(variables["--fb-placeholder-color"]).toBeDefined();
-    // Both should be based on inputTextColor (#112233) mixed with white, not questionColor (#AABBCC)
-    // We can verify by checking the placeholder color doesn't contain the questionColor mix
-    expect(variables["--fb-input-placeholder-color"]).toBe(variables["--fb-placeholder-color"]);
-  });
-
-  test("should derive input-placeholder-color from questionColor when inputTextColor is not set", () => {
-    const styling: TSurveyStyling = {
-      ...getBaseProjectStyling(),
-      questionColor: { light: "#AABBCC" },
-    };
-    addCustomThemeToDom({ styling });
-    const styleElement = document.getElementById("formbricks__css__custom") as HTMLStyleElement;
-    const variables = getCssVariables(styleElement);
-
-    // Placeholder should fall back to questionColor when inputTextColor is not set
-    expect(variables["--fb-input-placeholder-color"]).toBeDefined();
-    expect(variables["--fb-placeholder-color"]).toBeDefined();
-    expect(variables["--fb-input-placeholder-color"]).toBe(variables["--fb-placeholder-color"]);
-  });
-
  test("should set signature and branding text colors for dark questionColor", () => {
    const styling = getBaseProjectStyling({
      questionColor: { light: "#202020" }, // A dark color
--- a/packages/surveys/src/lib/styles.ts
+++ b/packages/surveys/src/lib/styles.ts
@@ -111,10 +111,8 @@ export const addCustomThemeToDom = ({ styling }: { styling: TProjectStyling | TS
  // Backwards-compat: legacy variables still used by some consumers/tests
  appendCssVariable("subheading-color", styling.questionColor?.light);

-  const placeholderBaseColor = styling.inputTextColor?.light ?? styling.questionColor?.light;
-  if (placeholderBaseColor) {
-    appendCssVariable("placeholder-color", mixColor(placeholderBaseColor, "#ffffff", 0.3));
-    appendCssVariable("input-placeholder-color", mixColor(placeholderBaseColor, "#ffffff", 0.3));
+  if (styling.questionColor?.light) {
+    appendCssVariable("placeholder-color", mixColor(styling.questionColor.light, "#ffffff", 0.3));
  }

  appendCssVariable("border-color", styling.inputBorderColor?.light);
@@ -194,13 +192,8 @@ export const addCustomThemeToDom = ({ styling }: { styling: TProjectStyling | TS
  }

  // Buttons (Advanced)
-  const buttonBg = styling.buttonBgColor?.light ?? styling.brandColor?.light;
-  let buttonText = styling.buttonTextColor?.light;
-  if (buttonText === undefined && buttonBg) {
-    buttonText = isLight(buttonBg) ? "#0f172a" : "#ffffff";
-  }
-  appendCssVariable("button-bg-color", buttonBg);
-  appendCssVariable("button-text-color", buttonText);
+  appendCssVariable("button-bg-color", styling.buttonBgColor?.light);
+  appendCssVariable("button-text-color", styling.buttonTextColor?.light);
  if (styling.buttonBorderRadius !== undefined)
    appendCssVariable("button-border-radius", formatDimension(styling.buttonBorderRadius));
  if (styling.buttonHeight !== undefined)
@@ -216,11 +209,7 @@ export const addCustomThemeToDom = ({ styling }: { styling: TProjectStyling | TS

  // Inputs (Advanced)
  appendCssVariable("input-background-color", styling.inputBgColor?.light ?? styling.inputColor?.light);
-  const inputTextColor = styling.inputTextColor?.light ?? styling.questionColor?.light;
-  appendCssVariable("input-text-color", inputTextColor);
-  if (inputTextColor) {
-    appendCssVariable("input-placeholder-color", mixColor(inputTextColor, "#ffffff", 0.3));
-  }
+  appendCssVariable("input-text-color", styling.inputTextColor?.light);
  if (styling.inputBorderRadius !== undefined)
    appendCssVariable("input-border-radius", formatDimension(styling.inputBorderRadius));
  if (styling.inputHeight !== undefined)
@@ -236,8 +225,8 @@ export const addCustomThemeToDom = ({ styling }: { styling: TProjectStyling | TS
  appendCssVariable("input-shadow", styling.inputShadow);

  // Options (Advanced)
-  appendCssVariable("option-bg-color", styling.optionBgColor?.light ?? styling.inputColor?.light);
-  appendCssVariable("option-label-color", styling.optionLabelColor?.light ?? styling.questionColor?.light);
+  appendCssVariable("option-bg-color", styling.optionBgColor?.light);
+  appendCssVariable("option-label-color", styling.optionLabelColor?.light);
  if (styling.optionBorderRadius !== undefined)
    appendCssVariable("option-border-radius", formatDimension(styling.optionBorderRadius));
  if (styling.optionPaddingX !== undefined)
@@ -288,15 +277,8 @@ export const addCustomThemeToDom = ({ styling }: { styling: TProjectStyling | TS
  // Implicitly set the progress track border radius to the roundness of the card
  appendCssVariable("progress-track-border-radius", formatDimension(roundness));

-  appendCssVariable(
-    "progress-track-bg-color",
-    styling.progressTrackBgColor?.light ??
-      (styling.brandColor?.light ? mixColor(styling.brandColor.light, "#ffffff", 0.8) : undefined)
-  );
-  appendCssVariable(
-    "progress-indicator-bg-color",
-    styling.progressIndicatorBgColor?.light ?? styling.brandColor?.light
-  );
+  appendCssVariable("progress-track-bg-color", styling.progressTrackBgColor?.light);
+  appendCssVariable("progress-indicator-bg-color", styling.progressIndicatorBgColor?.light);

  // Close the #fbjs variable block
  cssVariables += "}\n";
@@ -322,7 +304,7 @@ export const addCustomThemeToDom = ({ styling }: { styling: TProjectStyling | TS
    headlineDecls += "  font-size: var(--fb-element-headline-font-size) !important;\n";
  if (styling.elementHeadlineFontWeight !== undefined && styling.elementHeadlineFontWeight !== null)
    headlineDecls += "  font-weight: var(--fb-element-headline-font-weight) !important;\n";
-  if (styling.elementHeadlineColor?.light || styling.questionColor?.light)
+  if (styling.elementHeadlineColor?.light)
    headlineDecls += "  color: var(--fb-element-headline-color) !important;\n";
  addRule("#fbjs .label-headline,\n#fbjs .label-headline *", headlineDecls);

@@ -332,7 +314,7 @@ export const addCustomThemeToDom = ({ styling }: { styling: TProjectStyling | TS
    descriptionDecls += "  font-size: var(--fb-element-description-font-size) !important;\n";
  if (styling.elementDescriptionFontWeight !== undefined && styling.elementDescriptionFontWeight !== null)
    descriptionDecls += "  font-weight: var(--fb-element-description-font-weight) !important;\n";
-  if (styling.elementDescriptionColor?.light || styling.questionColor?.light)
+  if (styling.elementDescriptionColor?.light)
    descriptionDecls += "  color: var(--fb-element-description-color) !important;\n";
  addRule("#fbjs .label-description,\n#fbjs .label-description *", descriptionDecls);

@@ -342,7 +324,7 @@ export const addCustomThemeToDom = ({ styling }: { styling: TProjectStyling | TS
    upperDecls += "  font-size: var(--fb-element-upper-label-font-size) !important;\n";
  if (styling.elementUpperLabelFontWeight !== undefined && styling.elementUpperLabelFontWeight !== null)
    upperDecls += "  font-weight: var(--fb-element-upper-label-font-weight) !important;\n";
-  if (styling.elementUpperLabelColor?.light || styling.questionColor?.light) {
+  if (styling.elementUpperLabelColor?.light) {
    upperDecls += "  color: var(--fb-element-upper-label-color) !important;\n";
    upperDecls += "  opacity: var(--fb-element-upper-label-opacity, 1) !important;\n";
  }
@@ -350,10 +332,9 @@ export const addCustomThemeToDom = ({ styling }: { styling: TProjectStyling | TS

  // --- Buttons ---
  let buttonDecls = "";
-  if (styling.buttonBgColor?.light || styling.brandColor?.light)
+  if (styling.buttonBgColor?.light)
    buttonDecls += "  background-color: var(--fb-button-bg-color) !important;\n";
-  if (styling.buttonTextColor?.light || styling.brandColor?.light)
-    buttonDecls += "  color: var(--fb-button-text-color) !important;\n";
+  if (styling.buttonTextColor?.light) buttonDecls += "  color: var(--fb-button-text-color) !important;\n";
  if (styling.buttonBorderRadius !== undefined)
    buttonDecls += "  border-radius: var(--fb-button-border-radius) !important;\n";
  if (styling.buttonHeight !== undefined) buttonDecls += "  height: var(--fb-button-height) !important;\n";
@@ -374,11 +355,11 @@ export const addCustomThemeToDom = ({ styling }: { styling: TProjectStyling | TS
  // --- Options ---
  if (styling.optionBorderRadius !== undefined)
    addRule("#fbjs .rounded-option", "  border-radius: var(--fb-option-border-radius) !important;\n");
-  if (styling.optionBgColor?.light || styling.inputColor?.light)
+  if (styling.optionBgColor?.light)
    addRule("#fbjs .bg-option-bg", "  background-color: var(--fb-option-bg-color) !important;\n");

  let optionLabelDecls = "";
-  if (styling.optionLabelColor?.light || styling.questionColor?.light)
+  if (styling.optionLabelColor?.light)
    optionLabelDecls += "  color: var(--fb-option-label-color) !important;\n";
  if (styling.optionFontSize !== undefined)
    optionLabelDecls += "  font-size: var(--fb-option-font-size) !important;\n";
@@ -404,8 +385,7 @@ export const addCustomThemeToDom = ({ styling }: { styling: TProjectStyling | TS
    addRule("#fbjs .border-input-border", "  border-color: var(--fb-input-border-color) !important;\n");

  let inputTextDecls = "";
-  if (styling.inputTextColor?.light || styling.questionColor?.light)
-    inputTextDecls += "  color: var(--fb-input-text-color) !important;\n";
+  if (styling.inputTextColor?.light) inputTextDecls += "  color: var(--fb-input-text-color) !important;\n";
  if (styling.inputFontSize !== undefined)
    inputTextDecls += "  font-size: var(--fb-input-font-size) !important;\n";
  addRule("#fbjs .text-input-text", inputTextDecls);