diff --git a/application/api/connector/routes.py b/application/api/connector/routes.py
index 014fc71f..821b2d91 100644
--- a/application/api/connector/routes.py
+++ b/application/api/connector/routes.py
@@ -255,136 +255,64 @@ class ConnectorsCallback(Resource):
         """Handle OAuth callback for external connectors"""
         try:
             from application.parser.connectors.connector_creator import ConnectorCreator
-            from flask import request
+            from flask import request, redirect
             import uuid
 
+            provider = request.args.get('provider', 'google_drive')
             authorization_code = request.args.get('code')
             _ = request.args.get('state')
             error = request.args.get('error')
 
             if error:
-                return make_response(
-                    jsonify({"success": False, "error": f"OAuth error: {error}. Please try again and make sure to grant all requested permissions, including offline access."}), 400
-                )
+                return redirect(f"/api/connectors/callback-status?status=error&message=OAuth+error:+{error}.+Please+try+again+and+make+sure+to+grant+all+requested+permissions,+including+offline+access.&provider={provider}")
 
             if not authorization_code:
-                return make_response(
-                    jsonify({"success": False, "error": "Authorization code not provided. Please complete the authorization process and make sure to grant offline access."}), 400
-                )
+                return redirect(f"/api/connectors/callback-status?status=error&message=Authorization+code+not+provided.+Please+complete+the+authorization+process+and+make+sure+to+grant+offline+access.&provider={provider}")
 
             try:
-                auth = ConnectorCreator.create_auth("google_drive")
+                auth = ConnectorCreator.create_auth(provider)
                 token_info = auth.exchange_code_for_tokens(authorization_code)
-                current_app.logger.info(f"Token info received from OAuth callback - has refresh_token: {bool(token_info.get('refresh_token'))}, "
-                           f"has access_token: {bool(token_info.get('access_token'))}, "
-                           f"expiry: {token_info.get('expiry')}")
 
-                safe_token_info = {k: v for k, v in token_info.items() if k not in ['access_token', 'refresh_token', 'client_secret']}
-                current_app.logger.info(f"Full token info structure: {safe_token_info}")
+                session_token = str(uuid.uuid4())
+                
 
-                # Validate that we got token info
-                if not token_info:
-                    current_app.logger.error("exchange_code_for_tokens returned None or empty result")
-                    return make_response(
-                        jsonify({"success": False, "error": "Failed to exchange authorization code for tokens. Please try again and make sure to grant all requested permissions, including offline access."}), 400
-                    )
+                try:
+                    credentials = auth.create_credentials_from_token_info(token_info)
+                    service = auth.build_drive_service(credentials)
+                    user_info = service.about().get(fields="user").execute()
+                    user_email = user_info.get('user', {}).get('emailAddress', 'Connected User')
+                except Exception as e:
+                    current_app.logger.warning(f"Could not get user info: {e}")
+                    user_email = 'Connected User'
 
-                # Validate required fields in token_info
-                required_fields = ['access_token', 'token_uri', 'client_id', 'client_secret']
-                missing_fields = [field for field in required_fields if not token_info.get(field)]
-                if missing_fields:
-                    current_app.logger.error(f"Token info missing required fields: {missing_fields}")
-                    return make_response(
-                        jsonify({"success": False, "error": f"Token information incomplete. Missing fields: {missing_fields}. Please try again and make sure to grant all requested permissions."}), 400
-                    )
+                sanitized_token_info = {
+                    "access_token": token_info.get("access_token"),
+                    "refresh_token": token_info.get("refresh_token"),
+                    "token_uri": token_info.get("token_uri"),
+                    "expiry": token_info.get("expiry"),
+                    "scopes": token_info.get("scopes")
+                }
 
-                if not token_info.get('refresh_token'):
-                    current_app.logger.warning("OAuth flow did not return a refresh token - user will need to re-authenticate when token expires")
-         
-                required_fields = ['access_token', 'token_uri', 'client_id', 'client_secret']
-                missing_fields = [field for field in required_fields if not token_info.get(field)]
-                if missing_fields:
-                    current_app.logger.error(f"Token info missing required fields: {missing_fields}")
-                    return make_response(
-                        jsonify({"success": False, "error": f"Token info missing required fields: {missing_fields}"}), 400
-                    )
+                user_id = request.decoded_token.get("sub") if getattr(request, "decoded_token", None) else None
+                sessions_collection.insert_one({
+                    "session_token": session_token,
+                    "user": user_id,
+                    "token_info": sanitized_token_info,
+                    "created_at": datetime.datetime.now(datetime.timezone.utc),
+                    "user_email": user_email,
+                    "provider": provider
+                })
+
+                # Redirect to success page with session token and user email
+                return redirect(f"/api/connectors/callback-status?status=success&message=Authentication+successful&provider={provider}&session_token={session_token}&user_email={user_email}")
 
             except Exception as e:
                 current_app.logger.error(f"Error exchanging code for tokens: {str(e)}", exc_info=True)
