diff --git a/app/components/settings/Settings.tsx b/app/components/settings/Settings.tsx
index 583442e..2f149f3 100644
--- a/app/components/settings/Settings.tsx
+++ b/app/components/settings/Settings.tsx
@@ -159,14 +159,18 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
       fontFamily,
       fontSize,
       selectedTheme,
-      faqBackgroundColor,
-      faqHeadingColor,
-      faqItemBackgroundColor,
-      faqItemHeadingColor,
-      faqItemTextColor,
-      faqItemHoverBackgroundColor,
-      popupBackgroundColor,
-      overlayTextColor,
+      faqSettings: {
+        faqBackgroundColor,
+        faqHeadingColor,
+        faqItemBackgroundColor,
+        faqItemHeadingColor,
+        faqItemTextColor,
+        faqItemHoverBackgroundColor,
+      },
+      popupSettings: {
+        popupBackgroundColor,
+        overlayTextColor,
+      },
       primaryColor,
       secondaryColor,
       accentColor,
@@ -313,6 +317,8 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
     const flattenedSettings = {
       ...settings.userPreferences,
       ...settings.theme,
+      ...settings.theme.faqSettings,
+      ...settings.theme.popupSettings,
       ...settings.apiKeys,
       ...settings.generalSettings,
     };
@@ -323,6 +329,8 @@ const Settings: React.FC<{ closeSettings: () => void; accountName: string }> = (
   }, [
     ...Object.values(settings.userPreferences),
     ...Object.values(settings.theme),
+    ...Object.values(settings.theme.faqSettings),
+    ...Object.values(settings.theme.popupSettings),
     ...Object.values(settings.apiKeys),
     ...Object.values(settings.generalSettings),
   ]);