diff --git a/calendar-integration/apple-calendar-utils.js b/calendar-integration/apple-calendar-utils.js
index 779a4ab..099c8dc 100644
--- a/calendar-integration/apple-calendar-utils.js
+++ b/calendar-integration/apple-calendar-utils.js
@@ -2,8 +2,9 @@ import * as Calendar from 'expo-calendar';
 
 export async function fetchiPhoneCalendarEvents(familyId, email, startDate, endDate) {
     try {
-        const {status} = await Calendar.requestCalendarPermissionsAsync();
-        if (status !== 'granted') {
+        const {granted} = await Calendar.requestCalendarPermissionsAsync();
+
+        if (!granted) {
             throw new Error("Calendar permission not granted");
         }
 
@@ -22,7 +23,11 @@ export async function fetchiPhoneCalendarEvents(familyId, email, startDate, endD
         return events.map((event) => {
             let isAllDay = event.allDay || false;
             const startDateTime = new Date(event.startDate);
-            const endDateTime = new Date(event.endDate);
+            let endDateTime = new Date(event.endDate);
+
+            if (isAllDay) {
+                endDateTime = startDateTime
+            }
 
             return {
                 id: event.id,
diff --git a/calendar-integration/google-calendar-utils.js b/calendar-integration/google-calendar-utils.js
index 982ab4e..c68b7b1 100644
--- a/calendar-integration/google-calendar-utils.js
+++ b/calendar-integration/google-calendar-utils.js
@@ -8,7 +8,9 @@ export async function fetchGoogleCalendarEvents(token, email, familyId, startDat
     },
   );
 
+
   const data = await response.json();
+
   const googleEvents = [];
   data.items?.forEach((item) => {
     let isAllDay = false;
@@ -49,5 +51,5 @@ export async function fetchGoogleCalendarEvents(token, email, familyId, startDat
     googleEvents.push(googleEvent);
   });
 
-  return googleEvents;
+  return {googleEvents, success: response.ok};
 }
diff --git a/components/pages/grocery/AddGroceryItem.tsx b/components/pages/grocery/AddGroceryItem.tsx
index ec5c7f2..c177d2c 100644
--- a/components/pages/grocery/AddGroceryItem.tsx
+++ b/components/pages/grocery/AddGroceryItem.tsx
@@ -1,10 +1,12 @@
-import {StyleSheet} from "react-native";
+import {Dimensions, StyleSheet} from "react-native";
 import React from "react";
 import {Button, View,} from "react-native-ui-lib";
 import {useGroceryContext} from "@/contexts/GroceryContext";
 import {FontAwesome6} from "@expo/vector-icons";
 import PlusIcon from "@/assets/svgs/PlusIcon";
 
+const { width } = Dimensions.get("screen");
+
 const AddGroceryItem = () => {
     const {setIsAddingGrocery} = useGroceryContext();
 
@@ -65,8 +67,14 @@ const styles = StyleSheet.create({
         marginVertical: 10,
     },
     btnContainer: {
-        width: "100%",
+        position:"absolute",
+        bottom: 30,
+        width: width,
+        padding: 20,
+        paddingBottom: 0,
         justifyContent: "center",
+        alignItems:"center",
+        zIndex: 10,
     },
     finishShopBtn: {
         width: "100%",
diff --git a/components/pages/main/SignInPage.tsx b/components/pages/main/SignInPage.tsx
index b7d9160..f18d0c5 100644
--- a/components/pages/main/SignInPage.tsx
+++ b/components/pages/main/SignInPage.tsx
@@ -1,218 +1,214 @@
-import {
-  Button,
-  ButtonSize,
-  Dialog,
-  Text,
-  TextField,
-  TextFieldRef,
-  View,
-} from "react-native-ui-lib";
-import React, { useRef, useState } from "react";
-import { useSignIn } from "@/hooks/firebase/useSignIn";
-import { StyleSheet } from "react-native";
+import {Button, ButtonSize, Dialog, Text, TextField, TextFieldRef, View,} from "react-native-ui-lib";
+import React, {useRef, useState} from "react";
+import {useSignIn} from "@/hooks/firebase/useSignIn";
+import {StyleSheet} from "react-native";
 import Toast from "react-native-toast-message";
-import { useLoginWithQrCode } from "@/hooks/firebase/useLoginWithQrCode";
-import { Camera, CameraView } from "expo-camera";
+import {useLoginWithQrCode} from "@/hooks/firebase/useLoginWithQrCode";
+import {Camera, CameraView} from "expo-camera";
 
 const SignInPage = ({
-  setTab,
-}: {
-  setTab: React.Dispatch<
-    React.SetStateAction<"register" | "login" | "reset-password">
-  >;
+                        setTab,
+                    }: {
+    setTab: React.Dispatch<
+        React.SetStateAction<"register" | "login" | "reset-password">
+    >;
 }) => {
-  const [email, setEmail] = useState<string>("");
-  const [password, setPassword] = useState<string>("");
-  const [hasPermission, setHasPermission] = useState<boolean | null>(null);
-  const [showCameraDialog, setShowCameraDialog] = useState<boolean>(false);
-  const passwordRef = useRef<TextFieldRef>(null);
+    const [email, setEmail] = useState<string>("");
+    const [password, setPassword] = useState<string>("");
+    const [hasPermission, setHasPermission] = useState<boolean | null>(null);
+    const [showCameraDialog, setShowCameraDialog] = useState<boolean>(false);
+    const passwordRef = useRef<TextFieldRef>(null);
 
-  const { mutateAsync: signIn, error, isError } = useSignIn();
-  const { mutateAsync: signInWithQrCode } = useLoginWithQrCode();
+    const {mutateAsync: signIn, error, isError} = useSignIn();
+    const {mutateAsync: signInWithQrCode} = useLoginWithQrCode();
 
-  const handleSignIn = async () => {
-    await signIn({ email, password });
-    if (!isError) {
-      Toast.show({
-        type: "success",
-        text1: "Login successful!",
-      });
-    } else {
-      Toast.show({
-        type: "error",
-        text1: "Error logging in",
-        text2: `${error}`,
-      });
-    }
-  };
+    const handleSignIn = async () => {
+        await signIn({email, password});
+        if (!isError) {
+            Toast.show({
+                type: "success",
+                text1: "Login successful!",
+            });
+        } else {
+            Toast.show({
+                type: "error",
+                text1: "Error logging in",
+                text2: `${error}`,
+            });
+        }
+    };
 
-  const handleQrCodeScanned = async ({ data }: { data: string }) => {
-    setShowCameraDialog(false);
-    try {
-      await signInWithQrCode({ userId: data });
-      Toast.show({
-        type: "success",
-        text1: "Login successful with QR code!",
-      });
-    } catch (err) {
-      Toast.show({
-        type: "error",
-        text1: "Error logging in with QR code",
-        text2: `${err}`,
-      });
-    }
-  };
+    const handleQrCodeScanned = async ({data}: { data: string }) => {
+        setShowCameraDialog(false);
+        try {
+            await signInWithQrCode({userId: data});
+            Toast.show({
+                type: "success",
+                text1: "Login successful with QR code!",
+            });
+        } catch (err) {
+            Toast.show({
+                type: "error",
+                text1: "Error logging in with QR code",
+                text2: `${err}`,
+            });
+        }
+    };
 
-  const getCameraPermissions = async (callback: () => void) => {
-    const { status } = await Camera.requestCameraPermissionsAsync();
-    setHasPermission(status === "granted");
-    if (status === "granted") {
-      callback();
-    }
-  };
+    const getCameraPermissions = async (callback: () => void) => {
+        const {status} = await Camera.requestCameraPermissionsAsync();
+        setHasPermission(status === "granted");
+        if (status === "granted") {
+            callback();
+        }
+    };
 
-  return (
-    <View padding-10 centerV height={"100%"}>
-      <TextField
-        placeholder="Email"
-        value={email}
-        
-        onChangeText={setEmail}
-        style={styles.textfield}
-        onSubmitEditing={() => {
-          // Move focus to the description field
-          passwordRef.current?.focus();
-        }}
-      />
-      <TextField
-      ref={passwordRef}
-        placeholder="Password"
-        value={password}
-        onChangeText={setPassword}
-        secureTextEntry
-        style={styles.textfield}
-      />
-      <Button
-        label="Log in"
-        marginT-50
-        labelStyle={{
-          fontFamily: "PlusJakartaSans_600SemiBold",
-          fontSize: 16,
-        }}
-        onPress={handleSignIn}
-        style={{ marginBottom: 20, height: 50 }}
-        backgroundColor="#fd1775"
-      />
-      <Button
-        label="Log in with a QR Code"
-        labelStyle={{
-          fontFamily: "PlusJakartaSans_600SemiBold",
-          fontSize: 16,
-        }}
-        onPress={() => {
-          getCameraPermissions(() => setShowCameraDialog(true));
-        }}
-        style={{ marginBottom: 20, height: 50 }}
-        backgroundColor="#fd1775"
-      />
-      {isError && (
-        <Text center style={{ marginBottom: 20 }}>{`${
-          error?.toString()?.split("]")?.[1]
-        }`}</Text>
-      )}
+    return (
+        <View padding-10 centerV height={"100%"}>
+            <TextField
+                placeholder="Email"
+                keyboardType={"email-address"}
+                returnKeyType={"next"}
+                textContentType={"emailAddress"}
+                defaultValue={email}
+                onChangeText={setEmail}
+                style={styles.textfield}
+                onSubmitEditing={() => {
+                    // Move focus to the description field
+                    passwordRef.current?.focus();
+                }}
+            />
+            <TextField
+                ref={passwordRef}
+                placeholder="Password"
+                textContentType={"oneTimeCode"}
+                value={password}
+                onChangeText={setPassword}
+                secureTextEntry
+                style={styles.textfield}
+                autoCorrect={false}
+            />
+            <Button
+                label="Log in"
+                marginT-50
+                labelStyle={{
+                    fontFamily: "PlusJakartaSans_600SemiBold",
+                    fontSize: 16,
+                }}
+                onPress={handleSignIn}
+                style={{marginBottom: 20, height: 50}}
+                backgroundColor="#fd1775"
+            />
+            <Button
+                label="Log in with a QR Code"
+                labelStyle={{
+                    fontFamily: "PlusJakartaSans_600SemiBold",
+                    fontSize: 16,
+                }}
+                onPress={() => {
+                    getCameraPermissions(() => setShowCameraDialog(true));
+                }}
+                style={{marginBottom: 20, height: 50}}
+                backgroundColor="#fd1775"
+            />
+            {isError && (
+                <Text center style={{marginBottom: 20}}>{`${
+                    error?.toString()?.split("]")?.[1]
+                }`}</Text>
+            )}
 
-      <View row centerH marginB-5 gap-5>
-        <Text style={styles.jakartaLight}>Don't have an account?</Text>
-        <Button
-          onPress={() => setTab("register")}
-          label="Sign Up"
-          labelStyle={[
-            styles.jakartaMedium,
-            { textDecorationLine: "none", color: "#fd1575" },
-          ]}
-          link
-          size={ButtonSize.xSmall}
-          padding-0
-          margin-0
-          text70
-          left
-          color="#fd1775"
-        />
-      </View>
+            <View row centerH marginB-5 gap-5>
+                <Text style={styles.jakartaLight}>Don't have an account?</Text>
+                <Button
+                    onPress={() => setTab("register")}
+                    label="Sign Up"
+                    labelStyle={[
+                        styles.jakartaMedium,
+                        {textDecorationLine: "none", color: "#fd1575"},
+                    ]}
+                    link
+                    size={ButtonSize.xSmall}
+                    padding-0
+                    margin-0
+                    text70
+                    left
+                    color="#fd1775"
+                />
+            </View>
 
-      <View row centerH marginB-5 gap-5>
-        <Text text70>Forgot your password?</Text>
-        <Button
-          onPress={() => setTab("reset-password")}
-          label="Reset password"
-          labelStyle={[
-            styles.jakartaMedium,
-            { textDecorationLine: "none", color: "#fd1575" },
-          ]}
-          link
-          size={ButtonSize.xSmall}
-          padding-0
-          margin-0
-          text70
-          left
-          avoidInnerPadding
-          color="#fd1775"
-        />
-      </View>
+            <View row centerH marginB-5 gap-5>
+                <Text text70>Forgot your password?</Text>
+                <Button
+                    onPress={() => setTab("reset-password")}
+                    label="Reset password"
+                    labelStyle={[
+                        styles.jakartaMedium,
+                        {textDecorationLine: "none", color: "#fd1575"},
+                    ]}
+                    link
+                    size={ButtonSize.xSmall}
+                    padding-0
+                    margin-0
+                    text70
+                    left
+                    avoidInnerPadding
+                    color="#fd1775"
+                />
+            </View>
 
-      {/* Camera Dialog */}
-      <Dialog
-        visible={showCameraDialog}
-        onDismiss={() => setShowCameraDialog(false)}
-        bottom
-        width="100%"
-        height="70%"
-        containerStyle={{ padding: 15, backgroundColor:"white" }}
-      >
-        {hasPermission === null ? (
-          <Text>Requesting camera permissions...</Text>
-        ) : !hasPermission ? (
-          <Text>No access to camera</Text>
-        ) : (
-          <CameraView
-            style={{ flex: 1, borderRadius: 15 }}
-            onBarcodeScanned={handleQrCodeScanned}
-            barcodeScannerSettings={{
-              barcodeTypes: ["qr"],
-            }}
-          />
-        )}
-        <Button
-          label="Cancel"
-          onPress={() => setShowCameraDialog(false)}
-          backgroundColor="#fd1775"
-          style={{ margin: 10, marginBottom: 30 }}
-        />
-      </Dialog>
-    </View>
-  );
+            {/* Camera Dialog */}
+            <Dialog
+                visible={showCameraDialog}
+                onDismiss={() => setShowCameraDialog(false)}
+                bottom
+                width="100%"
+                height="70%"
+                containerStyle={{padding: 15, backgroundColor: "white"}}
+            >
+                {hasPermission === null ? (
+                    <Text>Requesting camera permissions...</Text>
+                ) : !hasPermission ? (
+                    <Text>No access to camera</Text>
+                ) : (
+                    <CameraView
+                        style={{flex: 1, borderRadius: 15}}
+                        onBarcodeScanned={handleQrCodeScanned}
+                        barcodeScannerSettings={{
+                            barcodeTypes: ["qr"],
+                        }}
+                    />
+                )}
+                <Button
+                    label="Cancel"
+                    onPress={() => setShowCameraDialog(false)}
+                    backgroundColor="#fd1775"
+                    style={{margin: 10, marginBottom: 30}}
+                />
+            </Dialog>
+        </View>
+    );
 };
 
 const styles = StyleSheet.create({
-  textfield: {
-    backgroundColor: "white",
-    marginVertical: 10,
-    padding: 30,
-    height: 45,
-    borderRadius: 50,
-    fontFamily: "PlusJakartaSans_300Light",
-  },
-  jakartaLight: {
-    fontFamily: "PlusJakartaSans_300Light",
-    fontSize: 16,
-    color: "#484848",
-  },
-  jakartaMedium: {
-    fontFamily: "PlusJakartaSans_500Medium",
-    fontSize: 16,
-    color: "#919191",
-    textDecorationLine: "underline",
-  },
+    textfield: {
+        backgroundColor: "white",
+        marginVertical: 10,
+        padding: 30,
+        height: 45,
+        borderRadius: 50,
+        fontFamily: "PlusJakartaSans_300Light",
+    },
+    jakartaLight: {
+        fontFamily: "PlusJakartaSans_300Light",
+        fontSize: 16,
+        color: "#484848",
+    },
+    jakartaMedium: {
+        fontFamily: "PlusJakartaSans_500Medium",
+        fontSize: 16,
+        color: "#919191",
+        textDecorationLine: "underline",
+    },
 });
 
 export default SignInPage;
diff --git a/components/pages/settings/CalendarSettingsPage.tsx b/components/pages/settings/CalendarSettingsPage.tsx
index 809d877..8b12d7f 100644
--- a/components/pages/settings/CalendarSettingsPage.tsx
+++ b/components/pages/settings/CalendarSettingsPage.tsx
@@ -1,10 +1,10 @@
-import { AntDesign, Ionicons } from "@expo/vector-icons";
-import React, { useCallback, useEffect, useState } from "react";
-import { Button, Checkbox, Text, View } from "react-native-ui-lib";
-import { ActivityIndicator, Alert, ScrollView, StyleSheet } from "react-native";
-import { TouchableOpacity } from "react-native-gesture-handler";
-import { useAuthContext } from "@/contexts/AuthContext";
-import { useUpdateUserData } from "@/hooks/firebase/useUpdateUserData";
+import {AntDesign, Ionicons} from "@expo/vector-icons";
+import React, {useCallback, useEffect, useState} from "react";
+import {Button, Checkbox, Text, View} from "react-native-ui-lib";
+import {ActivityIndicator, ScrollView, StyleSheet} from "react-native";
+import {TouchableOpacity} from "react-native-gesture-handler";
+import {useAuthContext} from "@/contexts/AuthContext";
+import {useUpdateUserData} from "@/hooks/firebase/useUpdateUserData";
 import debounce from "debounce";
 import AppleIcon from "@/assets/svgs/AppleIcon";
 import GoogleIcon from "@/assets/svgs/GoogleIcon";
@@ -12,840 +12,830 @@ import OutlookIcon from "@/assets/svgs/OutlookIcon";
 import * as AuthSession from "expo-auth-session";
 import * as Google from "expo-auth-session/providers/google";
 import * as WebBrowser from "expo-web-browser";
-import { UserProfile } from "@firebase/auth";
-import { useFetchAndSaveGoogleEvents } from "@/hooks/useFetchAndSaveGoogleEvents";
-import { useFetchAndSaveOutlookEvents } from "@/hooks/useFetchAndSaveOutlookEvents";
-import { useFetchAndSaveAppleEvents } from "@/hooks/useFetchAndSaveAppleEvents";
+import {useFetchAndSaveGoogleEvents} from "@/hooks/useFetchAndSaveGoogleEvents";
+import {useFetchAndSaveOutlookEvents} from "@/hooks/useFetchAndSaveOutlookEvents";
+import {useFetchAndSaveAppleEvents} from "@/hooks/useFetchAndSaveAppleEvents";
 import * as AppleAuthentication from "expo-apple-authentication";
 import ExpoLocalization from "expo-localization/src/ExpoLocalization";
-import { colorMap } from "@/constants/colorMap";
-import { useAtom } from "jotai";
-import { settingsPageIndex } from "../calendar/atoms";
+import {colorMap} from "@/constants/colorMap";
+import {useAtom} from "jotai";
+import {settingsPageIndex} from "../calendar/atoms";
 import CalendarSettingsDialog from "./calendar_components/CalendarSettingsDialog";
+import {useClearTokens} from "@/hooks/firebase/useClearTokens";
 
 const googleConfig = {
-  androidClientId:
-    "406146460310-2u67ab2nbhu23trp8auho1fq4om29fc0.apps.googleusercontent.com",
-  iosClientId:
-    "406146460310-2u67ab2nbhu23trp8auho1fq4om29fc0.apps.googleusercontent.com",
-  webClientId:
-    "406146460310-2u67ab2nbhu23trp8auho1fq4om29fc0.apps.googleusercontent.com",
-  scopes: [
-    "email",
-    "profile",
-    "https://www.googleapis.com/auth/calendar.events.owned",
-  ],
+    androidClientId:
+        "406146460310-2u67ab2nbhu23trp8auho1fq4om29fc0.apps.googleusercontent.com",
+    iosClientId:
+        "406146460310-2u67ab2nbhu23trp8auho1fq4om29fc0.apps.googleusercontent.com",
+    webClientId:
+        "406146460310-2u67ab2nbhu23trp8auho1fq4om29fc0.apps.googleusercontent.com",
+    scopes: [
+        "email",
+        "profile",
+        "https://www.googleapis.com/auth/calendar.events.owned",
+    ],
+    extraParams: {
+        access_type: "offline",
+    },
 };
 
 const microsoftConfig = {
-  clientId: "13c79071-1066-40a9-9f71-b8c4b138b4af",
-  redirectUri: AuthSession.makeRedirectUri({ path: "settings" }),
-  scopes: [
-    "openid",
-    "profile",
-    "email",
-    "offline_access",
-    "Calendars.ReadWrite",
-    "User.Read",
-  ],
-  authorizationEndpoint:
-    "https://login.microsoftonline.com/common/oauth2/v2.0/authorize",
-  tokenEndpoint: "https://login.microsoftonline.com/common/oauth2/v2.0/token",
+    clientId: "13c79071-1066-40a9-9f71-b8c4b138b4af",
+    redirectUri: AuthSession.makeRedirectUri({path: "settings"}),
+    scopes: [
+        "openid",
+        "profile",
+        "email",
+        "offline_access",
+        "Calendars.ReadWrite",
+        "User.Read",
+    ],
+    authorizationEndpoint:
+        "https://login.microsoftonline.com/common/oauth2/v2.0/authorize",
+    tokenEndpoint: "https://login.microsoftonline.com/common/oauth2/v2.0/token",
 };
 
 const CalendarSettingsPage = () => {
-  const { profileData } = useAuthContext();
-  const [pageIndex, setPageIndex] = useAtom(settingsPageIndex);
-  const [firstDayOfWeek, setFirstDayOfWeek] = useState<string>(
-    profileData?.firstDayOfWeek ??
-      ExpoLocalization.getCalendars()[0].firstWeekday === 1
-      ? "Mondays"
-      : "Sundays"
-  );
-  const [isModalVisible, setModalVisible] = useState<boolean>(false);
-  const [selectedService, setSelectedService] = useState<
-    "google" | "outlook" | "apple"
-  >("google");
-  const [selectedEmail, setSelectedEmail] = useState<string>("");
+    const {profileData} = useAuthContext();
+    const [pageIndex, setPageIndex] = useAtom(settingsPageIndex);
+    const [firstDayOfWeek, setFirstDayOfWeek] = useState<string>(
+        profileData?.firstDayOfWeek ??
+        ExpoLocalization.getCalendars()[0].firstWeekday === 1
+            ? "Mondays"
+            : "Sundays"
+    );
+    const [isModalVisible, setModalVisible] = useState<boolean>(false);
+    const [selectedService, setSelectedService] = useState<
+        "google" | "outlook" | "apple"
+    >("google");
+    const [selectedEmail, setSelectedEmail] = useState<string>("");
 
-  const showConfirmationDialog = (
-    serviceName: "google" | "outlook" | "apple",
-    email: string
-  ) => {
-    setSelectedService(serviceName);
-    setSelectedEmail(email);
-    setModalVisible(true);
-  };
+    const showConfirmationDialog = (
+        serviceName: "google" | "outlook" | "apple",
+        email: string
+    ) => {
+        setSelectedService(serviceName);
+        setSelectedEmail(email);
+        setModalVisible(true);
+    };
 
-  const handleConfirm = () => {
-    clearToken(selectedService, selectedEmail);
-    setModalVisible(false);
-  };
+    const handleConfirm = () => {
+        clearToken(selectedService, selectedEmail);
+        setModalVisible(false);
+    };
 
-  const handleCancel = () => {
-    setModalVisible(false);
-  };
+    const handleCancel = () => {
+        setModalVisible(false);
+    };
 
-  const [selectedColor, setSelectedColor] = useState<string>(
-    profileData?.eventColor ?? colorMap.pink
-  );
-  const [previousSelectedColor, setPreviousSelectedColor] = useState<string>(
-    profileData?.eventColor ?? colorMap.pink
-  );
+    const [selectedColor, setSelectedColor] = useState<string>(
+        profileData?.eventColor ?? colorMap.pink
+    );
+    const [previousSelectedColor, setPreviousSelectedColor] = useState<string>(
+        profileData?.eventColor ?? colorMap.pink
+    );
 
-  const { mutateAsync: updateUserData } = useUpdateUserData();
-  const { mutateAsync: fetchAndSaveGoogleEvents, isLoading: isSyncingGoogle } =
-    useFetchAndSaveGoogleEvents();
-  const {
-    mutateAsync: fetchAndSaveOutlookEvents,
-    isLoading: isSyncingOutlook,
-  } = useFetchAndSaveOutlookEvents();
-  const { mutateAsync: fetchAndSaveAppleEvents, isLoading: isSyncingApple } =
-    useFetchAndSaveAppleEvents();
+    const {mutateAsync: updateUserData} = useUpdateUserData();
+    const {mutateAsync: clearToken} = useClearTokens();
+    const {mutateAsync: fetchAndSaveGoogleEvents, isLoading: isSyncingGoogle} =
+        useFetchAndSaveGoogleEvents();
+    const {
+        mutateAsync: fetchAndSaveOutlookEvents,
+        isLoading: isSyncingOutlook,
+    } = useFetchAndSaveOutlookEvents();
+    const {mutateAsync: fetchAndSaveAppleEvents, isLoading: isSyncingApple} =
+        useFetchAndSaveAppleEvents();
 
-  WebBrowser.maybeCompleteAuthSession();
-  const [_, response, promptAsync] = Google.useAuthRequest(googleConfig);
+    WebBrowser.maybeCompleteAuthSession();
+    const [_, response, promptAsync] = Google.useAuthRequest(googleConfig);
 
-  useEffect(() => {
-    signInWithGoogle();
-  }, [response]);
+    useEffect(() => {
+        signInWithGoogle();
+    }, [response]);
 
-  const signInWithGoogle = async () => {
-    try {
-      if (response?.type === "success") {
-        const accessToken = response.authentication?.accessToken;
+    const signInWithGoogle = async () => {
+        try {
+            if (response?.type === "success") {
+                const { accessToken, refreshToken } = response?.authentication!;
 
-        const userInfoResponse = await fetch(
-          "https://www.googleapis.com/oauth2/v3/userinfo",
-          {
-            headers: { Authorization: `Bearer ${accessToken}` },
-          }
-        );
+                const userInfoResponse = await fetch(
+                    "https://www.googleapis.com/oauth2/v3/userinfo",
+                    {
+                        headers: { Authorization: `Bearer ${accessToken}` },
+                    }
+                );
 
-        const userInfo = await userInfoResponse.json();
-        const googleMail = userInfo.email;
+                const userInfo = await userInfoResponse.json();
+                const googleMail = userInfo.email;
 
-        let googleAccounts = profileData?.googleAccounts;
-        const updatedGoogleAccounts = googleAccounts
-          ? { ...googleAccounts, [googleMail]: accessToken }
-          : { [googleMail]: accessToken };
+                let googleAccounts = profileData?.googleAccounts || {};
+                const updatedGoogleAccounts = {
+                    ...googleAccounts,
+                    [googleMail]: { accessToken, refreshToken },
+                };
 
-        await updateUserData({
-          newUserData: { googleAccounts: updatedGoogleAccounts },
-        });
+                await updateUserData({
+                    newUserData: { googleAccounts: updatedGoogleAccounts },
+                });
 
-        await fetchAndSaveGoogleEvents({
-          token: accessToken,
-          email: googleMail,
-        });
-      }
-    } catch (error) {
-      console.error("Error during Google sign-in:", error);
-    }
-  };
-
-  const handleMicrosoftSignIn = async () => {
-    try {
-      console.log("Starting Microsoft sign-in...");
-
-      const authRequest = new AuthSession.AuthRequest({
-        clientId: microsoftConfig.clientId,
-        scopes: microsoftConfig.scopes,
-        redirectUri: microsoftConfig.redirectUri,
-        responseType: AuthSession.ResponseType.Code,
-        usePKCE: true, // Enable PKCE
-      });
-
-      console.log("Auth request created:", authRequest);
-
-      const authResult = await authRequest.promptAsync({
-        authorizationEndpoint: microsoftConfig.authorizationEndpoint,
-      });
-
-      console.log("Auth result:", authResult);
-
-      if (authResult.type === "success" && authResult.params?.code) {
-        const code = authResult.params.code;
-        console.log("Authorization code received:", code);
-
-        // Exchange authorization code for tokens
-        const tokenResponse = await fetch(microsoftConfig.tokenEndpoint, {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/x-www-form-urlencoded",
-          },
-          body: `client_id=${
-            microsoftConfig.clientId
-          }&redirect_uri=${encodeURIComponent(
-            microsoftConfig.redirectUri
-          )}&grant_type=authorization_code&code=${code}&code_verifier=${
-            authRequest.codeVerifier
-          }&scope=${encodeURIComponent(
-            "https://graph.microsoft.com/Calendars.ReadWrite offline_access User.Read"
-          )}`,
-        });
-
-        console.log("Token response status:", tokenResponse.status);
-
-        if (!tokenResponse.ok) {
-          const errorText = await tokenResponse.text();
-          console.error("Token exchange failed:", errorText);
-          return;
-        }
-
-        const tokenData = await tokenResponse.json();
-        console.log("Token data received:", tokenData);
-
-        if (tokenData?.access_token) {
-          console.log("Access token received, fetching user info...");
-
-          // Fetch user info from Microsoft Graph API to get the email
-          const userInfoResponse = await fetch(
-            "https://graph.microsoft.com/v1.0/me",
-            {
-              headers: {
-                Authorization: `Bearer ${tokenData.access_token}`,
-              },
+                await fetchAndSaveGoogleEvents({
+                    token: accessToken,
+                    email: googleMail,
+                });
             }
-          );
+        } catch (error) {
+            console.error("Error during Google sign-in:", error);
+        }
+    };
 
-          const userInfo = await userInfoResponse.json();
-          console.log("User info received:", userInfo);
+    const handleMicrosoftSignIn = async () => {
+        try {
+            console.log("Starting Microsoft sign-in...");
 
-          if (userInfo.error) {
-            console.error("Error fetching user info:", userInfo.error);
-          } else {
-            const outlookMail = userInfo.mail || userInfo.userPrincipalName;
-
-            let microsoftAccounts = profileData?.microsoftAccounts;
-            const updatedMicrosoftAccounts = microsoftAccounts
-              ? { ...microsoftAccounts, [outlookMail]: tokenData.access_token }
-              : { [outlookMail]: tokenData.access_token };
-
-            // Update user data with Microsoft token and email
-            await updateUserData({
-              newUserData: { microsoftAccounts: updatedMicrosoftAccounts },
+            const authRequest = new AuthSession.AuthRequest({
+                clientId: microsoftConfig.clientId,
+                scopes: microsoftConfig.scopes,
+                redirectUri: microsoftConfig.redirectUri,
+                responseType: AuthSession.ResponseType.Code,
+                usePKCE: true, // Enable PKCE
             });
 
-            await fetchAndSaveOutlookEvents(
-              tokenData.access_token,
-              outlookMail
-            );
-            console.log("User data updated successfully.");
-          }
-        }
-      } else {
-        console.warn("Authentication was not successful:", authResult);
-      }
-    } catch (error) {
-      console.error("Error during Microsoft sign-in:", error);
-    }
-  };
+            console.log("Auth request created:", authRequest);
 
-  const handleAppleSignIn = async () => {
-    try {
-      console.log("Starting Apple Sign-in...");
+            const authResult = await authRequest.promptAsync({
+                authorizationEndpoint: microsoftConfig.authorizationEndpoint,
+            });
 
-      const credential = await AppleAuthentication.signInAsync({
-        requestedScopes: [
-          AppleAuthentication.AppleAuthenticationScope.EMAIL,
-          AppleAuthentication.AppleAuthenticationScope.FULL_NAME,
-        ],
-      });
+            console.log("Auth result:", authResult);
 
-      console.log("Apple sign-in result:", credential);
+            if (authResult.type === "success" && authResult.params?.code) {
+                const code = authResult.params.code;
+                console.log("Authorization code received:", code);
 
-      const appleToken = credential.identityToken;
-      const appleMail = credential.email;
+                // Exchange authorization code for tokens
+                const tokenResponse = await fetch(microsoftConfig.tokenEndpoint, {
+                    method: "POST",
+                    headers: {
+                        "Content-Type": "application/x-www-form-urlencoded",
+                    },
+                    body: `client_id=${
+                        microsoftConfig.clientId
+                    }&redirect_uri=${encodeURIComponent(
+                        microsoftConfig.redirectUri
+                    )}&grant_type=authorization_code&code=${code}&code_verifier=${
+                        authRequest.codeVerifier
+                    }&scope=${encodeURIComponent(
+                        "https://graph.microsoft.com/Calendars.ReadWrite offline_access User.Read"
+                    )}`,
+                });
 
-      if (appleToken) {
-        console.log("Apple ID token received. Fetch user info if needed...");
+                console.log("Token response status:", tokenResponse.status);
 
-        await updateUserData({
-          newUserData: { appleToken, appleMail },
-        });
+                if (!tokenResponse.ok) {
+                    const errorText = await tokenResponse.text();
+                    console.error("Token exchange failed:", errorText);
+                    return;
+                }
 
-        console.log("User data updated with Apple ID token.");
-        await fetchAndSaveAppleEvents({ token: appleToken, email: appleMail! });
-      } else {
-        console.warn(
-          "Apple authentication was not successful or email was hidden."
-        );
-      }
-    } catch (error) {
-      console.error("Error during Apple Sign-in:", error);
-    }
-  };
+                const tokenData = await tokenResponse.json();
+                console.log("Token data received:", tokenData);
 
-  const debouncedUpdateUserData = useCallback(
-    debounce(async (color: string) => {
-      try {
-        await updateUserData({
-          newUserData: {
-            eventColor: color,
-          },
-        });
-      } catch (error) {
-        console.error("Failed to update color:", error);
-        setSelectedColor(previousSelectedColor);
-      }
-    }, 500),
-    []
-  );
+                if (tokenData?.access_token) {
+                    console.log("Access token received, fetching user info...");
 
-  const debouncedUpdateFirstDayOfWeek = useCallback(
-    debounce(async (firstDayOfWeek: string) => {
-      try {
-        await updateUserData({
-          newUserData: {
-            firstDayOfWeek,
-          },
-        });
-      } catch (error) {
-        console.error("Failed to update first day of week:", error);
-      }
-    }, 500),
-    []
-  );
-
-  const handleChangeFirstDayOfWeek = (firstDayOfWeek: string) => {
-    setFirstDayOfWeek(firstDayOfWeek === "Sundays" ? "Mondays" : "Sundays");
-    debouncedUpdateFirstDayOfWeek(
-      firstDayOfWeek === "Sundays" ? "Mondays" : "Sundays"
-    );
-  };
-
-  const handleChangeColor = (color: string) => {
-    setPreviousSelectedColor(selectedColor);
-    setSelectedColor(color);
-    debouncedUpdateUserData(color);
-  };
-
-  const clearToken = async (
-    provider: "google" | "outlook" | "apple",
-    email: string
-  ) => {
-    const newUserData: Partial<UserProfile> = {};
-    if (provider === "google") {
-      let googleAccounts = profileData?.googleAccounts;
-      if (googleAccounts) {
-        googleAccounts[email] = null;
-        newUserData.googleAccounts = googleAccounts;
-      }
-    } else if (provider === "outlook") {
-      let microsoftAccounts = profileData?.microsoftAccounts;
-      if (microsoftAccounts) {
-        microsoftAccounts[email] = null;
-        newUserData.microsoftAccounts = microsoftAccounts;
-      }
-    } else if (provider === "apple") {
-      let appleAccounts = profileData?.appleAccounts;
-      if (appleAccounts) {
-        appleAccounts[email] = null;
-        newUserData.appleAccounts = appleAccounts;
-      }
-    }
-    await updateUserData({ newUserData });
-  };
-
-  let isConnectedToGoogle = false;
-  if (profileData?.googleAccounts) {
-    Object.values(profileData?.googleAccounts).forEach((item) => {
-      if (item !== null) {
-        isConnectedToGoogle = true;
-        return;
-      }
-    });
-  }
-
-  let isConnectedToMicrosoft = false;
-  const microsoftAccounts = profileData?.microsoftAccounts;
-  if (microsoftAccounts) {
-    Object.values(profileData?.microsoftAccounts).forEach((item) => {
-      if (item !== null) {
-        isConnectedToMicrosoft = true;
-        return;
-      }
-    });
-  }
-
-  let isConnectedToApple = false;
-  if (profileData?.appleAccounts) {
-    Object.values(profileData?.appleAccounts).forEach((item) => {
-      if (item !== null) {
-        isConnectedToApple = true;
-        return;
-      }
-    });
-  }
-
-  return (
-    <ScrollView>
-      <TouchableOpacity onPress={() => setPageIndex(0)}>
-        <View row marginT-20 marginB-20 marginL-20 centerV>
-          <Ionicons
-            name="chevron-back"
-            size={14}
-            color="#979797"
-            style={{ paddingBottom: 3 }}
-          />
-          <Text
-            style={{ fontFamily: "Poppins_400Regular", fontSize: 14.71 }}
-            color="#979797"
-          >
-            Return to main settings
-          </Text>
-        </View>
-      </TouchableOpacity>
-      <View marginH-30 marginB-30>
-        <Text style={styles.subTitle}>Calendar settings</Text>
-        <View style={styles.card}>
-          <Text style={styles.cardTitle} marginB-14>
-            Event Color Preference
-          </Text>
-          <View row spread>
-            <TouchableOpacity onPress={() => handleChangeColor(colorMap.pink)}>
-              <View style={styles.colorBox} backgroundColor={colorMap.pink}>
-                {selectedColor == colorMap.pink && (
-                  <AntDesign name="check" size={30} color="white" />
-                )}
-              </View>
-            </TouchableOpacity>
-            <TouchableOpacity
-              onPress={() => handleChangeColor(colorMap.orange)}
-            >
-              <View style={styles.colorBox} backgroundColor={colorMap.orange}>
-                {selectedColor == colorMap.orange && (
-                  <AntDesign name="check" size={30} color="white" />
-                )}
-              </View>
-            </TouchableOpacity>
-            <TouchableOpacity onPress={() => handleChangeColor(colorMap.green)}>
-              <View style={styles.colorBox} backgroundColor={colorMap.green}>
-                {selectedColor == colorMap.green && (
-                  <AntDesign name="check" size={30} color="white" />
-                )}
-              </View>
-            </TouchableOpacity>
-            <TouchableOpacity onPress={() => handleChangeColor(colorMap.teal)}>
-              <View style={styles.colorBox} backgroundColor={colorMap.teal}>
-                {selectedColor == colorMap.teal && (
-                  <AntDesign name="check" size={30} color="white" />
-                )}
-              </View>
-            </TouchableOpacity>
-            <TouchableOpacity
-              onPress={() => handleChangeColor(colorMap.purple)}
-            >
-              <View style={styles.colorBox} backgroundColor={colorMap.purple}>
-                {selectedColor == colorMap.purple && (
-                  <AntDesign name="check" size={30} color="white" />
-                )}
-              </View>
-            </TouchableOpacity>
-          </View>
-        </View>
-        <View style={styles.card}>
-          <Text style={styles.cardTitle}>Weekly Start Date</Text>
-          <View row marginV-5 marginT-20>
-            <Checkbox
-              value={firstDayOfWeek === "Sundays"}
-              style={styles.checkbox}
-              color="#ea156d"
-              onValueChange={() => handleChangeFirstDayOfWeek("Sundays")}
-            />
-            <View row marginL-8>
-              <Text text70>Sundays</Text>
-              <Text text70 color="gray">
-                {" "}
-                (default)
-              </Text>
-            </View>
-          </View>
-          <View row marginV-5>
-            <Checkbox
-              value={firstDayOfWeek === "Mondays"}
-              style={styles.checkbox}
-              color="#ea156d"
-              onValueChange={() => handleChangeFirstDayOfWeek("Mondays")}
-            />
-            <Text text70 marginL-8>
-              Mondays
-            </Text>
-          </View>
-        </View>
-        <Text style={styles.subTitle} marginT-30 marginB-25>
-          Add Calendar
-        </Text>
-
-        <Button
-          onPress={() => promptAsync()}
-          label={"Connect Google"}
-          labelStyle={styles.addCalLbl}
-          labelProps={{
-            numberOfLines: 2,
-          }}
-          iconSource={() => (
-            <View marginR-15>
-              <GoogleIcon />
-            </View>
-          )}
-          style={styles.addCalBtn}
-          color="black"
-          text70BL
-        />
-        {profileData?.googleAccounts
-          ? Object.keys(profileData?.googleAccounts)?.map((googleMail) => {
-              const googleToken = profileData?.googleAccounts?.[googleMail];
-              return (
-                googleToken && (
-                  <Button
-                    key={googleMail}
-                    onPress={() => {
-                      showConfirmationDialog("google", googleMail);
-                    }}
-                    label={`Disconnect ${googleMail}`}
-                    labelStyle={styles.addCalLbl}
-                    labelProps={{
-                      numberOfLines: 2,
-                    }}
-                    iconSource={() => (
-                      <View marginR-15>
-                        <GoogleIcon />
-                      </View>
-                    )}
-                    style={styles.addCalBtn}
-                    color="black"
-                    text70BL
-                  />
-                )
-              );
-            })
-          : null}
-
-        <Button
-          onPress={() => handleAppleSignIn()}
-          label={"Connect Apple"}
-          labelStyle={styles.addCalLbl}
-          labelProps={{
-            numberOfLines: 2,
-          }}
-          iconSource={() => (
-            <View marginR-15>
-              <AppleIcon />
-            </View>
-          )}
-          style={styles.addCalBtn}
-          color="black"
-          text70BL
-        />
-        {profileData?.appleAccounts
-          ? Object.keys(profileData?.appleAccounts)?.map((appleEmail) => {
-              const appleToken = profileData?.appleAccounts?.[appleEmail];
-              return (
-                appleToken && (
-                  <Button
-                    key={appleEmail}
-                    onPress={() => showConfirmationDialog("apple", appleEmail)}
-                    label={`Disconnect ${appleEmail}`}
-                    labelStyle={styles.addCalLbl}
-                    labelProps={{
-                      numberOfLines: 2,
-                    }}
-                    iconSource={() => (
-                      <View marginR-15>
-                        <AppleIcon />
-                      </View>
-                    )}
-                    style={styles.addCalBtn}
-                    color="black"
-                    text70BL
-                  />
-                )
-              );
-            })
-          : null}
-
-        <Button
-          onPress={() => handleMicrosoftSignIn()}
-          label={"Connect Outlook"}
-          labelStyle={styles.addCalLbl}
-          labelProps={{
-            numberOfLines: 2,
-          }}
-          iconSource={() => (
-            <View marginR-15>
-              <OutlookIcon />
-            </View>
-          )}
-          style={styles.addCalBtn}
-          color="black"
-          text70BL
-        />
-        {profileData?.microsoftAccounts
-          ? Object.keys(profileData?.microsoftAccounts)?.map(
-              (microsoftEmail) => {
-                const microsoftToken =
-                  profileData?.microsoftAccounts?.[microsoftEmail];
-                return (
-                  microsoftToken && (
-                    <Button
-                      key={microsoftEmail}
-                      onPress={() => {
-                        showConfirmationDialog("outlook", microsoftEmail);
-                      }}
-                      label={`Disconnect ${microsoftEmail}`}
-                      labelStyle={styles.addCalLbl}
-                      labelProps={{
-                        numberOfLines: 2,
-                      }}
-                      iconSource={() => (
-                        <View marginR-15>
-                          <OutlookIcon />
-                        </View>
-                      )}
-                      style={styles.addCalBtn}
-                      color="black"
-                      text70BL
-                    />
-                  )
-                );
-              }
-            )
-          : null}
-
-        {(isConnectedToGoogle ||
-          isConnectedToMicrosoft ||
-          isConnectedToApple) && (
-          <>
-            <Text style={styles.subTitle} marginT-30 marginB-20>
-              Connected Calendars
-            </Text>
-
-            <View style={styles.noPaddingCard}>
-              <View style={{ marginTop: 20 }}>
-                {profileData?.googleAccounts &&
-                  Object.keys(profileData?.googleAccounts)?.map(
-                    (googleEmail) => {
-                      const googleToken =
-                        profileData?.googleAccounts?.[googleEmail];
-                      return (
-                        googleToken && (
-                          <TouchableOpacity
-                            onPress={() =>
-                              fetchAndSaveGoogleEvents({
-                                token: googleToken,
-                                email: googleEmail,
-                              })
-                            }
-                          >
-                            <View row paddingR-20 center>
-                              <Button
-                                disabled={isSyncingGoogle}
-                                onPress={() =>
-                                  fetchAndSaveGoogleEvents({
-                                    token: googleToken,
-                                    email: googleEmail,
-                                  })
-                                }
-                                label={`Sync ${googleEmail}`}
-                                labelStyle={styles.addCalLbl}
-                                labelProps={{ numberOfLines: 3 }}
-                                iconSource={() => (
-                                  <View marginR-15>
-                                    <GoogleIcon />
-                                  </View>
-                                )}
-                                style={styles.addCalBtn}
-                                color="black"
-                                text70BL
-                              />
-
-                              {isSyncingGoogle ? (
-                                <ActivityIndicator />
-                              ) : (
-                                <Ionicons
-                                  name={"refresh"}
-                                  size={20}
-                                  color={"#000000"}
-                                />
-                              )}
-                            </View>
-                          </TouchableOpacity>
-                        )
-                      );
-                    }
-                  )}
-
-                {profileData?.appleAccounts &&
-                  Object.keys(profileData?.appleAccounts)?.map((appleEmail) => {
-                    const appleToken = profileData?.appleAccounts?.[appleEmail];
-                    return (
-                      appleToken && (
-                        <TouchableOpacity
-                          onPress={() =>
-                            fetchAndSaveAppleEvents({
-                              email: appleEmail,
-                              token: appleToken,
-                            })
-                          }
-                        >
-                          <View row paddingR-20 center>
-                            <Button
-                              disabled={isSyncingApple}
-                              onPress={() =>
-                                fetchAndSaveAppleEvents({
-                                  email: appleEmail,
-                                  token: appleToken,
-                                })
-                              }
-                              label={`Sync ${appleEmail}`}
-                              labelStyle={styles.addCalLbl}
-                              labelProps={{ numberOfLines: 3 }}
-                              iconSource={() => (
-                                <View marginR-15>
-                                  <AppleIcon />
-                                </View>
-                              )}
-                              style={styles.addCalBtn}
-                              color="black"
-                              text70BL
-                            />
-                            {isSyncingApple ? (
-                              <ActivityIndicator />
-                            ) : (
-                              <Ionicons
-                                name={"refresh"}
-                                size={20}
-                                color={"#000000"}
-                              />
-                            )}
-                          </View>
-                        </TouchableOpacity>
-                      )
+                    // Fetch user info from Microsoft Graph API to get the email
+                    const userInfoResponse = await fetch(
+                        "https://graph.microsoft.com/v1.0/me",
+                        {
+                            headers: {
+                                Authorization: `Bearer ${tokenData.access_token}`,
+                            },
+                        }
                     );
-                  })}
 
-                {profileData?.microsoftAccounts &&
-                  Object.keys(profileData?.microsoftAccounts)?.map(
-                    (microsoftEmail) => {
-                      const microsoftToken =
-                        profileData?.microsoftAccounts?.[microsoftEmail];
-                      return (
-                        microsoftToken && (
-                          <TouchableOpacity
-                            onPress={() =>
-                              fetchAndSaveOutlookEvents({
-                                token: microsoftToken,
-                                email: microsoftEmail,
-                              })
-                            }
-                          >
-                            <View row paddingR-20 center>
-                              <Button
-                                disabled={isSyncingOutlook}
-                                onPress={() =>
-                                  fetchAndSaveOutlookEvents({
-                                    token: microsoftToken,
-                                    email: microsoftEmail,
-                                  })
-                                }
-                                label={`Sync ${microsoftEmail}`}
-                                labelStyle={styles.addCalLbl}
-                                labelProps={{ numberOfLines: 3 }}
-                                iconSource={() => (
-                                  <View marginR-15>
-                                    <OutlookIcon />
-                                  </View>
-                                )}
-                                style={styles.addCalBtn}
-                                color="black"
-                                text70BL
-                              />
-                              {isSyncingOutlook ? (
-                                <ActivityIndicator />
-                              ) : (
-                                <Ionicons
-                                  name={"refresh"}
-                                  size={20}
-                                  color={"#000000"}
-                                />
-                              )}
-                            </View>
-                          </TouchableOpacity>
-                        )
-                      );
+                    const userInfo = await userInfoResponse.json();
+                    console.log("User info received:", userInfo);
+
+                    if (userInfo.error) {
+                        console.error("Error fetching user info:", userInfo.error);
+                    } else {
+                        const outlookMail = userInfo.mail || userInfo.userPrincipalName;
+
+                        let microsoftAccounts = profileData?.microsoftAccounts;
+                        const updatedMicrosoftAccounts = microsoftAccounts
+                            ? {...microsoftAccounts, [outlookMail]: tokenData.access_token}
+                            : {[outlookMail]: tokenData.access_token};
+
+                        await updateUserData({
+                            newUserData: {microsoftAccounts: updatedMicrosoftAccounts},
+                        });
+
+                        await fetchAndSaveOutlookEvents(
+                            tokenData.access_token,
+                            outlookMail
+                        );
+                        console.log("User data updated successfully.");
                     }
-                  )}
-              </View>
+                }
+            } else {
+                console.warn("Authentication was not successful:", authResult);
+            }
+        } catch (error) {
+            console.error("Error during Microsoft sign-in:", error);
+        }
+    };
+
+    const handleAppleSignIn = async () => {
+        try {
+            console.log("Starting Apple Sign-in...");
+
+            const credential = await AppleAuthentication.signInAsync({
+                requestedScopes: [
+                    AppleAuthentication.AppleAuthenticationScope.EMAIL,
+                    AppleAuthentication.AppleAuthenticationScope.FULL_NAME,
+                ],
+            });
+
+            console.log("Apple sign-in result:", credential);
+
+            alert(JSON.stringify(credential))
+
+            const appleToken = credential.identityToken;
+            const appleMail = credential.email!;
+
+
+            if (appleToken) {
+                console.log("Apple ID token received. Fetch user info if needed...");
+
+                let appleAcounts = profileData?.appleAccounts;
+                const updatedAppleAccounts = appleAcounts
+                    ? {...appleAcounts, [appleMail]: appleToken}
+                    : {[appleMail]: appleToken};
+
+                await updateUserData({
+                    newUserData: {appleAccounts: updatedAppleAccounts},
+                });
+
+                console.log("User data updated with Apple ID token.");
+                await fetchAndSaveAppleEvents({token: appleToken, email: appleMail!});
+            } else {
+                console.warn(
+                    "Apple authentication was not successful or email was hidden."
+                );
+            }
+        } catch (error) {
+            console.error("Error during Apple Sign-in:", error);
+        }
+    };
+
+    const debouncedUpdateUserData = useCallback(
+        debounce(async (color: string) => {
+            try {
+                await updateUserData({
+                    newUserData: {
+                        eventColor: color,
+                    },
+                });
+            } catch (error) {
+                console.error("Failed to update color:", error);
+                setSelectedColor(previousSelectedColor);
+            }
+        }, 500),
+        []
+    );
+
+    const debouncedUpdateFirstDayOfWeek = useCallback(
+        debounce(async (firstDayOfWeek: string) => {
+            try {
+                await updateUserData({
+                    newUserData: {
+                        firstDayOfWeek,
+                    },
+                });
+            } catch (error) {
+                console.error("Failed to update first day of week:", error);
+            }
+        }, 500),
+        []
+    );
+
+    const handleChangeFirstDayOfWeek = (firstDayOfWeek: string) => {
+        setFirstDayOfWeek(firstDayOfWeek === "Sundays" ? "Mondays" : "Sundays");
+        debouncedUpdateFirstDayOfWeek(
+            firstDayOfWeek === "Sundays" ? "Mondays" : "Sundays"
+        );
+    };
+
+    const handleChangeColor = (color: string) => {
+        setPreviousSelectedColor(selectedColor);
+        setSelectedColor(color);
+        debouncedUpdateUserData(color);
+    };
+
+    let isConnectedToGoogle = false;
+    if (profileData?.googleAccounts) {
+        Object.values(profileData?.googleAccounts).forEach((item) => {
+            if (item !== null) {
+                isConnectedToGoogle = true;
+                return;
+            }
+        });
+    }
+
+    let isConnectedToMicrosoft = false;
+    const microsoftAccounts = profileData?.microsoftAccounts;
+    if (microsoftAccounts) {
+        Object.values(profileData?.microsoftAccounts).forEach((item) => {
+            if (item !== null) {
+                isConnectedToMicrosoft = true;
+                return;
+            }
+        });
+    }
+
+    let isConnectedToApple = false;
+    if (profileData?.appleAccounts) {
+        Object.values(profileData?.appleAccounts).forEach((item) => {
+            if (item !== null) {
+                isConnectedToApple = true;
+                return;
+            }
+        });
+    }
+
+    return (
+        <ScrollView>
+            <TouchableOpacity onPress={() => setPageIndex(0)}>
+                <View row marginT-20 marginB-20 marginL-20 centerV>
+                    <Ionicons
+                        name="chevron-back"
+                        size={14}
+                        color="#979797"
+                        style={{paddingBottom: 3}}
+                    />
+                    <Text
+                        style={{fontFamily: "Poppins_400Regular", fontSize: 14.71}}
+                        color="#979797"
+                    >
+                        Return to main settings
+                    </Text>
+                </View>
+            </TouchableOpacity>
+            <View marginH-30 marginB-30>
+                <Text style={styles.subTitle}>Calendar settings</Text>
+                <View style={styles.card}>
+                    <Text style={styles.cardTitle} marginB-14>
+                        Event Color Preference
+                    </Text>
+                    <View row spread>
+                        <TouchableOpacity onPress={() => handleChangeColor(colorMap.pink)}>
+                            <View style={styles.colorBox} backgroundColor={colorMap.pink}>
+                                {selectedColor == colorMap.pink && (
+                                    <AntDesign name="check" size={30} color="white"/>
+                                )}
+                            </View>
+                        </TouchableOpacity>
+                        <TouchableOpacity
+                            onPress={() => handleChangeColor(colorMap.orange)}
+                        >
+                            <View style={styles.colorBox} backgroundColor={colorMap.orange}>
+                                {selectedColor == colorMap.orange && (
+                                    <AntDesign name="check" size={30} color="white"/>
+                                )}
+                            </View>
+                        </TouchableOpacity>
+                        <TouchableOpacity onPress={() => handleChangeColor(colorMap.green)}>
+                            <View style={styles.colorBox} backgroundColor={colorMap.green}>
+                                {selectedColor == colorMap.green && (
+                                    <AntDesign name="check" size={30} color="white"/>
+                                )}
+                            </View>
+                        </TouchableOpacity>
+                        <TouchableOpacity onPress={() => handleChangeColor(colorMap.teal)}>
+                            <View style={styles.colorBox} backgroundColor={colorMap.teal}>
+                                {selectedColor == colorMap.teal && (
+                                    <AntDesign name="check" size={30} color="white"/>
+                                )}
+                            </View>
+                        </TouchableOpacity>
+                        <TouchableOpacity
+                            onPress={() => handleChangeColor(colorMap.purple)}
+                        >
+                            <View style={styles.colorBox} backgroundColor={colorMap.purple}>
+                                {selectedColor == colorMap.purple && (
+                                    <AntDesign name="check" size={30} color="white"/>
+                                )}
+                            </View>
+                        </TouchableOpacity>
+                    </View>
+                </View>
+                <View style={styles.card}>
+                    <Text style={styles.cardTitle}>Weekly Start Date</Text>
+                    <View row marginV-5 marginT-20>
+                        <Checkbox
+                            value={firstDayOfWeek === "Sundays"}
+                            style={styles.checkbox}
+                            color="#ea156d"
+                            onValueChange={() => handleChangeFirstDayOfWeek("Sundays")}
+                        />
+                        <View row marginL-8>
+                            <Text text70>Sundays</Text>
+                            <Text text70 color="gray">
+                                {" "}
+                                (default)
+                            </Text>
+                        </View>
+                    </View>
+                    <View row marginV-5>
+                        <Checkbox
+                            value={firstDayOfWeek === "Mondays"}
+                            style={styles.checkbox}
+                            color="#ea156d"
+                            onValueChange={() => handleChangeFirstDayOfWeek("Mondays")}
+                        />
+                        <Text text70 marginL-8>
+                            Mondays
+                        </Text>
+                    </View>
+                </View>
+                <Text style={styles.subTitle} marginT-30 marginB-25>
+                    Add Calendar
+                </Text>
+
+                <Button
+                    onPress={() => promptAsync()}
+                    label={profileData?.googleAccounts ? "Connect another Google account" : "Connect Google account"}
+                    labelStyle={styles.addCalLbl}
+                    labelProps={{
+                        numberOfLines: 2,
+                    }}
+                    iconSource={() => (
+                        <View marginR-15>
+                            <GoogleIcon/>
+                        </View>
+                    )}
+                    style={styles.addCalBtn}
+                    color="black"
+                    text70BL
+                />
+                {profileData?.googleAccounts
+                    ? Object.keys(profileData?.googleAccounts)?.map((googleMail) => {
+                        const googleToken = profileData?.googleAccounts?.[googleMail]?.accessToken;
+                        return (
+                            googleToken && (
+                                <Button
+                                    key={googleMail}
+                                    onPress={() => {
+                                        showConfirmationDialog("google", googleMail);
+                                    }}
+                                    label={`Disconnect ${googleMail}`}
+                                    labelStyle={styles.addCalLbl}
+                                    labelProps={{
+                                        numberOfLines: 2,
+                                    }}
+                                    iconSource={() => (
+                                        <View marginR-15>
+                                            <GoogleIcon/>
+                                        </View>
+                                    )}
+                                    style={styles.addCalBtn}
+                                    color="black"
+                                    text70BL
+                                />
+                            )
+                        );
+                    })
+                    : null}
+
+                {!profileData?.appleAccounts && (
+                    <Button
+                        onPress={() => handleAppleSignIn()}
+                        label={"Connect Apple"}
+                        labelStyle={styles.addCalLbl}
+                        labelProps={{
+                            numberOfLines: 2,
+                        }}
+                        iconSource={() => (
+                            <View marginR-15>
+                                <AppleIcon/>
+                            </View>
+                        )}
+                        style={styles.addCalBtn}
+                        color="black"
+                        text70BL
+                    />
+                )}
+
+                {profileData?.appleAccounts
+                    ? Object.keys(profileData?.appleAccounts)?.map((appleEmail) => {
+                        const appleToken = profileData?.appleAccounts?.[appleEmail!];
+                        return (
+                            appleToken && (
+                                <Button
+                                    key={appleEmail}
+                                    onPress={() => showConfirmationDialog("apple", appleEmail)}
+                                    label={`Disconnect Apple`}
+                                    labelStyle={styles.addCalLbl}
+                                    labelProps={{
+                                        numberOfLines: 2,
+                                    }}
+                                    iconSource={() => (
+                                        <View marginR-15>
+                                            <AppleIcon/>
+                                        </View>
+                                    )}
+                                    style={styles.addCalBtn}
+                                    color="black"
+                                    text70BL
+                                />
+                            )
+                        );
+                    })
+                    : null}
+
+                <Button
+                    onPress={() => handleMicrosoftSignIn()}
+                    label={profileData?.microsoftAccounts ? "Connect another Outlook account" : "Connect Outlook"}
+                    labelStyle={styles.addCalLbl}
+                    labelProps={{
+                        numberOfLines: 2,
+                    }}
+                    iconSource={() => (
+                        <View marginR-15>
+                            <OutlookIcon/>
+                        </View>
+                    )}
+                    style={styles.addCalBtn}
+                    color="black"
+                    text70BL
+                />
+                {profileData?.microsoftAccounts
+                    ? Object.keys(profileData?.microsoftAccounts)?.map(
+                        (microsoftEmail) => {
+                            const microsoftToken =
+                                profileData?.microsoftAccounts?.[microsoftEmail];
+                            return (
+                                microsoftToken && (
+                                    <Button
+                                        key={microsoftEmail}
+                                        onPress={() => {
+                                            showConfirmationDialog("outlook", microsoftEmail);
+                                        }}
+                                        label={`Disconnect ${microsoftEmail}`}
+                                        labelStyle={styles.addCalLbl}
+                                        labelProps={{
+                                            numberOfLines: 2,
+                                        }}
+                                        iconSource={() => (
+                                            <View marginR-15>
+                                                <OutlookIcon/>
+                                            </View>
+                                        )}
+                                        style={styles.addCalBtn}
+                                        color="black"
+                                        text70BL
+                                    />
+                                )
+                            );
+                        }
+                    )
+                    : null}
+
+                {(isConnectedToGoogle ||
+                    isConnectedToMicrosoft ||
+                    isConnectedToApple) && (
+                    <>
+                        <Text style={styles.subTitle} marginT-30 marginB-20>
+                            Connected Calendars
+                        </Text>
+
+                        <View style={styles.noPaddingCard}>
+                            <View style={{marginTop: 20}}>
+                                {profileData?.googleAccounts &&
+                                    Object.keys(profileData?.googleAccounts)?.map(
+                                        (googleEmail) => {
+                                            const googleToken =
+                                                profileData?.googleAccounts?.[googleEmail];
+                                            return (
+                                                googleToken && (
+                                                    <TouchableOpacity
+                                                        onPress={() =>
+                                                            fetchAndSaveGoogleEvents({
+                                                                token: googleToken,
+                                                                email: googleEmail,
+                                                            })
+                                                        }
+                                                    >
+                                                        <View row paddingR-20 center>
+                                                            <Button
+                                                                disabled={isSyncingGoogle}
+                                                                onPress={() =>
+                                                                    fetchAndSaveGoogleEvents({
+                                                                        token: googleToken,
+                                                                        email: googleEmail,
+                                                                    })
+                                                                }
+                                                                label={`Sync ${googleEmail}`}
+                                                                labelStyle={styles.addCalLbl}
+                                                                labelProps={{numberOfLines: 3}}
+                                                                iconSource={() => (
+                                                                    <View marginR-15>
+                                                                        <GoogleIcon/>
+                                                                    </View>
+                                                                )}
+                                                                style={styles.addCalBtn}
+                                                                color="black"
+                                                                text70BL
+                                                            />
+
+                                                            {isSyncingGoogle ? (
+                                                                <ActivityIndicator/>
+                                                            ) : (
+                                                                <Ionicons
+                                                                    name={"refresh"}
+                                                                    size={20}
+                                                                    color={"#000000"}
+                                                                />
+                                                            )}
+                                                        </View>
+                                                    </TouchableOpacity>
+                                                )
+                                            );
+                                        }
+                                    )}
+
+                                {profileData?.appleAccounts &&
+                                    Object.keys(profileData?.appleAccounts)?.map((appleEmail) => {
+                                        console.log(profileData?.appleAccounts)
+
+                                        const appleToken = profileData?.appleAccounts?.[appleEmail];
+                                        return (
+                                            appleToken && (
+                                                <TouchableOpacity
+                                                    onPress={() =>
+                                                        fetchAndSaveAppleEvents({
+                                                            email: appleEmail,
+                                                            token: appleToken,
+                                                        })
+                                                    }
+                                                >
+                                                    <View row paddingR-20 center>
+                                                        <Button
+                                                            disabled={isSyncingApple}
+                                                            onPress={() =>
+                                                                fetchAndSaveAppleEvents({
+                                                                    email: appleEmail,
+                                                                    token: appleToken,
+                                                                })
+                                                            }
+                                                            label={isSyncingApple ? "Syncing Events from the Apple calendar..." : `Sync Apple`}
+                                                            labelStyle={styles.addCalLbl}
+                                                            labelProps={{numberOfLines: 3}}
+                                                            iconSource={() => (
+                                                                <View marginR-15>
+                                                                    <AppleIcon/>
+                                                                </View>
+                                                            )}
+                                                            style={styles.addCalBtn}
+                                                            color="black"
+                                                            text70BL
+                                                        />
+                                                        {isSyncingApple ? (
+                                                            <ActivityIndicator/>
+                                                        ) : (
+                                                            <Ionicons
+                                                                name={"refresh"}
+                                                                size={20}
+                                                                color={"#000000"}
+                                                            />
+                                                        )}
+                                                    </View>
+                                                </TouchableOpacity>
+                                            )
+                                        );
+                                    })}
+
+                                {profileData?.microsoftAccounts &&
+                                    Object.keys(profileData?.microsoftAccounts)?.map(
+                                        (microsoftEmail) => {
+                                            const microsoftToken =
+                                                profileData?.microsoftAccounts?.[microsoftEmail];
+                                            return (
+                                                microsoftToken && (
+                                                    <TouchableOpacity
+                                                        onPress={() =>
+                                                            fetchAndSaveOutlookEvents({
+                                                                token: microsoftToken,
+                                                                email: microsoftEmail,
+                                                            })
+                                                        }
+                                                    >
+                                                        <View row paddingR-20 center>
+                                                            <Button
+                                                                disabled={isSyncingOutlook}
+                                                                onPress={() =>
+                                                                    fetchAndSaveOutlookEvents({
+                                                                        token: microsoftToken,
+                                                                        email: microsoftEmail,
+                                                                    })
+                                                                }
+                                                                label={`Sync ${microsoftEmail}`}
+                                                                labelStyle={styles.addCalLbl}
+                                                                labelProps={{numberOfLines: 3}}
+                                                                iconSource={() => (
+                                                                    <View marginR-15>
+                                                                        <OutlookIcon/>
+                                                                    </View>
+                                                                )}
+                                                                style={styles.addCalBtn}
+                                                                color="black"
+                                                                text70BL
+                                                            />
+                                                            {isSyncingOutlook ? (
+                                                                <ActivityIndicator/>
+                                                            ) : (
+                                                                <Ionicons
+                                                                    name={"refresh"}
+                                                                    size={20}
+                                                                    color={"#000000"}
+                                                                />
+                                                            )}
+                                                        </View>
+                                                    </TouchableOpacity>
+                                                )
+                                            );
+                                        }
+                                    )}
+                            </View>
+                        </View>
+                    </>
+                )}
             </View>
-          </>
-        )}
-      </View>
-      <CalendarSettingsDialog
-        visible={isModalVisible}
-        serviceName={selectedService}
-        email={selectedEmail}
-        onDismiss={handleCancel}
-        onConfirm={handleConfirm}
-      />
-    </ScrollView>
-  );
+            <CalendarSettingsDialog
+                visible={isModalVisible}
+                serviceName={selectedService}
+                email={selectedEmail}
+                onDismiss={handleCancel}
+                onConfirm={handleConfirm}
+            />
+        </ScrollView>
+    );
 };
 
 const styles = StyleSheet.create({
-  addCalBtn: {
-    backgroundColor: "#ffffff",
-    marginBottom: 15,
-    justifyContent: "flex-start",
-    paddingLeft: 25,
-  },
-  backBtn: {
-    backgroundColor: "red",
-    marginLeft: -2,
-    justifyContent: "flex-start",
-  },
-  card: {
-    backgroundColor: "white",
-    width: "100%",
-    padding: 20,
-    paddingBottom: 30,
-    marginTop: 20,
-    borderRadius: 12,
-  },
-  noPaddingCard: {
-    backgroundColor: "white",
-    width: "100%",
-    marginTop: 20,
-    borderRadius: 12,
-  },
-  colorBox: {
-    aspectRatio: 1,
-    justifyContent: "center",
-    alignItems: "center",
-    width: 51,
-    borderRadius: 12,
-  },
-  checkbox: {
-    borderRadius: 50,
-  },
-  addCalLbl: {
-    fontSize: 16,
-    fontFamily: "PlusJakartaSan_500Medium",
-    flexWrap: "wrap",
-    width: "75%",
-    textAlign: "left",
-    lineHeight: 20,
-    overflow: "visible",
-  },
-  subTitle: {
-    fontFamily: "Manrope_600SemiBold",
-    fontSize: 18,
-  },
-  cardTitle: {
-    fontFamily: "Manrope_500Medium",
-    fontSize: 15,
-  },
+    addCalBtn: {
+        backgroundColor: "#ffffff",
+        marginBottom: 15,
+        justifyContent: "flex-start",
+        paddingLeft: 25,
+    },
+    backBtn: {
+        backgroundColor: "red",
+        marginLeft: -2,
+        justifyContent: "flex-start",
+    },
+    card: {
+        backgroundColor: "white",
+        width: "100%",
+        padding: 20,
+        paddingBottom: 30,
+        marginTop: 20,
+        borderRadius: 12,
+    },
+    noPaddingCard: {
+        backgroundColor: "white",
+        width: "100%",
+        marginTop: 20,
+        borderRadius: 12,
+    },
+    colorBox: {
+        aspectRatio: 1,
+        justifyContent: "center",
+        alignItems: "center",
+        width: 51,
+        borderRadius: 12,
+    },
+    checkbox: {
+        borderRadius: 50,
+    },
+    addCalLbl: {
+        fontSize: 16,
+        fontFamily: "PlusJakartaSan_500Medium",
+        flexWrap: "wrap",
+        width: "75%",
+        textAlign: "left",
+        lineHeight: 20,
+        overflow: "visible",
+    },
+    subTitle: {
+        fontFamily: "Manrope_600SemiBold",
+        fontSize: 18,
+    },
+    cardTitle: {
+        fontFamily: "Manrope_500Medium",
+        fontSize: 15,
+    },
 });
 
 export default CalendarSettingsPage;
diff --git a/firebase/functions/index.js b/firebase/functions/index.js
index 9091619..704507b 100644
--- a/firebase/functions/index.js
+++ b/firebase/functions/index.js
@@ -181,7 +181,7 @@ exports.generateCustomToken = onRequest(async (request, response) => {
     }
 });
 
-exports.refreshTokens = functions.pubsub.schedule('every 12 hours').onRun(async (context) => {
+exports.refreshTokens = functions.pubsub.schedule('every 1 hours').onRun(async (context) => {
     console.log('Running token refresh job...');
 
     const profilesSnapshot = await db.collection('Profiles').get();
@@ -192,7 +192,7 @@ exports.refreshTokens = functions.pubsub.schedule('every 12 hours').onRun(async
         if (profileData.googleAccounts) {
             try {
                 for (const googleEmail of Object.keys(profileData?.googleAccounts)) {
-                    const googleToken = profileData?.googleAccounts?.[googleEmail];
+                    const googleToken = profileData?.googleAccounts?.[googleEmail]?.refreshToken;
                     if (googleToken) {
                         const refreshedGoogleToken = await refreshGoogleToken(googleToken);
                         const updatedGoogleAccounts = {...profileData.googleAccounts, [googleEmail]: refreshedGoogleToken};
@@ -239,29 +239,35 @@ exports.refreshTokens = functions.pubsub.schedule('every 12 hours').onRun(async
     return null;
 });
 
-// Function to refresh Google token
-async function refreshGoogleToken(token) {
-    // Assuming you use OAuth2 token refresh flow
-    const response = await axios.post('https://oauth2.googleapis.com/token', {
-        grant_type: 'refresh_token',
-        refresh_token: token, // Add refresh token stored previously
-        client_id: 'YOUR_GOOGLE_CLIENT_ID',
-        client_secret: 'YOUR_GOOGLE_CLIENT_SECRET',
-    });
+async function refreshGoogleToken(refreshToken) {
+    try {
+        const response = await axios.post('https://oauth2.googleapis.com/token', {
+            grant_type: 'refresh_token',
+            refresh_token: refreshToken,
+            client_id: "406146460310-2u67ab2nbhu23trp8auho1fq4om29fc0.apps.googleusercontent.com", // Web client ID from googleConfig
+        });
 
-    return response.data.access_token; // Return new access token
+        return response.data.access_token; // Return the new access token
+    } catch (error) {
+        console.error("Error refreshing Google token:", error);
+        throw error;
+    }
 }
 
-async function refreshMicrosoftToken(token) {
-    const response = await axios.post('https://login.microsoftonline.com/common/oauth2/v2.0/token', {
-        grant_type: 'refresh_token',
-        refresh_token: token, // Add refresh token stored previously
-        client_id: 'YOUR_MICROSOFT_CLIENT_ID',
-        client_secret: 'YOUR_MICROSOFT_CLIENT_SECRET',
-        scope: 'https://graph.microsoft.com/Calendars.ReadWrite offline_access',
-    });
+async function refreshMicrosoftToken(refreshToken) {
+    try {
+        const response = await axios.post('https://login.microsoftonline.com/common/oauth2/v2.0/token', {
+            grant_type: 'refresh_token',
+            refresh_token: refreshToken,
+            client_id: "13c79071-1066-40a9-9f71-b8c4b138b4af", // Client ID from microsoftConfig
+            scope: "openid profile email offline_access Calendars.ReadWrite User.Read", // Scope from microsoftConfig
+        });
 
-    return response.data.access_token; // Return new access token
+        return response.data.access_token; // Return the new access token
+    } catch (error) {
+        console.error("Error refreshing Microsoft token:", error);
+        throw error;
+    }
 }
 
 async function getPushTokensForEvent() {
diff --git a/hooks/firebase/useClearTokens.ts b/hooks/firebase/useClearTokens.ts
new file mode 100644
index 0000000..35fd305
--- /dev/null
+++ b/hooks/firebase/useClearTokens.ts
@@ -0,0 +1,39 @@
+import {useMutation} from "react-query";
+import {UserProfile} from "@firebase/auth";
+import {useAuthContext} from "@/contexts/AuthContext";
+import {useUpdateUserData} from "@/hooks/firebase/useUpdateUserData";
+
+export const useClearTokens = () => {
+    const {profileData} = useAuthContext();
+    const {mutateAsync: updateUserData} = useUpdateUserData();
+
+    return useMutation({
+        mutationKey: ["clearTokens"],
+        mutationFn: async ({provider, email}: {
+            provider: "google" | "outlook" | "apple",
+            email: string
+        }) => {
+            const newUserData: Partial<UserProfile> = {};
+            if (provider === "google") {
+                let googleAccounts = profileData?.googleAccounts;
+                if (googleAccounts) {
+                    googleAccounts[email] = null;
+                    newUserData.googleAccounts = googleAccounts;
+                }
+            } else if (provider === "outlook") {
+                let microsoftAccounts = profileData?.microsoftAccounts;
+                if (microsoftAccounts) {
+                    microsoftAccounts[email] = null;
+                    newUserData.microsoftAccounts = microsoftAccounts;
+                }
+            } else if (provider === "apple") {
+                let appleAccounts = profileData?.appleAccounts;
+                if (appleAccounts) {
+                    appleAccounts[email] = null;
+                    newUserData.appleAccounts = appleAccounts;
+                }
+            }
+            await updateUserData({newUserData});
+        },
+    })
+}
\ No newline at end of file
diff --git a/hooks/firebase/useCreateEvent.ts b/hooks/firebase/useCreateEvent.ts
index 5d5ae7d..2b56346 100644
--- a/hooks/firebase/useCreateEvent.ts
+++ b/hooks/firebase/useCreateEvent.ts
@@ -45,34 +45,41 @@ export const useCreateEvent = () => {
 }
 
 export const useCreateEventsFromProvider = () => {
-    const {user: currentUser} = useAuthContext();
+    const { user: currentUser } = useAuthContext();
     const queryClient = useQueryClient();
 
     return useMutation({
         mutationKey: ["createEventsFromProvider"],
         mutationFn: async (eventDataArray: Partial<EventData>[]) => {
             try {
-                for (const eventData of eventDataArray) {
+                // Create an array of promises for each event's Firestore read/write operation
+                const promises = eventDataArray.map(async (eventData) => {
                     console.log("Processing EventData: ", eventData);
 
+                    // Check if the event already exists
                     const snapshot = await firestore()
                         .collection("Events")
                         .where("id", "==", eventData.id)
                         .get();
 
                     if (snapshot.empty) {
-                        await firestore()
+                        // Event doesn't exist, so add it
+                        return firestore()
                             .collection("Events")
-                            .add({...eventData, creatorId: currentUser?.uid});
+                            .add({ ...eventData, creatorId: currentUser?.uid });
                     } else {
-                        console.log("Event already exists, updating...");
+                        // Event exists, update it
                         const docId = snapshot.docs[0].id;
-                        await firestore()
+                        return firestore()
                             .collection("Events")
                             .doc(docId)
-                            .set({...eventData, creatorId: currentUser?.uid}, {merge: true});
+                            .set({ ...eventData, creatorId: currentUser?.uid }, { merge: true });
                     }
-                }
+                });
+
+                // Execute all promises in parallel
+                await Promise.all(promises);
+
             } catch (e) {
                 console.error("Error creating/updating events: ", e);
             }
diff --git a/hooks/useFetchAndSaveGoogleEvents.ts b/hooks/useFetchAndSaveGoogleEvents.ts
index d2bd62b..b96c0f9 100644
--- a/hooks/useFetchAndSaveGoogleEvents.ts
+++ b/hooks/useFetchAndSaveGoogleEvents.ts
@@ -2,11 +2,13 @@ import {useMutation, useQueryClient} from "react-query";
 import {fetchGoogleCalendarEvents} from "@/calendar-integration/google-calendar-utils";
 import {useAuthContext} from "@/contexts/AuthContext";
 import {useCreateEventsFromProvider} from "@/hooks/firebase/useCreateEvent";
+import {useClearTokens} from "@/hooks/firebase/useClearTokens";
 
 export const useFetchAndSaveGoogleEvents = () => {
     const queryClient = useQueryClient()
     const {profileData} = useAuthContext();
     const {mutateAsync: createEventsFromProvider} = useCreateEventsFromProvider();
+    const {mutateAsync: clearToken} = useClearTokens();
 
     return useMutation({
         mutationKey: ["fetchAndSaveGoogleEvents"],
@@ -26,9 +28,14 @@ export const useFetchAndSaveGoogleEvents = () => {
                     timeMax.toISOString().slice(0, -5) + "Z"
                 );
 
+                if(!response.success) {
+                    await clearToken({email: email!, provider: "google"})
+                    return
+                }
+
                 console.log("Google Calendar events fetched:", response);
 
-                const items = response?.map((item) => {
+                const items = response?.googleEvents?.map((item) => {
                     if (item.allDay) {
                         item.startDate = new Date(new Date(item.startDate).setHours(0, 0, 0, 0));
                         item.endDate = item.startDate;