-
-                if 'refresh' in str(e).lower():
-                    current_app.logger.warning(f"Missing refresh token but continuing: {str(e)}")
-
-                else:
-                    return make_response(
-                        jsonify({"success": False, "error": f"Failed to exchange authorization code for tokens: {str(e)}"}), 400
-                    )
-
-            try:
-                credentials = auth.create_credentials_from_token_info(token_info)
-                service = auth.build_drive_service(credentials)
-                user_info = service.about().get(fields="user").execute()
-                user_email = user_info.get('user', {}).get('emailAddress', 'Connected User')
-            except Exception as e:
-                current_app.logger.warning(f"Could not get user info: {e}")
-                if token_info.get('access_token'):
-                    try:
-                        import requests
-                        headers = {'Authorization': f'Bearer {token_info["access_token"]}'}
-                        response = requests.get(
-                            'https://www.googleapis.com/drive/v3/about?fields=user',
-                            headers=headers
-                        )
-                        if response.status_code == 200:
-                            user_info = response.json()
-                            user_email = user_info.get('user', {}).get('emailAddress', 'Connected User')
-                        else:
-                            user_email = 'Connected User'
-                    except Exception as request_error:
-                        current_app.logger.warning(f"Could not get user info via direct request: {request_error}")
-                        user_email = 'Connected User'
-                else:
-                    user_email = 'Connected User'
-
-            session_token = str(uuid.uuid4())
-
-
-
-            sanitized_token_info = {
-                "access_token": token_info.get("access_token"),
-                "refresh_token": token_info.get("refresh_token"),
-                "token_uri": token_info.get("token_uri"),
-                "expiry": token_info.get("expiry"),
-                "scopes": token_info.get("scopes")
-            }
-
-            user_id = request.decoded_token.get("sub") if getattr(request, "decoded_token", None) else None
-            sessions_collection.insert_one({
-                "session_token": session_token,
-                "user": user_id,
-                "token_info": sanitized_token_info,
-                "created_at": datetime.datetime.now(datetime.timezone.utc),
-                "user_email": user_email
-            })
-
-            return make_response(
-                jsonify({
-                    "success": True,
-                    "message": "Google Drive authentication successful",
-                    "session_token": session_token,
-                    "user_email": user_email
-                }),
-                200
-            )
+                return redirect(f"/api/connectors/callback-status?status=error&message=Failed+to+exchange+authorization+code+for+tokens:+{str(e)}&provider={provider}")
 
         except Exception as e:
             current_app.logger.error(f"Error handling connector callback: {e}")
-            return make_response(
-                jsonify({
-                    "success": False,
-                    "error": f"Failed to complete connector authentication: {str(e)}. Please try again and make sure to grant all requested permissions, including offline access."
-                }), 500
-            )
+            return redirect(f"/api/connectors/callback-status?status=error&message=Failed+to+complete+connector+authentication:+{str(e)}.+Please+try+again+and+make+sure+to+grant+all+requested+permissions,+including+offline+access.")
 
 
 @connectors_ns.route("/api/connectors/refresh")
@@ -623,4 +551,63 @@ class ConnectorSync(Resource):
             )
 
 
+@connectors_ns.route("/api/connectors/callback-status")
+class ConnectorCallbackStatus(Resource):
+    @api.doc(description="Return HTML page with connector authentication status")
+    def get(self):
+        """Return HTML page with connector authentication status"""
+        try:
+            status = request.args.get('status', 'error')
+            message = request.args.get('message', '')
+            provider = request.args.get('provider', 'connector')
+            session_token = request.args.get('session_token', '')
+            user_email = request.args.get('user_email', '')
+            
+            html_content = f"""
+            <!DOCTYPE html>
+            <html>
+            <head>
+                <title>{provider.replace('_', ' ').title()} Authentication</title>
+                <style>
+                    body {{ font-family: Arial, sans-serif; text-align: center; padding: 40px; }}
+                    .container {{ max-width: 600px; margin: 0 auto; }}
+                    .success {{ color: #4CAF50; }}
+                    .error {{ color: #F44336; }}
+                </style>
+                <script>
+                    window.onload = function() {{
+                        const status = "{status}";
+                        const sessionToken = "{session_token}";
+                        const userEmail = "{user_email}";
+                        
+                        if (status === "success" && window.opener) {{
+                            window.opener.postMessage({{
+                                type: '{provider}_auth_success',
+                                session_token: sessionToken,
+                                user_email: userEmail
+                            }}, '*');
+                            
+                            setTimeout(() => window.close(), 3000);
+                        }}
+                    }};
+                </script>
+            </head>
+            <body>
+                <div class="container">
+                    <h2>{provider.replace('_', ' ').title()} Authentication</h2>
+                    <div class="{status}">
+                        <p>{message}</p>
+                        {f'<p>Connected as: {user_email}</p>' if status == 'success' else ''}
+                    </div>
+                    <p><small>You can close this window. {f"Your {provider.replace('_', ' ').title()} is now connected and ready to use." if status == 'success' else ''}</small></p>
+                </div>
+            </body>
+            </html>
+            """
+            
+            return make_response(html_content, 200, {'Content-Type': 'text/html'})
+        except Exception as e:
+            current_app.logger.error(f"Error rendering callback status page: {e}")
+            return make_response("Authentication error occurred", 500, {'Content-Type': 'text/html'})
+
 
diff --git a/application/core/settings.py b/application/core/settings.py
index f1000056..cb7d75e3 100644
--- a/application/core/settings.py
+++ b/application/core/settings.py
@@ -43,7 +43,9 @@ class Settings(BaseSettings):
     # Google Drive integration
     GOOGLE_CLIENT_ID: Optional[str] = None # Replace with your actual Google OAuth client ID
     GOOGLE_CLIENT_SECRET: Optional[str] = None# Replace with your actual Google OAuth client secret
-    GOOGLE_REDIRECT_URI: Optional[str] = None
+    CONNECTOR_REDIRECT_BASE_URI: Optional[str] = "http://127.0.0.1:7091/api/connectors/callback" 
+    ##append ?provider={provider_name} in your Provider console like http://127.0.0.1:7091/api/connectors/callback?provider=google_drive
+
 
     # LLM Cache
     CACHE_REDIS_URL: str = "redis://localhost:6379/2"
diff --git a/application/parser/connectors/google_drive/auth.py b/application/parser/connectors/google_drive/auth.py
index 5a903653..37d55dcc 100644
--- a/application/parser/connectors/google_drive/auth.py
+++ b/application/parser/connectors/google_drive/auth.py
@@ -24,7 +24,7 @@ class GoogleDriveAuth(BaseConnectorAuth):
     def __init__(self):
         self.client_id = settings.GOOGLE_CLIENT_ID
         self.client_secret = settings.GOOGLE_CLIENT_SECRET
-        self.redirect_uri = settings.GOOGLE_REDIRECT_URI or "http://localhost:7091/api/google-drive/callback"
+        self.redirect_uri = f"{settings.CONNECTOR_REDIRECT_BASE_URI}?provider=google_drive"
         
         if not self.client_id or not self.client_secret:
             raise ValueError("Google OAuth credentials not configured. Please set GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET in settings.")
diff --git a/frontend/public/google-drive-callback.html b/frontend/public/google-drive-callback.html
deleted file mode 100644
index d2113624..00000000
--- a/frontend/public/google-drive-callback.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Google Drive Authentication</title>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            height: 100vh;
-            margin: 0;
-            background-color: #f5f5f5;
-        }
-        .container {
-            text-align: center;
-            background: white;
-            padding: 2rem;
-            border-radius: 8px;
-            box-shadow: 0 2px 10px rgba(0,0,0,0.1);
-        }
-        .success {
-            color: #4CAF50;
-        }
-        .error {
-            color: #f44336;
-        }
-        .loading {
-            color: #2196F3;
-        }
-    </style>
-</head>
-<body>
-    <div class="container">
-        <h2>Google Drive Authentication</h2>
-        <div id="status" class="loading">Processing authentication...</div>
-    </div>
-
-    <script>
-        function getUrlParams() {
-            const urlParams = new URLSearchParams(window.location.search);
-            return {
-                code: urlParams.get('code'),
-                error: urlParams.get('error'),
-                state: urlParams.get('state')
-            };
-        }
-
-        async function handleCallback() {
-            const params = getUrlParams();
-            const statusDiv = document.getElementById('status');
-
-            if (params.error) {
-                statusDiv.className = 'error';
-                statusDiv.innerHTML = `Authentication failed: ${params.error}<br><br>
-                <small>Please try again and make sure to:<br>
-                1. Grant all requested permissions<br>
-                2. Allow offline access when prompted<br>
-                3. Complete the authorization process</small>`;
-                setTimeout(() => window.close(), 5000);
-                return;
-            }
-
-            if (!params.code) {
-                statusDiv.className = 'error';
-                statusDiv.innerHTML = `No authorization code received.<br><br>
-                <small>Please try again and make sure to complete the authorization process.</small>`;
-                setTimeout(() => window.close(), 5000);
-                return;
-            }
-
-            try {
-                const backendApiUrl = window.location.protocol + '//' + window.location.hostname + ':7091';
-                const urlParams = new URLSearchParams(window.location.search);
-                urlParams.set('provider', 'google_drive');
-                const response = await fetch(backendApiUrl + '/api/connectors/callback?' + urlParams.toString());
-                const data = await response.json();
-
-                if (data.success) {
-                    // Store session token instead of token_info
-                    if (data.session_token) {
-                        localStorage.setItem('google_drive_session_token', data.session_token);
-                    }
-                    let userEmail = data.user_email || 'Connected User';
-
-                    statusDiv.className = 'success';
-                    statusDiv.innerHTML = `Authentication successful as ${userEmail}!<br><br>
-                    <small>You can close this window. Your Google Drive is now connected and ready to use.</small>`;
-
-
-                    if (window.opener) {
-                        window.opener.postMessage({
-                            type: 'google_drive_auth_success',
-                            session_token: data.session_token,
-                            user_email: userEmail
-                        }, '*');
-                    }
-
-                    setTimeout(() => window.close(), 3000);
-                } else {
-                    throw new Error(data.error || 'Authentication failed');
-                }
-            } catch (error) {
-                statusDiv.className = 'error';
-                statusDiv.innerHTML = `Error: ${error.message}<br><br>
-                <small>If this is an authentication error, please try again and make sure to grant offline access. You may need to revoke previous access to this app in your Google Account settings and re-authorize.</small>`;
-                setTimeout(() => window.close(), 5000);
-            }
-        }
-
-        handleCallback();
-    </script>
-</body>
-</html>
diff --git a/frontend/src/components/ConnectorTreeComponent.tsx b/frontend/src/components/ConnectorTreeComponent.tsx
index 972c55f7..dfd868b3 100644
--- a/frontend/src/components/ConnectorTreeComponent.tsx
+++ b/frontend/src/components/ConnectorTreeComponent.tsx
@@ -64,7 +64,6 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
   const [sourceProvider, setSourceProvider] = useState<string>('');
   const [syncDone, setSyncDone] = useState<boolean>(false);
 
-
   useOutsideAlerter(
     searchDropdownRef,
     () => {
@@ -84,7 +83,6 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
   };
 
   const handleSync = async () => {
-
     if (isSyncing) return;
 
     const provider = sourceProvider;
@@ -106,10 +104,16 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
 
         for (let attempt = 0; attempt < maxAttempts; attempt++) {
           try {
-            const statusResponse = await userService.getTaskStatus(data.task_id, token);
+            const statusResponse = await userService.getTaskStatus(
+              data.task_id,
+              token,
+            );
             const statusData = await statusResponse.json();
 
-            console.log(`Task status (attempt ${attempt + 1}):`, statusData.status);
+            console.log(
+              `Task status (attempt ${attempt + 1}):`,
+              statusData.status,
+            );
 
             if (statusData.status === 'SUCCESS') {
               setSyncProgress(100);
@@ -117,7 +121,10 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
 
               // Refresh directory structure
               try {
-                const refreshResponse = await userService.getDirectoryStructure(docId, token);
+                const refreshResponse = await userService.getDirectoryStructure(
+                  docId,
+                  token,
+                );
                 const refreshData = await refreshResponse.json();
                 if (refreshData && refreshData.directory_structure) {
                   setDirectoryStructure(refreshData.directory_structure);
@@ -137,12 +144,13 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
               console.error('Sync task failed:', statusData.result);
               break;
             } else if (statusData.status === 'PROGRESS') {
-
-              const progress = Number((statusData.result && statusData.result.current != null)
-                ? statusData.result.current
-                : (statusData.meta && statusData.meta.current != null)
-                  ? statusData.meta.current
-                  : 0);
+              const progress = Number(
+                statusData.result && statusData.result.current != null
+                  ? statusData.result.current
+                  : statusData.meta && statusData.meta.current != null
+                    ? statusData.meta.current
+                    : 0,
+              );
               setSyncProgress(Math.max(10, progress));
             }
 
@@ -168,7 +176,10 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
       try {
         setLoading(true);
 
-        const directoryResponse = await userService.getDirectoryStructure(docId, token);
+        const directoryResponse = await userService.getDirectoryStructure(
+          docId,
+          token,
+        );
         const directoryData = await directoryResponse.json();
 
         if (directoryData && directoryData.directory_structure) {
@@ -261,7 +272,6 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
       variant: 'primary',
     });
 
-
     return options;
   };
 
@@ -301,18 +311,18 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
 
   const renderPathNavigation = () => {
     return (
-      <div className="mb-0 min-h-[38px] flex flex-col gap-2 text-base sm:flex-row sm:items-center sm:justify-between">
+      <div className="mb-0 flex min-h-[38px] flex-col gap-2 text-base sm:flex-row sm:items-center sm:justify-between">
         {/* Left side with path navigation */}
         <div className="flex w-full items-center sm:w-auto">
           <button
-            className="mr-3 flex h-[29px] w-[29px] items-center justify-center rounded-full border p-2 text-sm text-gray-400 dark:border-0 dark:bg-[#28292D] dark:text-gray-500 dark:hover:bg-[#2E2F34] font-medium"
+            className="mr-3 flex h-[29px] w-[29px] items-center justify-center rounded-full border p-2 text-sm font-medium text-gray-400 dark:border-0 dark:bg-[#28292D] dark:text-gray-500 dark:hover:bg-[#2E2F34]"
             onClick={handleBackNavigation}
           >
             <img src={ArrowLeft} alt="left-arrow" className="h-3 w-3" />
           </button>
 
           <div className="flex flex-wrap items-center">
-            <span className="text-[#7D54D1] font-semibold break-words">
+            <span className="font-semibold break-words text-[#7D54D1]">
               {sourceName}
             </span>
             {currentPath.length > 0 && (
@@ -324,7 +334,9 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
                       {dir}
                     </span>
                     {index < currentPath.length - 1 && (
-                      <span className="mx-1 flex-shrink-0 text-gray-500">/</span>
+                      <span className="mx-1 flex-shrink-0 text-gray-500">
+                        /
+                      </span>
                     )}
                   </React.Fragment>
                 ))}
@@ -333,29 +345,36 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
           </div>
         </div>
 
-        <div className="flex relative flex-row flex-nowrap items-center gap-2 w-full sm:w-auto justify-end mt-2 sm:mt-0">
-
+        <div className="relative mt-2 flex w-full flex-row flex-nowrap items-center justify-end gap-2 sm:mt-0 sm:w-auto">
           {renderFileSearch()}
 
           {/* Sync button */}
           <button
             onClick={handleSync}
             disabled={isSyncing}
-            className={`flex h-[38px] min-w-[108px] items-center justify-center rounded-full px-4 text-[14px] whitespace-nowrap font-medium transition-colors ${
+            className={`flex h-[38px] min-w-[108px] items-center justify-center rounded-full px-4 text-[14px] font-medium whitespace-nowrap transition-colors ${
               isSyncing
-                ? 'bg-gray-300 text-gray-600 cursor-not-allowed dark:bg-gray-600 dark:text-gray-400'
+                ? 'cursor-not-allowed bg-gray-300 text-gray-600 dark:bg-gray-600 dark:text-gray-400'
                 : 'bg-purple-30 hover:bg-violets-are-blue text-white'
             }`}
-            title={isSyncing
-              ? `${t('settings.sources.syncing')} ${syncProgress}%`
-              : (syncDone ? 'Done' : t('settings.sources.sync'))}
+            title={
+              isSyncing
+                ? `${t('settings.sources.syncing')} ${syncProgress}%`
+                : syncDone
+                  ? 'Done'
+                  : t('settings.sources.sync')
+            }
           >
             <img
               src={SyncIcon}
               alt={t('settings.sources.sync')}
-              className={`h-4 w-4 mr-2 filter invert contrast-200 ${isSyncing ? 'animate-spin' : ''}`}
+              className={`mr-2 h-4 w-4 brightness-0 invert filter ${isSyncing ? 'animate-spin' : ''}`}
             />
-            {isSyncing ? `${syncProgress}%` : (syncDone ? 'Done' : t('settings.sources.sync'))}
+            {isSyncing
+              ? `${syncProgress}%`
+              : syncDone
+                ? 'Done'
+                : t('settings.sources.sync')}
           </button>
         </div>
       </div>
@@ -369,46 +388,47 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
     const parentRow =
       currentPath.length > 0
         ? [
-          <tr
-            key="parent-dir"
-            className="cursor-pointer border-b border-[#D1D9E0] hover:bg-[#ECEEEF] dark:border-[#6A6A6A] dark:hover:bg-[#27282D]"
-            onClick={navigateUp}
-          >
-            <td className="px-2 py-2 lg:px-4">
-              <div className="flex items-center">
-                <img
-                  src={FolderIcon}
-                  alt={t('settings.sources.parentFolderAlt')}
-                  className="mr-2 h-4 w-4 flex-shrink-0"
-                />
-                <span className="truncate text-sm dark:text-[#E0E0E0]">
-                  ..
-                </span>
-              </div>
-            </td>
-            <td className="px-2 py-2 text-sm lg:px-4 dark:text-[#E0E0E0]">
-              -
-            </td>
-            <td className="px-2 py-2 text-sm lg:px-4 dark:text-[#E0E0E0]">
-              -
-            </td>
-            <td className="w-10 px-2 py-2 text-sm lg:px-4"></td>
-          </tr>,
-        ]
+            <tr
+              key="parent-dir"
+              className="cursor-pointer border-b border-[#D1D9E0] hover:bg-[#ECEEEF] dark:border-[#6A6A6A] dark:hover:bg-[#27282D]"
+              onClick={navigateUp}
+            >
+              <td className="px-2 py-2 lg:px-4">
+                <div className="flex items-center">
+                  <img
+                    src={FolderIcon}
+                    alt={t('settings.sources.parentFolderAlt')}
+                    className="mr-2 h-4 w-4 flex-shrink-0"
+                  />
+                  <span className="truncate text-sm dark:text-[#E0E0E0]">
+                    ..
+                  </span>
+                </div>
+              </td>
+              <td className="px-2 py-2 text-sm lg:px-4 dark:text-[#E0E0E0]">
+                -
+              </td>
+              <td className="px-2 py-2 text-sm lg:px-4 dark:text-[#E0E0E0]">
+                -
+              </td>
+              <td className="w-10 px-2 py-2 text-sm lg:px-4"></td>
+            </tr>,
+          ]
         : [];
 
     // Sort entries: directories first, then files, both alphabetically
-    const sortedEntries = Object.entries(directory).sort(([nameA, nodeA], [nameB, nodeB]) => {
-      const isFileA = !!nodeA.type;
-      const isFileB = !!nodeB.type;
+    const sortedEntries = Object.entries(directory).sort(
+      ([nameA, nodeA], [nameB, nodeB]) => {
+        const isFileA = !!nodeA.type;
+        const isFileB = !!nodeB.type;
 
-      if (isFileA !== isFileB) {
-        return isFileA ? 1 : -1; // Directories first
-      }
-
-      return nameA.localeCompare(nameB); // Alphabetical within each group
-    });
+        if (isFileA !== isFileB) {
+          return isFileA ? 1 : -1; // Directories first
+        }
 
+        return nameA.localeCompare(nameB); // Alphabetical within each group
+      },
+    );
 
     // Process directories
     const directoryRows = sortedEntries
@@ -450,7 +470,7 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
               <div ref={menuRef} className="relative">
                 <button
                   onClick={(e) => handleMenuClick(e, itemId)}
-                  className="inline-flex h-[35px] w-[24px] shrink-0 items-center justify-center rounded-md transition-colors hover:bg-[#EBEBEB] dark:hover:bg-[#26272E] font-medium"
+                  className="inline-flex h-[35px] w-[24px] shrink-0 items-center justify-center rounded-md font-medium transition-colors hover:bg-[#EBEBEB] dark:hover:bg-[#26272E]"
                   aria-label={t('settings.sources.menuAlt')}
                 >
                   <img
@@ -510,7 +530,7 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
               <div ref={menuRef} className="relative">
                 <button
                   onClick={(e) => handleMenuClick(e, itemId)}
-                  className="inline-flex h-[35px] w-[24px] shrink-0 items-center justify-center rounded-md transition-colors hover:bg-[#EBEBEB] dark:hover:bg-[#26272E] font-medium"
+                  className="inline-flex h-[35px] w-[24px] shrink-0 items-center justify-center rounded-md font-medium transition-colors hover:bg-[#EBEBEB] dark:hover:bg-[#26272E]"
                   aria-label={t('settings.sources.menuAlt')}
                 >
                   <img
@@ -602,14 +622,12 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
             }
           }}
           placeholder={t('settings.sources.searchFiles')}
-          className={`w-full h-[38px] border border-[#D1D9E0] px-4 py-2 dark:border-[#6A6A6A]
-              ${searchQuery ? 'rounded-t-[24px]' : 'rounded-[24px]'}
-              bg-transparent focus:outline-none dark:text-[#E0E0E0]`}
+          className={`h-[38px] w-full border border-[#D1D9E0] px-4 py-2 dark:border-[#6A6A6A] ${searchQuery ? 'rounded-t-[24px]' : 'rounded-[24px]'} bg-transparent focus:outline-none dark:text-[#E0E0E0]`}
         />
 
         {searchQuery && (
-          <div className="absolute top-full left-0 right-0 z-10 max-h-[calc(100vh-200px)] w-full overflow-hidden rounded-b-[12px] border border-t-0 border-[#D1D9E0] bg-white shadow-lg dark:border-[#6A6A6A] dark:bg-[#1F2023] transition-all duration-200">
-            <div className="max-h-[calc(100vh-200px)] overflow-y-auto overflow-x-hidden overscroll-contain">
+          <div className="absolute top-full right-0 left-0 z-10 max-h-[calc(100vh-200px)] w-full overflow-hidden rounded-b-[12px] border border-t-0 border-[#D1D9E0] bg-white shadow-lg transition-all duration-200 dark:border-[#6A6A6A] dark:bg-[#1F2023]">
+            <div className="max-h-[calc(100vh-200px)] overflow-x-hidden overflow-y-auto overscroll-contain">
               {searchResults.length === 0 ? (
                 <div className="py-2 text-center text-sm text-gray-500 dark:text-gray-400">
                   {t('settings.sources.noResults')}
@@ -620,10 +638,11 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
                     key={index}
                     onClick={() => handleSearchSelect(result)}
                     title={result.path}
-                    className={`flex min-w-0 cursor-pointer items-center px-3 py-2 hover:bg-[#ECEEEF] dark:hover:bg-[#27282D] ${index !== searchResults.length - 1
+                    className={`flex min-w-0 cursor-pointer items-center px-3 py-2 hover:bg-[#ECEEEF] dark:hover:bg-[#27282D] ${
+                      index !== searchResults.length - 1
                         ? 'border-b border-[#D1D9E0] dark:border-[#6A6A6A]'
                         : ''
-                      }`}
+                    }`}
                   >
                     <img
                       src={result.isFile ? FileIcon : FolderIcon}
@@ -634,7 +653,7 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
                       }
                       className="mr-2 h-4 w-4 flex-shrink-0"
                     />
-                    <span className="text-sm dark:text-[#E0E0E0] truncate flex-1">
+                    <span className="flex-1 truncate text-sm dark:text-[#E0E0E0]">
                       {result.path.split('/').pop() || result.path}
                     </span>
                   </div>
@@ -706,9 +725,7 @@ const ConnectorTreeComponent: React.FC<ConnectorTreeComponentProps> = ({
                     <th className="w-10 px-2 py-3 text-left text-sm font-medium text-gray-700 lg:px-4 dark:text-[#59636E]"></th>
                   </tr>
                 </thead>
-                <tbody>
-                  {renderFileTree(getCurrentDirectory())}
-                </tbody>
+                <tbody>{renderFileTree(getCurrentDirectory())}</tbody>
               </table>
             </div>
           </div>