diff --git a/.env.example b/.env.example
index 103728fe0c2..0b56317ff31 100644
--- a/.env.example
+++ b/.env.example
@@ -111,6 +111,26 @@ ANTHROPIC_API_KEY=user_provided
 BINGAI_TOKEN=user_provided
 # BINGAI_HOST=https://cn.bing.com
 
+#=================#
+#   AWS Bedrock   #
+#=================#
+
+# BEDROCK_AWS_DEFAULT_REGION=us-east-1 # A default region must be provided
+# BEDROCK_AWS_ACCESS_KEY_ID=someAccessKey
+# BEDROCK_AWS_SECRET_ACCESS_KEY=someSecretAccessKey
+
+# Note: This example list is not meant to be exhaustive. If omitted, all known, supported model IDs will be included for you.
+# BEDROCK_AWS_MODELS=anthropic.claude-3-5-sonnet-20240620-v1:0,meta.llama3-1-8b-instruct-v1:0
+
+# See all Bedrock model IDs here: https://docs.aws.amazon.com/bedrock/latest/userguide/model-ids.html#model-ids-arns
+
+# Notes on specific models:
+# The following models are not support due to not supporting streaming:
+# ai21.j2-mid-v1
+
+# The following models are not support due to not supporting conversation history:
+# ai21.j2-ultra-v1, cohere.command-text-v14, cohere.command-light-text-v14
+
 #============#
 # Google     #
 #============#
@@ -392,6 +412,7 @@ LDAP_CA_CERT_PATH=
 # LDAP_LOGIN_USES_USERNAME=true
 # LDAP_ID=
 # LDAP_USERNAME=
+# LDAP_EMAIL=
 # LDAP_FULL_NAME=
 
 #========================#
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index ccdc68d81b3..00000000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/api" # Location of package manifests
-    target-branch: "dev"
-    versioning-strategy: increase-if-necessary
-    schedule:
-      interval: "weekly"
-    allow:
-      # Allow both direct and indirect updates for all packages
-      - dependency-type: "all"
-    commit-message:
-      prefix: "npm api prod"
-      prefix-development: "npm api dev"
-      include: "scope"
-  - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/client" # Location of package manifests
-    target-branch: "dev"
-    versioning-strategy: increase-if-necessary
-    schedule:
-      interval: "weekly"
-    allow:
-      # Allow both direct and indirect updates for all packages
-      - dependency-type: "all"
-    commit-message:
-      prefix: "npm client prod"
-      prefix-development: "npm client dev"
-      include: "scope"
-  - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    target-branch: "dev"
-    versioning-strategy: increase-if-necessary
-    schedule:
-      interval: "weekly"
-    allow:
-      # Allow both direct and indirect updates for all packages
-      - dependency-type: "all"
-    commit-message:
-      prefix: "npm all prod"
-      prefix-development: "npm all dev"
-      include: "scope" 
-     
diff --git a/Dockerfile b/Dockerfile
index e8530fb58c9..0793f0de11d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# v0.7.5-rc1
+# v0.7.5-rc2
 
 # Base node image
 FROM node:20-alpine AS node
diff --git a/Dockerfile.multi b/Dockerfile.multi
index 175563597ae..a32183d82f3 100644
--- a/Dockerfile.multi
+++ b/Dockerfile.multi
@@ -1,5 +1,5 @@
 # Dockerfile.multi
-# v0.7.5-rc1
+# v0.7.5-rc2
 
 # Base for all builds
 FROM node:20-alpine AS base
diff --git a/README.md b/README.md
index f1d92b50dae..50ccd252b9c 100644
--- a/README.md
+++ b/README.md
@@ -42,10 +42,10 @@
 
 - 🖥️ UI matching ChatGPT, including Dark mode, Streaming, and latest updates
 - 🤖 AI model selection:
-  - OpenAI, Azure OpenAI, BingAI, ChatGPT, Google Vertex AI, Anthropic (Claude), Plugins, Assistants API (including Azure Assistants)
+  - Anthropic (Claude), AWS Bedrock, OpenAI, Azure OpenAI, BingAI, ChatGPT, Google Vertex AI, Plugins, Assistants API (including Azure Assistants)
 - ✅ Compatible across both **[Remote & Local AI services](https://www.librechat.ai/docs/configuration/librechat_yaml/ai_endpoints):**
   - groq, Ollama, Cohere, Mistral AI, Apple MLX, koboldcpp, OpenRouter, together.ai, Perplexity, ShuttleAI, and more
-- 🪄 Generative UI with [Code Artifacts](https://youtu.be/GfTj7O4gmd0?si=WJbdnemZpJzBrJo3)
+- 🪄 Generative UI with **[Code Artifacts](https://youtu.be/GfTj7O4gmd0?si=WJbdnemZpJzBrJo3)**
    - Create React, HTML code, and Mermaid diagrams right in chat
 - 💾 Create, Save, & Share Custom Presets
 - 🔀 Switch between AI Endpoints and Presets, mid-chat
diff --git a/api/app/clients/AnthropicClient.js b/api/app/clients/AnthropicClient.js
index 873f2615695..486af95c3f3 100644
--- a/api/app/clients/AnthropicClient.js
+++ b/api/app/clients/AnthropicClient.js
@@ -17,8 +17,8 @@ const {
   parseParamFromPrompt,
   createContextHandlers,
 } = require('./prompts');
+const { getModelMaxTokens, getModelMaxOutputTokens, matchModelName } = require('~/utils');
 const { spendTokens, spendStructuredTokens } = require('~/models/spendTokens');
-const { getModelMaxTokens, matchModelName } = require('~/utils');
 const { sleep } = require('~/server/utils');
 const BaseClient = require('./BaseClient');
 const { logger } = require('~/config');
@@ -64,6 +64,12 @@ class AnthropicClient extends BaseClient {
     /** Whether or not the model supports Prompt Caching
      * @type {boolean} */
     this.supportsCacheControl;
+    /** The key for the usage object's input tokens
+     * @type {string} */
+    this.inputTokensKey = 'input_tokens';
+    /** The key for the usage object's output tokens
+     * @type {string} */
+    this.outputTokensKey = 'output_tokens';
   }
 
   setOptions(options) {
@@ -114,7 +120,14 @@ class AnthropicClient extends BaseClient {
       this.options.maxContextTokens ??
       getModelMaxTokens(this.modelOptions.model, EModelEndpoint.anthropic) ??
       100000;
-    this.maxResponseTokens = this.modelOptions.maxOutputTokens || 1500;
+    this.maxResponseTokens =
+      this.modelOptions.maxOutputTokens ??
+      getModelMaxOutputTokens(
+        this.modelOptions.model,
+        this.options.endpointType ?? this.options.endpoint,
+        this.options.endpointTokenConfig,
+      ) ??
+      1500;
     this.maxPromptTokens =
       this.options.maxPromptTokens || this.maxContextTokens - this.maxResponseTokens;
 
@@ -138,17 +151,6 @@ class AnthropicClient extends BaseClient {
     this.endToken = '';
     this.gptEncoder = this.constructor.getTokenizer('cl100k_base');
 
-    if (!this.modelOptions.stop) {
-      const stopTokens = [this.startToken];
-      if (this.endToken && this.endToken !== this.startToken) {
-        stopTokens.push(this.endToken);
-      }
-      stopTokens.push(`${this.userLabel}`);
-      stopTokens.push('<|diff_marker|>');
-
-      this.modelOptions.stop = stopTokens;
-    }
-
     return this;
   }
 
@@ -200,7 +202,7 @@ class AnthropicClient extends BaseClient {
   }
 
   /**
-   * Calculates the correct token count for the current message based on the token count map and API usage.
+   * Calculates the correct token count for the current user message based on the token count map and API usage.
    * Edge case: If the calculation results in a negative value, it returns the original estimate.
    * If revisiting a conversation with a chat history entirely composed of token estimates,
    * the cumulative token count going forward should become more accurate as the conversation progresses.
@@ -208,7 +210,7 @@ class AnthropicClient extends BaseClient {
    * @param {Record<string, number>} params.tokenCountMap - A map of message IDs to their token counts.
    * @param {string} params.currentMessageId - The ID of the current message to calculate.
    * @param {AnthropicStreamUsage} params.usage - The usage object returned by the API.
-   * @returns {number} The correct token count for the current message.
+   * @returns {number} The correct token count for the current user message.
    */
   calculateCurrentTokenCount({ tokenCountMap, currentMessageId, usage }) {
     const originalEstimate = tokenCountMap[currentMessageId] || 0;
@@ -680,7 +682,11 @@ class AnthropicClient extends BaseClient {
    */
   checkPromptCacheSupport(modelName) {
     const modelMatch = matchModelName(modelName, EModelEndpoint.anthropic);
-    if (modelMatch === 'claude-3-5-sonnet' || modelMatch === 'claude-3-haiku') {
+    if (
+      modelMatch === 'claude-3-5-sonnet' ||
+      modelMatch === 'claude-3-haiku' ||
+      modelMatch === 'claude-3-opus'
+    ) {
       return true;
     }
     return false;
diff --git a/api/app/clients/BaseClient.js b/api/app/clients/BaseClient.js
index 76403880608..51d75d063b0 100644
--- a/api/app/clients/BaseClient.js
+++ b/api/app/clients/BaseClient.js
@@ -2,6 +2,8 @@ const crypto = require('crypto');
 const fetch = require('node-fetch');
 const {
   supportsBalanceCheck,
+  isAgentsEndpoint,
+  isParamEndpoint,
   ErrorTypes,
   Constants,
   CacheKeys,
@@ -40,6 +42,12 @@ class BaseClient {
     this.conversationId;
     /** @type {string} */
     this.responseMessageId;
+    /** The key for the usage object's input tokens
+     * @type {string} */
+    this.inputTokensKey = 'prompt_tokens';
+    /** The key for the usage object's output tokens
+     * @type {string} */
+    this.outputTokensKey = 'completion_tokens';
   }
 
   setOptions() {
@@ -66,6 +74,17 @@ class BaseClient {
     throw new Error('Subclasses attempted to call summarizeMessages without implementing it');
   }
 
+  /**
+   * @returns {string}
+   */
+  getResponseModel() {
+    if (isAgentsEndpoint(this.options.endpoint) && this.options.agent && this.options.agent.id) {
+      return this.options.agent.id;
+    }
+
+    return this.modelOptions.model;
+  }
+
   /**
    * Abstract method to get the token count for a message. Subclasses must implement this method.
    * @param {TMessage} responseMessage
@@ -217,6 +236,7 @@ class BaseClient {
         userMessage,
         conversationId,
         responseMessageId,
+        sender: this.sender,
       });
     }
 
@@ -548,6 +568,7 @@ class BaseClient {
       });
     }
 
+    /** @type {string|string[]|undefined} */
     const completion = await this.sendCompletion(payload, opts);
     this.abortController.requestCompleted = true;
 
@@ -557,7 +578,7 @@ class BaseClient {
       parentMessageId: userMessage.messageId,
       isCreatedByUser: false,
       isEdited,
-      model: this.modelOptions.model,
+      model: this.getResponseModel(),
       sender: this.sender,
       promptTokens,
       iconURL: this.options.iconURL,
@@ -567,9 +588,14 @@ class BaseClient {
 
     if (typeof completion === 'string') {
       responseMessage.text = addSpaceIfNeeded(generation) + completion;
-    } else if (completion) {
+    } else if (
+      Array.isArray(completion) &&
+      isParamEndpoint(this.options.endpoint, this.options.endpointType)
+    ) {
       responseMessage.text = '';
       responseMessage.content = completion;
+    } else if (Array.isArray(completion)) {
+      responseMessage.text = addSpaceIfNeeded(generation) + completion.join('');
     }
 
     if (
@@ -587,8 +613,8 @@ class BaseClient {
        * @type {StreamUsage | null} */
       const usage = this.getStreamUsage != null ? this.getStreamUsage() : null;
 
-      if (usage != null && Number(usage.output_tokens) > 0) {
-        responseMessage.tokenCount = usage.output_tokens;
+      if (usage != null && Number(usage[this.outputTokensKey]) > 0) {
+        responseMessage.tokenCount = usage[this.outputTokensKey];
         completionTokens = responseMessage.tokenCount;
         await this.updateUserMessageTokenCount({ usage, tokenCountMap, userMessage, opts });
       } else {
@@ -638,7 +664,7 @@ class BaseClient {
     /** @type {boolean} */
     const shouldUpdateCount =
       this.calculateCurrentTokenCount != null &&
-      Number(usage.input_tokens) > 0 &&
+      Number(usage[this.inputTokensKey]) > 0 &&
       (this.options.resendFiles ||
         (!this.options.resendFiles && !this.options.attachments?.length)) &&
       !this.options.promptPrefix;
diff --git a/api/app/clients/ChatGPTClient.js b/api/app/clients/ChatGPTClient.js
index 0a7f6fc7d88..104e9e5ac3f 100644
--- a/api/app/clients/ChatGPTClient.js
+++ b/api/app/clients/ChatGPTClient.js
@@ -1,19 +1,21 @@
 const Keyv = require('keyv');
 const crypto = require('crypto');
+const { CohereClient } = require('cohere-ai');
+const { fetchEventSource } = require('@waylaidwanderer/fetch-event-source');
+const { encoding_for_model: encodingForModel, get_encoding: getEncoding } = require('tiktoken');
 const {
+  ImageDetail,
   EModelEndpoint,
   resolveHeaders,
   CohereConstants,
   mapModelToAzureConfig,
 } = require('librechat-data-provider');
-const { CohereClient } = require('cohere-ai');
-const { encoding_for_model: encodingForModel, get_encoding: getEncoding } = require('tiktoken');
-const { fetchEventSource } = require('@waylaidwanderer/fetch-event-source');
+const { extractBaseURL, constructAzureURL, genAzureChatCompletion } = require('~/utils');
+const { createContextHandlers } = require('./prompts');
 const { createCoherePayload } = require('./llm');
 const { Agent, ProxyAgent } = require('undici');
 const BaseClient = require('./BaseClient');
 const { logger } = require('~/config');
-const { extractBaseURL, constructAzureURL, genAzureChatCompletion } = require('~/utils');
 
 const CHATGPT_MODEL = 'gpt-3.5-turbo';
 const tokenizersCache = {};
@@ -612,21 +614,66 @@ ${botMessage.message}
 
   async buildPrompt(messages, { isChatGptModel = false, promptPrefix = null }) {
     promptPrefix = (promptPrefix || this.options.promptPrefix || '').trim();
+
+    // Handle attachments and create augmentedPrompt
+    if (this.options.attachments) {
+      const attachments = await this.options.attachments;
+      const lastMessage = messages[messages.length - 1];
+
+      if (this.message_file_map) {
+        this.message_file_map[lastMessage.messageId] = attachments;
+      } else {
+        this.message_file_map = {
+          [lastMessage.messageId]: attachments,
+        };
+      }
+
+      const files = await this.addImageURLs(lastMessage, attachments);
+      this.options.attachments = files;
+
+      this.contextHandlers = createContextHandlers(this.options.req, lastMessage.text);
+    }
+
+    if (this.message_file_map) {
+      this.contextHandlers = createContextHandlers(
+        this.options.req,
+        messages[messages.length - 1].text,
+      );
+    }
+
+    // Calculate image token cost and process embedded files
+    messages.forEach((message, i) => {
+      if (this.message_file_map && this.message_file_map[message.messageId]) {
+        const attachments = this.message_file_map[message.messageId];
+        for (const file of attachments) {
+          if (file.embedded) {
+            this.contextHandlers?.processFile(file);
+            continue;
+          }
+
+          messages[i].tokenCount =
+            (messages[i].tokenCount || 0) +
+            this.calculateImageTokenCost({
+              width: file.width,
+              height: file.height,
+              detail: this.options.imageDetail ?? ImageDetail.auto,
+            });
+        }
+      }
+    });
+
+    if (this.contextHandlers) {
+      this.augmentedPrompt = await this.contextHandlers.createContext();
+      promptPrefix = this.augmentedPrompt + promptPrefix;
+    }
+
     if (promptPrefix) {
       // If the prompt prefix doesn't end with the end token, add it.
       if (!promptPrefix.endsWith(`${this.endToken}`)) {
         promptPrefix = `${promptPrefix.trim()}${this.endToken}\n\n`;
       }
       promptPrefix = `${this.startToken}Instructions:\n${promptPrefix}`;
-    } else {
-      const currentDateString = new Date().toLocaleDateString('en-us', {
-        year: 'numeric',
-        month: 'long',
-        day: 'numeric',
-      });
-      promptPrefix = `${this.startToken}Instructions:\nYou are ChatGPT, a large language model trained by OpenAI. Respond conversationally.\nCurrent date: ${currentDateString}${this.endToken}\n\n`;
     }
-
     const promptSuffix = `${this.startToken}${this.chatGptLabel}:\n`; // Prompt ChatGPT to respond.
 
     const instructionsPayload = {
@@ -714,10 +761,6 @@ ${botMessage.message}
       this.maxResponseTokens,
     );
 
-    if (this.options.debug) {
-      console.debug(`Prompt : ${prompt}`);
-    }
-
     if (isChatGptModel) {
       return { prompt: [instructionsPayload, messagePayload], context };
     }
diff --git a/api/app/clients/OpenAIClient.js b/api/app/clients/OpenAIClient.js
index 4338a29d5a4..4f5e29cac88 100644
--- a/api/app/clients/OpenAIClient.js
+++ b/api/app/clients/OpenAIClient.js
@@ -19,6 +19,7 @@ const {
   constructAzureURL,
   getModelMaxTokens,
   genAzureChatCompletion,
+  getModelMaxOutputTokens,
 } = require('~/utils');
 const {
   truncateText,
@@ -64,6 +65,9 @@ class OpenAIClient extends BaseClient {
 
     /** @type {string | undefined} - The API Completions URL */
     this.completionsUrl;
+
+    /** @type {OpenAIUsageMetadata | undefined} */
+    this.usage;
   }
 
   // TODO: PluginsClient calls this 3x, unneeded
@@ -138,7 +142,8 @@ class OpenAIClient extends BaseClient {
 
     const { model } = this.modelOptions;
 
-    this.isChatCompletion = this.useOpenRouter || !!reverseProxy || model.includes('gpt');
+    this.isChatCompletion =
+      /\bo1\b/i.test(model) || model.includes('gpt') || this.useOpenRouter || !!reverseProxy;
     this.isChatGptModel = this.isChatCompletion;
     if (
       model.includes('text-davinci') ||
@@ -169,7 +174,14 @@ class OpenAIClient extends BaseClient {
       logger.debug('[OpenAIClient] maxContextTokens', this.maxContextTokens);
     }
 
-    this.maxResponseTokens = this.modelOptions.max_tokens || 1024;
+    this.maxResponseTokens =
+      this.modelOptions.max_tokens ??
+      getModelMaxOutputTokens(
+        model,
+        this.options.endpointType ?? this.options.endpoint,
+        this.options.endpointTokenConfig,
+      ) ??
+      1024;
     this.maxPromptTokens =
       this.options.maxPromptTokens || this.maxContextTokens - this.maxResponseTokens;
 
@@ -533,7 +545,8 @@ class OpenAIClient extends BaseClient {
       promptPrefix = this.augmentedPrompt + promptPrefix;
     }
 
-    if (promptPrefix) {
+    const isO1Model = /\bo1\b/i.test(this.modelOptions.model);
+    if (promptPrefix && !isO1Model) {
       promptPrefix = `Instructions:\n${promptPrefix.trim()}`;
       instructions = {
         role: 'system',
@@ -561,6 +574,16 @@ class OpenAIClient extends BaseClient {
       messages,
     };
 
+    /** EXPERIMENTAL */
+    if (promptPrefix && isO1Model) {
+      const lastUserMessageIndex = payload.findLastIndex((message) => message.role === 'user');
+      if (lastUserMessageIndex !== -1) {
+        payload[
+          lastUserMessageIndex
+        ].content = `${promptPrefix}\n${payload[lastUserMessageIndex].content}`;
+      }
+    }
+
     if (tokenCountMap) {
       tokenCountMap.instructions = instructions?.tokenCount;
       result.tokenCountMap = tokenCountMap;
@@ -621,6 +644,12 @@ class OpenAIClient extends BaseClient {
 
       if (completionResult && typeof completionResult === 'string') {
         reply = completionResult;
+      } else if (
+        completionResult &&
+        typeof completionResult === 'object' &&
+        Array.isArray(completionResult.choices)
+      ) {
+        reply = completionResult.choices[0]?.text?.replace(this.endToken, '');
       }
     } else if (typeof opts.onProgress === 'function' || this.options.useChatCompletion) {
       reply = await this.chatCompletion({
@@ -885,6 +914,60 @@ ${convo}
     return title;
   }
 
+  /**
+   * Get stream usage as returned by this client's API response.
+   * @returns {OpenAIUsageMetadata} The stream usage object.
+   */
+  getStreamUsage() {
+    if (
+      this.usage &&
+      typeof this.usage === 'object' &&
+      'completion_tokens_details' in this.usage &&
+      this.usage.completion_tokens_details &&
+      typeof this.usage.completion_tokens_details === 'object' &&
+      'reasoning_tokens' in this.usage.completion_tokens_details
+    ) {
+      const outputTokens = Math.abs(
+        this.usage.completion_tokens_details.reasoning_tokens - this.usage[this.outputTokensKey],
+      );
+      return {
+        ...this.usage.completion_tokens_details,
+        [this.inputTokensKey]: this.usage[this.inputTokensKey],
+        [this.outputTokensKey]: outputTokens,
+      };
+    }
+    return this.usage;
+  }
+
+  /**
+   * Calculates the correct token count for the current user message based on the token count map and API usage.
+   * Edge case: If the calculation results in a negative value, it returns the original estimate.
+   * If revisiting a conversation with a chat history entirely composed of token estimates,
+   * the cumulative token count going forward should become more accurate as the conversation progresses.
+   * @param {Object} params - The parameters for the calculation.
+   * @param {Record<string, number>} params.tokenCountMap - A map of message IDs to their token counts.
+   * @param {string} params.currentMessageId - The ID of the current message to calculate.
+   * @param {OpenAIUsageMetadata} params.usage - The usage object returned by the API.
+   * @returns {number} The correct token count for the current user message.
+   */
+  calculateCurrentTokenCount({ tokenCountMap, currentMessageId, usage }) {
+    const originalEstimate = tokenCountMap[currentMessageId] || 0;
+
+    if (!usage || typeof usage[this.inputTokensKey] !== 'number') {
+      return originalEstimate;
+    }
+
+    tokenCountMap[currentMessageId] = 0;
+    const totalTokensFromMap = Object.values(tokenCountMap).reduce((sum, count) => {
+      const numCount = Number(count);
+      return sum + (isNaN(numCount) ? 0 : numCount);
+    }, 0);
+    const totalInputTokens = usage[this.inputTokensKey] ?? 0;
+
+    const currentMessageTokens = totalInputTokens - totalTokensFromMap;
+    return currentMessageTokens > 0 ? currentMessageTokens : originalEstimate;
+  }
+
   async summarizeMessages({ messagesToRefine, remainingContextTokens }) {
     logger.debug('[OpenAIClient] Summarizing messages...');
     let context = messagesToRefine;
@@ -1000,7 +1083,16 @@ ${convo}
     }
   }
 
-  async recordTokenUsage({ promptTokens, completionTokens, context = 'message' }) {
+  /**
+   * @param {object} params
+   * @param {number} params.promptTokens
+   * @param {number} params.completionTokens
+   * @param {OpenAIUsageMetadata} [params.usage]
+   * @param {string} [params.model]
+   * @param {string} [params.context='message']
+   * @returns {Promise<void>}
+   */
+  async recordTokenUsage({ promptTokens, completionTokens, usage, context = 'message' }) {
     await spendTokens(
       {
         context,
@@ -1011,6 +1103,24 @@ ${convo}
       },
       { promptTokens, completionTokens },
     );
+
+    if (
+      usage &&
+      typeof usage === 'object' &&
+      'reasoning_tokens' in usage &&
+      typeof usage.reasoning_tokens === 'number'
+    ) {
+      await spendTokens(
+        {
+          context: 'reasoning',
+          model: this.modelOptions.model,
+          conversationId: this.conversationId,
+          user: this.user ?? this.options.req.user?.id,
+          endpointTokenConfig: this.options.endpointTokenConfig,
+        },
+        { completionTokens: usage.reasoning_tokens },
+      );
+    }
   }
 
   getTokenCountForResponse(response) {
@@ -1191,6 +1301,11 @@ ${convo}
       /** @type {(value: void | PromiseLike<void>) => void} */
       let streamResolve;
 
+      if (modelOptions.stream && /\bo1\b/i.test(modelOptions.model)) {
+        delete modelOptions.stream;
+        delete modelOptions.stop;
+      }
+
       if (modelOptions.stream) {
         streamPromise = new Promise((resolve) => {
           streamResolve = resolve;
@@ -1269,9 +1384,11 @@ ${convo}
       }
 
       const { choices } = chatCompletion;
+      this.usage = chatCompletion.usage;
+
       if (!Array.isArray(choices) || choices.length === 0) {
         logger.warn('[OpenAIClient] Chat completion response has no choices');
-        return intermediateReply;
+        return intermediateReply.join('');
       }
 
       const { message, finish_reason } = choices[0] ?? {};
@@ -1281,7 +1398,7 @@ ${convo}
 
       if (!message) {
         logger.warn('[OpenAIClient] Message is undefined in chatCompletion response');
-        return intermediateReply;
+        return intermediateReply.join('');
       }
 
       if (typeof message.content !== 'string' || message.content.trim() === '') {
@@ -1316,7 +1433,7 @@ ${convo}
         logger.error('[OpenAIClient] Known OpenAI error:', err);
         return intermediateReply.join('');
       } else if (err instanceof OpenAI.APIError) {
-        if (intermediateReply) {
+        if (intermediateReply.length > 0) {
           return intermediateReply.join('');
         } else {
           throw err;
diff --git a/api/app/clients/prompts/formatMessages.js b/api/app/clients/prompts/formatMessages.js
index 87d5ba7a15f..1ea44f9d290 100644
--- a/api/app/clients/prompts/formatMessages.js
+++ b/api/app/clients/prompts/formatMessages.js
@@ -142,6 +142,9 @@ const formatAgentMessages = (payload) => {
   const messages = [];
 
   for (const message of payload) {
+    if (typeof message.content === 'string') {
+      message.content = [{ type: ContentTypes.TEXT, [ContentTypes.TEXT]: message.content }];
+    }
     if (message.role !== 'assistant') {
       messages.push(formatMessage({ message, langChain: true }));
       continue;
@@ -170,7 +173,15 @@ const formatAgentMessages = (payload) => {
         }
 
         // Note: `tool_calls` list is defined when constructed by `AIMessage` class, and outputs should be excluded from it
-        const { output, ...tool_call } = part.tool_call;
+        const { output, args: _args, ...tool_call } = part.tool_call;
+        // TODO: investigate; args as dictionary may need to be provider-or-tool-specific
+        let args = _args;
+        try {
+          args = JSON.parse(args);
+        } catch (e) {
+          // failed to parse, leave as is
+        }
+        tool_call.args = args;
         lastAIMessage.tool_calls.push(tool_call);
 
         // Add the corresponding ToolMessage
diff --git a/api/app/clients/specs/BaseClient.test.js b/api/app/clients/specs/BaseClient.test.js
index e3cc1515c56..0fdc6ce16c0 100644
--- a/api/app/clients/specs/BaseClient.test.js
+++ b/api/app/clients/specs/BaseClient.test.js
@@ -565,11 +565,13 @@ describe('BaseClient', () => {
       const getReqData = jest.fn();
       const opts = { getReqData };
       const response = await TestClient.sendMessage('Hello, world!', opts);
-      expect(getReqData).toHaveBeenCalledWith({
-        userMessage: expect.objectContaining({ text: 'Hello, world!' }),
-        conversationId: response.conversationId,
-        responseMessageId: response.messageId,
-      });
+      expect(getReqData).toHaveBeenCalledWith(
+        expect.objectContaining({
+          userMessage: expect.objectContaining({ text: 'Hello, world!' }),
+          conversationId: response.conversationId,
+          responseMessageId: response.messageId,
+        }),
+      );
     });
 
     test('onStart is called with the correct arguments', async () => {
diff --git a/api/app/clients/specs/OpenAIClient.test.js b/api/app/clients/specs/OpenAIClient.test.js
index 45903984193..0725efd9d83 100644
--- a/api/app/clients/specs/OpenAIClient.test.js
+++ b/api/app/clients/specs/OpenAIClient.test.js
@@ -611,15 +611,7 @@ describe('OpenAIClient', () => {
       expect(getCompletion).toHaveBeenCalled();
       expect(getCompletion.mock.calls.length).toBe(1);
 
-      const currentDateString = new Date().toLocaleDateString('en-us', {
-        year: 'numeric',
-        month: 'long',
-        day: 'numeric',
-      });
-
-      expect(getCompletion.mock.calls[0][0]).toBe(
-        `||>Instructions:\nYou are ChatGPT, a large language model trained by OpenAI. Respond conversationally.\nCurrent date: ${currentDateString}\n\n||>User:\nHi mom!\n||>Assistant:\n`,
-      );
+      expect(getCompletion.mock.calls[0][0]).toBe('||>User:\nHi mom!\n||>Assistant:\n');
 
       expect(fetchEventSource).toHaveBeenCalled();
       expect(fetchEventSource.mock.calls.length).toBe(1);
@@ -701,4 +693,70 @@ describe('OpenAIClient', () => {
       expect(client.modelOptions.stop).toBeUndefined();
     });
   });
+
+  describe('getStreamUsage', () => {
+    it('should return this.usage when completion_tokens_details is null', () => {
+      const client = new OpenAIClient('test-api-key', defaultOptions);
+      client.usage = {
+        completion_tokens_details: null,
+        prompt_tokens: 10,
+        completion_tokens: 20,
+      };
+      client.inputTokensKey = 'prompt_tokens';
+      client.outputTokensKey = 'completion_tokens';
+
+      const result = client.getStreamUsage();
+
+      expect(result).toEqual(client.usage);
+    });
+
+    it('should return this.usage when completion_tokens_details is missing reasoning_tokens', () => {
+      const client = new OpenAIClient('test-api-key', defaultOptions);
+      client.usage = {
+        completion_tokens_details: {
+          other_tokens: 5,
+        },
+        prompt_tokens: 10,
+        completion_tokens: 20,
+      };
+      client.inputTokensKey = 'prompt_tokens';
+      client.outputTokensKey = 'completion_tokens';
+
+      const result = client.getStreamUsage();
+
+      expect(result).toEqual(client.usage);
+    });
+
+    it('should calculate output tokens correctly when completion_tokens_details is present with reasoning_tokens', () => {
+      const client = new OpenAIClient('test-api-key', defaultOptions);
+      client.usage = {
+        completion_tokens_details: {
+          reasoning_tokens: 30,
+          other_tokens: 5,
+        },
+        prompt_tokens: 10,
+        completion_tokens: 20,
+      };
+      client.inputTokensKey = 'prompt_tokens';
+      client.outputTokensKey = 'completion_tokens';
+
+      const result = client.getStreamUsage();
+
+      expect(result).toEqual({
+        reasoning_tokens: 30,
+        other_tokens: 5,
+        prompt_tokens: 10,
+        completion_tokens: 10, // |30 - 20| = 10
+      });
+    });
+
+    it('should return this.usage when it is undefined', () => {
+      const client = new OpenAIClient('test-api-key', defaultOptions);
+      client.usage = undefined;
+
+      const result = client.getStreamUsage();
+
+      expect(result).toBeUndefined();
+    });
+  });
 });
diff --git a/api/app/clients/tools/AzureAiSearch.js b/api/app/clients/tools/AzureAiSearch.js
index 9b50aa2c433..1e20b9ce81d 100644
--- a/api/app/clients/tools/AzureAiSearch.js
+++ b/api/app/clients/tools/AzureAiSearch.js
@@ -77,7 +77,7 @@ class AzureAISearch extends StructuredTool {
     try {
       const searchOption = {
         queryType: this.queryType,
-        top: this.top,
+        top: typeof this.top === 'string' ? Number(this.top) : this.top,
       };
       if (this.select) {
         searchOption.select = this.select.split(',');
diff --git a/api/app/clients/tools/structured/AzureAISearch.js b/api/app/clients/tools/structured/AzureAISearch.js
index 0ce7b43fb21..1a8c3e9e6e5 100644
--- a/api/app/clients/tools/structured/AzureAISearch.js
+++ b/api/app/clients/tools/structured/AzureAISearch.js
@@ -83,7 +83,7 @@ class AzureAISearch extends StructuredTool {
     try {
       const searchOption = {
         queryType: this.queryType,
-        top: this.top,
+        top: typeof this.top === 'string' ? Number(this.top) : this.top,
       };
       if (this.select) {
         searchOption.select = this.select.split(',');
diff --git a/api/models/Action.js b/api/models/Action.js
index 7971f3e61a3..299b3bf20a3 100644
--- a/api/models/Action.js
+++ b/api/models/Action.js
@@ -5,17 +5,16 @@ const Action = mongoose.model('action', actionSchema);
 
 /**
  * Update an action with new data without overwriting existing properties,
- * or create a new action if it doesn't exist, within a transaction session if provided.
+ * or create a new action if it doesn't exist.
  *
  * @param {Object} searchParams - The search parameters to find the action to update.
  * @param {string} searchParams.action_id - The ID of the action to update.
  * @param {string} searchParams.user - The user ID of the action's author.
  * @param {Object} updateData - An object containing the properties to update.
- * @param {mongoose.ClientSession} [session] - The transaction session to use.
  * @returns {Promise<Action>} The updated or newly created action document as a plain object.
  */
-const updateAction = async (searchParams, updateData, session = null) => {
-  const options = { new: true, upsert: true, session };
+const updateAction = async (searchParams, updateData) => {
+  const options = { new: true, upsert: true };
   return await Action.findOneAndUpdate(searchParams, updateData, options).lean();
 };
 
@@ -49,31 +48,27 @@ const getActions = async (searchParams, includeSensitive = false) => {
 };
 
 /**
- * Deletes an action by params, within a transaction session if provided.
+ * Deletes an action by params.
  *
  * @param {Object} searchParams - The search parameters to find the action to delete.
  * @param {string} searchParams.action_id - The ID of the action to delete.
  * @param {string} searchParams.user - The user ID of the action's author.
- * @param {mongoose.ClientSession} [session] - The transaction session to use (optional).
  * @returns {Promise<Action>} A promise that resolves to the deleted action document as a plain object, or null if no document was found.
  */
-const deleteAction = async (searchParams, session = null) => {
-  const options = session ? { session } : {};
-  return await Action.findOneAndDelete(searchParams, options).lean();
+const deleteAction = async (searchParams) => {
+  return await Action.findOneAndDelete(searchParams).lean();
 };
 
 /**
- * Deletes actions by params, within a transaction session if provided.
+ * Deletes actions by params.
  *
  * @param {Object} searchParams - The search parameters to find the actions to delete.
  * @param {string} searchParams.action_id - The ID of the action(s) to delete.
  * @param {string} searchParams.user - The user ID of the action's author.
- * @param {mongoose.ClientSession} [session] - The transaction session to use (optional).
  * @returns {Promise<Number>} A promise that resolves to the number of deleted action documents.
  */
-const deleteActions = async (searchParams, session = null) => {
-  const options = session ? { session } : {};
-  const result = await Action.deleteMany(searchParams, options);
+const deleteActions = async (searchParams) => {
+  const result = await Action.deleteMany(searchParams);
   return result.deletedCount;
 };
 
diff --git a/api/models/Agent.js b/api/models/Agent.js
index 1ee783b101e..2112a44991f 100644
--- a/api/models/Agent.js
+++ b/api/models/Agent.js
@@ -1,4 +1,11 @@
 const mongoose = require('mongoose');
+const { GLOBAL_PROJECT_NAME } = require('librechat-data-provider').Constants;
+const {
+  getProjectByName,
+  addAgentIdsToProject,
+  removeAgentIdsFromProject,
+  removeAgentFromAllProjects,
+} = require('./Project');
 const agentSchema = require('./schema/agent');
 
 const Agent = mongoose.model('agent', agentSchema);
@@ -24,18 +31,17 @@ const createAgent = async (agentData) => {
 const getAgent = async (searchParameter) => await Agent.findOne(searchParameter).lean();
 
 /**
- * Update an agent with new data without overwriting existing properties,
- * or create a new agent if it doesn't exist, within a transaction session if provided.
+ * Update an agent with new data without overwriting existing
+ *  properties, or create a new agent if it doesn't exist.
  *
  * @param {Object} searchParameter - The search parameters to find the agent to update.
  * @param {string} searchParameter.id - The ID of the agent to update.
- * @param {string} searchParameter.author - The user ID of the agent's author.
+ * @param {string} [searchParameter.author] - The user ID of the agent's author.
  * @param {Object} updateData - An object containing the properties to update.
- * @param {mongoose.ClientSession} [session] - The transaction session to use (optional).
  * @returns {Promise<Agent>} The updated or newly created agent document as a plain object.
  */
-const updateAgent = async (searchParameter, updateData, session = null) => {
-  const options = { new: true, upsert: true, session };
+const updateAgent = async (searchParameter, updateData) => {
+  const options = { new: true, upsert: true };
   return await Agent.findOneAndUpdate(searchParameter, updateData, options).lean();
 };
 
@@ -44,11 +50,15 @@ const updateAgent = async (searchParameter, updateData, session = null) => {
  *
  * @param {Object} searchParameter - The search parameters to find the agent to delete.
  * @param {string} searchParameter.id - The ID of the agent to delete.
- * @param {string} searchParameter.author - The user ID of the agent's author.
+ * @param {string} [searchParameter.author] - The user ID of the agent's author.
  * @returns {Promise<void>} Resolves when the agent has been successfully deleted.
  */
 const deleteAgent = async (searchParameter) => {
-  return await Agent.findOneAndDelete(searchParameter);
+  const agent = await Agent.findOneAndDelete(searchParameter);
+  if (agent) {
+    await removeAgentFromAllProjects(agent.id);
+  }
+  return agent;
 };
 
 /**
@@ -58,11 +68,24 @@ const deleteAgent = async (searchParameter) => {
  * @returns {Promise<Object>} A promise that resolves to an object containing the agents data and pagination info.
  */
 const getListAgents = async (searchParameter) => {
-  const agents = await Agent.find(searchParameter, {
+  const { author, ...otherParams } = searchParameter;
+
+  let query = Object.assign({ author }, otherParams);
+
+  const globalProject = await getProjectByName(GLOBAL_PROJECT_NAME, ['agentIds']);
+  if (globalProject && (globalProject.agentIds?.length ?? 0) > 0) {
+    const globalQuery = { id: { $in: globalProject.agentIds }, ...otherParams };
+    delete globalQuery.author;
+    query = { $or: [globalQuery, query] };
+  }
+
+  const agents = await Agent.find(query, {
     id: 1,
     name: 1,
     avatar: 1,
+    projectIds: 1,
   }).lean();
+
   const hasMore = agents.length > 0;
   const firstId = agents.length > 0 ? agents[0].id : null;
   const lastId = agents.length > 0 ? agents[agents.length - 1].id : null;
@@ -75,10 +98,45 @@ const getListAgents = async (searchParameter) => {
   };
 };
 
+/**
+ * Updates the projects associated with an agent, adding and removing project IDs as specified.
+ * This function also updates the corresponding projects to include or exclude the agent ID.
+ *
+ * @param {string} agentId - The ID of the agent to update.
+ * @param {string[]} [projectIds] - Array of project IDs to add to the agent.
+ * @param {string[]} [removeProjectIds] - Array of project IDs to remove from the agent.
+ * @returns {Promise<MongoAgent>} The updated agent document.
+ * @throws {Error} If there's an error updating the agent or projects.
+ */
+const updateAgentProjects = async (agentId, projectIds, removeProjectIds) => {
+  const updateOps = {};
+
+  if (removeProjectIds && removeProjectIds.length > 0) {
+    for (const projectId of removeProjectIds) {
+      await removeAgentIdsFromProject(projectId, [agentId]);
+    }
+    updateOps.$pull = { projectIds: { $in: removeProjectIds } };
+  }
+
+  if (projectIds && projectIds.length > 0) {
+    for (const projectId of projectIds) {
+      await addAgentIdsToProject(projectId, [agentId]);
+    }
+    updateOps.$addToSet = { projectIds: { $each: projectIds } };
+  }
+
+  if (Object.keys(updateOps).length === 0) {
+    return await getAgent({ id: agentId });
+  }
+
+  return await updateAgent({ id: agentId }, updateOps);
+};
+
 module.exports = {
   createAgent,
   getAgent,
   updateAgent,
   deleteAgent,
   getListAgents,
+  updateAgentProjects,
 };
diff --git a/api/models/Assistant.js b/api/models/Assistant.js
index 2c98287a889..d0e73ad4e7b 100644
--- a/api/models/Assistant.js
+++ b/api/models/Assistant.js
@@ -5,17 +5,16 @@ const Assistant = mongoose.model('assistant', assistantSchema);
 
 /**
  * Update an assistant with new data without overwriting existing properties,
- * or create a new assistant if it doesn't exist, within a transaction session if provided.
+ * or create a new assistant if it doesn't exist.
  *
  * @param {Object} searchParams - The search parameters to find the assistant to update.
  * @param {string} searchParams.assistant_id - The ID of the assistant to update.
  * @param {string} searchParams.user - The user ID of the assistant's author.
  * @param {Object} updateData - An object containing the properties to update.
- * @param {mongoose.ClientSession} [session] - The transaction session to use (optional).
  * @returns {Promise<AssistantDocument>} The updated or newly created assistant document as a plain object.
  */
-const updateAssistantDoc = async (searchParams, updateData, session = null) => {
-  const options = { new: true, upsert: true, session };
+const updateAssistantDoc = async (searchParams, updateData) => {
+  const options = { new: true, upsert: true };
   return await Assistant.findOneAndUpdate(searchParams, updateData, options).lean();
 };
 
diff --git a/api/models/Banner.js b/api/models/Banner.js
new file mode 100644
index 00000000000..8d439dae289
--- /dev/null
+++ b/api/models/Banner.js
@@ -0,0 +1,27 @@
+const Banner = require('./schema/banner');
+const logger = require('~/config/winston');
+/**
+ * Retrieves the current active banner.
+ * @returns {Promise<Object|null>} The active banner object or null if no active banner is found.
+ */
+const getBanner = async (user) => {
+  try {
+    const now = new Date();
+    const banner = await Banner.findOne({
+      displayFrom: { $lte: now },
+      $or: [{ displayTo: { $gte: now } }, { displayTo: null }],
+      type: 'banner',
+    }).lean();
+
+    if (!banner || banner.isPublic || user) {
+      return banner;
+    }
+
+    return null;
+  } catch (error) {
+    logger.error('[getBanners] Error getting banners', error);
+    throw new Error('Error getting banners');
+  }
+};
+
+module.exports = { getBanner };
diff --git a/api/models/Conversation.js b/api/models/Conversation.js
index 19622ba7962..0850ed0a71b 100644
--- a/api/models/Conversation.js
+++ b/api/models/Conversation.js
@@ -31,9 +31,39 @@ const getConvo = async (user, conversationId) => {
   }
 };
 
+const deleteNullOrEmptyConversations = async () => {
+  try {
+    const filter = {
+      $or: [
+        { conversationId: null },
+        { conversationId: '' },
+        { conversationId: { $exists: false } },
+      ],
+    };
+
+    const result = await Conversation.deleteMany(filter);
+
+    // Delete associated messages
+    const messageDeleteResult = await deleteMessages(filter);
+
+    logger.info(
+      `[deleteNullOrEmptyConversations] Deleted ${result.deletedCount} conversations and ${messageDeleteResult.deletedCount} messages`,
+    );
+
+    return {
+      conversations: result,
+      messages: messageDeleteResult,
+    };
+  } catch (error) {
+    logger.error('[deleteNullOrEmptyConversations] Error deleting conversations', error);
+    throw new Error('Error deleting conversations with null or empty conversationId');
+  }
+};
+
 module.exports = {
   Conversation,
   searchConversation,
+  deleteNullOrEmptyConversations,
   /**
    * Saves a conversation to the database.
    * @param {Object} req - The request object.
diff --git a/api/models/Project.js b/api/models/Project.js
index e982e34b5d6..17ef3093a52 100644
--- a/api/models/Project.js
+++ b/api/models/Project.js
@@ -1,4 +1,5 @@
 const { model } = require('mongoose');
+const { GLOBAL_PROJECT_NAME } = require('librechat-data-provider').Constants;
 const projectSchema = require('~/models/schema/projectSchema');
 
 const Project = model('Project', projectSchema);
@@ -33,7 +34,7 @@ const getProjectByName = async function (projectName, fieldsToSelect = null) {
   const update = { $setOnInsert: { name: projectName } };
   const options = {
     new: true,
-    upsert: projectName === 'instance',
+    upsert: projectName === GLOBAL_PROJECT_NAME,
     lean: true,
     select: fieldsToSelect,
   };
@@ -81,10 +82,55 @@ const removeGroupFromAllProjects = async (promptGroupId) => {
   await Project.updateMany({}, { $pull: { promptGroupIds: promptGroupId } });
 };
 
+/**
+ * Add an array of agent IDs to a project's agentIds array, ensuring uniqueness.
+ *
+ * @param {string} projectId - The ID of the project to update.
+ * @param {string[]} agentIds - The array of agent IDs to add to the project.
+ * @returns {Promise<MongoProject>} The updated project document.
+ */
+const addAgentIdsToProject = async function (projectId, agentIds) {
+  return await Project.findByIdAndUpdate(
+    projectId,
+    { $addToSet: { agentIds: { $each: agentIds } } },
+    { new: true },
+  );
+};
+
+/**
+ * Remove an array of agent IDs from a project's agentIds array.
+ *
+ * @param {string} projectId - The ID of the project to update.
+ * @param {string[]} agentIds - The array of agent IDs to remove from the project.
+ * @returns {Promise<MongoProject>} The updated project document.
+ */
+const removeAgentIdsFromProject = async function (projectId, agentIds) {
+  return await Project.findByIdAndUpdate(
+    projectId,
+    { $pull: { agentIds: { $in: agentIds } } },
+    { new: true },
+  );
+};
+
+/**
+ * Remove an agent ID from all projects.
+ *
+ * @param {string} agentId - The ID of the agent to remove from projects.
+ * @returns {Promise<void>}
+ */
+const removeAgentFromAllProjects = async (agentId) => {
+  await Project.updateMany({}, { $pull: { agentIds: agentId } });
+};
+
 module.exports = {
   getProjectById,
   getProjectByName,
+  /* prompts */
   addGroupIdsToProject,
   removeGroupIdsFromProject,
   removeGroupFromAllProjects,
+  /* agents */
+  addAgentIdsToProject,
+  removeAgentIdsFromProject,
+  removeAgentFromAllProjects,
 };
diff --git a/api/models/Prompt.js b/api/models/Prompt.js
index 56dcd785709..548589b4d7e 100644
--- a/api/models/Prompt.js
+++ b/api/models/Prompt.js
@@ -1,5 +1,5 @@
 const { ObjectId } = require('mongodb');
-const { SystemRoles, SystemCategories } = require('librechat-data-provider');
+const { SystemRoles, SystemCategories, Constants } = require('librechat-data-provider');
 const {
   getProjectByName,
   addGroupIdsToProject,
@@ -123,7 +123,7 @@ const getAllPromptGroups = async (req, filter) => {
     let combinedQuery = query;
 
     if (searchShared) {
-      const project = await getProjectByName('instance', 'promptGroupIds');
+      const project = await getProjectByName(Constants.GLOBAL_PROJECT_NAME, 'promptGroupIds');
       if (project && project.promptGroupIds.length > 0) {
         const projectQuery = { _id: { $in: project.promptGroupIds }, ...query };
         delete projectQuery.author;
@@ -177,7 +177,7 @@ const getPromptGroups = async (req, filter) => {
 
     if (searchShared) {
       // const projects = req.user.projects || []; // TODO: handle multiple projects
-      const project = await getProjectByName('instance', 'promptGroupIds');
+      const project = await getProjectByName(Constants.GLOBAL_PROJECT_NAME, 'promptGroupIds');
       if (project && project.promptGroupIds.length > 0) {
         const projectQuery = { _id: { $in: project.promptGroupIds }, ...query };
         delete projectQuery.author;
diff --git a/api/models/Role.js b/api/models/Role.js
index d21efee3b88..9c160512b7d 100644
--- a/api/models/Role.js
+++ b/api/models/Role.js
@@ -4,8 +4,10 @@ const {
   roleDefaults,
   PermissionTypes,
   removeNullishValues,
+  agentPermissionsSchema,
   promptPermissionsSchema,
   bookmarkPermissionsSchema,
+  multiConvoPermissionsSchema,
 } = require('librechat-data-provider');
 const getLogStores = require('~/cache/getLogStores');
 const Role = require('~/models/schema/roleSchema');
@@ -71,8 +73,10 @@ const updateRoleByName = async function (roleName, updates) {
 };
 
 const permissionSchemas = {
+  [PermissionTypes.AGENTS]: agentPermissionsSchema,
   [PermissionTypes.PROMPTS]: promptPermissionsSchema,
   [PermissionTypes.BOOKMARKS]: bookmarkPermissionsSchema,
+  [PermissionTypes.MULTI_CONVO]: multiConvoPermissionsSchema,
 };
 
 /**
@@ -130,6 +134,7 @@ async function updateAccessPermissions(roleName, permissionsUpdate) {
 /**
  * Initialize default roles in the system.
  * Creates the default roles (ADMIN, USER) if they don't exist in the database.
+ * Updates existing roles with new permission types if they're missing.
  *
  * @returns {Promise<void>}
  */
@@ -137,14 +142,27 @@ const initializeRoles = async function () {
   const defaultRoles = [SystemRoles.ADMIN, SystemRoles.USER];
 
   for (const roleName of defaultRoles) {
-    let role = await Role.findOne({ name: roleName }).select('name').lean();
+    let role = await Role.findOne({ name: roleName });
+
     if (!role) {
+      // Create new role if it doesn't exist
       role = new Role(roleDefaults[roleName]);
-      await role.save();
+    } else {
+      // Add missing permission types
+      let isUpdated = false;
+      for (const permType of Object.values(PermissionTypes)) {
+        if (!role[permType]) {
+          role[permType] = roleDefaults[roleName][permType];
+          isUpdated = true;
+        }
+      }
+      if (isUpdated) {
+        await role.save();
+      }
     }
+    await role.save();
   }
 };
-
 module.exports = {
   getRoleByName,
   initializeRoles,
diff --git a/api/models/Role.spec.js b/api/models/Role.spec.js
index c183b9d1c35..92386f0fa91 100644
--- a/api/models/Role.spec.js
+++ b/api/models/Role.spec.js
@@ -1,9 +1,14 @@
 const mongoose = require('mongoose');
 const { MongoMemoryServer } = require('mongodb-memory-server');
-const { SystemRoles, PermissionTypes } = require('librechat-data-provider');
-const Role = require('~/models/schema/roleSchema');
-const { updateAccessPermissions } = require('~/models/Role');
+const {
+  SystemRoles,
+  PermissionTypes,
+  roleDefaults,
+  Permissions,
+} = require('librechat-data-provider');
+const { updateAccessPermissions, initializeRoles } = require('~/models/Role');
 const getLogStores = require('~/cache/getLogStores');
+const Role = require('~/models/schema/roleSchema');
 
 // Mock the cache
 jest.mock('~/cache/getLogStores', () => {
@@ -194,4 +199,222 @@ describe('updateAccessPermissions', () => {
       SHARED_GLOBAL: true,
     });
   });
+
+  it('should update MULTI_CONVO permissions', async () => {
+    await new Role({
+      name: SystemRoles.USER,
+      [PermissionTypes.MULTI_CONVO]: {
+        USE: false,
+      },
+    }).save();
+
+    await updateAccessPermissions(SystemRoles.USER, {
+      [PermissionTypes.MULTI_CONVO]: {
+        USE: true,
+      },
+    });
+
+    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+    expect(updatedRole[PermissionTypes.MULTI_CONVO]).toEqual({
+      USE: true,
+    });
+  });
+
+  it('should update MULTI_CONVO permissions along with other permission types', async () => {
+    await new Role({
+      name: SystemRoles.USER,
+      [PermissionTypes.PROMPTS]: {
+        CREATE: true,
+        USE: true,
+        SHARED_GLOBAL: false,
+      },
+      [PermissionTypes.MULTI_CONVO]: {
+        USE: false,
+      },
+    }).save();
+
+    await updateAccessPermissions(SystemRoles.USER, {
+      [PermissionTypes.PROMPTS]: { SHARED_GLOBAL: true },
+      [PermissionTypes.MULTI_CONVO]: { USE: true },
+    });
+
+    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+    expect(updatedRole[PermissionTypes.PROMPTS]).toEqual({
+      CREATE: true,
+      USE: true,
+      SHARED_GLOBAL: true,
+    });
+    expect(updatedRole[PermissionTypes.MULTI_CONVO]).toEqual({
+      USE: true,
+    });
+  });
+
+  it('should not update MULTI_CONVO permissions when no changes are needed', async () => {
+    await new Role({
+      name: SystemRoles.USER,
+      [PermissionTypes.MULTI_CONVO]: {
+        USE: true,
+      },
+    }).save();
+
+    await updateAccessPermissions(SystemRoles.USER, {
+      [PermissionTypes.MULTI_CONVO]: {
+        USE: true,
+      },
+    });
+
+    const updatedRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+    expect(updatedRole[PermissionTypes.MULTI_CONVO]).toEqual({
+      USE: true,
+    });
+  });
+});
+
+describe('initializeRoles', () => {
+  beforeEach(async () => {
+    await Role.deleteMany({});
+  });
+
+  it('should create default roles if they do not exist', async () => {
+    await initializeRoles();
+
+    const adminRole = await Role.findOne({ name: SystemRoles.ADMIN }).lean();
+    const userRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+
+    expect(adminRole).toBeTruthy();
+    expect(userRole).toBeTruthy();
+
+    // Check if all permission types exist
+    Object.values(PermissionTypes).forEach((permType) => {
+      expect(adminRole[permType]).toBeDefined();
+      expect(userRole[permType]).toBeDefined();
+    });
+
+    // Check if permissions match defaults (example for ADMIN role)
+    expect(adminRole[PermissionTypes.PROMPTS].SHARED_GLOBAL).toBe(true);
+    expect(adminRole[PermissionTypes.BOOKMARKS].USE).toBe(true);
+    expect(adminRole[PermissionTypes.AGENTS].CREATE).toBe(true);
+  });
+
+  it('should not modify existing permissions for existing roles', async () => {
+    const customUserRole = {
+      name: SystemRoles.USER,
+      [PermissionTypes.PROMPTS]: {
+        [Permissions.USE]: false,
+        [Permissions.CREATE]: true,
+        [Permissions.SHARED_GLOBAL]: true,
+      },
+      [PermissionTypes.BOOKMARKS]: {
+        [Permissions.USE]: false,
+      },
+    };
+
+    await new Role(customUserRole).save();
+
+    await initializeRoles();
+
+    const userRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+
+    expect(userRole[PermissionTypes.PROMPTS]).toEqual(customUserRole[PermissionTypes.PROMPTS]);
+    expect(userRole[PermissionTypes.BOOKMARKS]).toEqual(customUserRole[PermissionTypes.BOOKMARKS]);
+    expect(userRole[PermissionTypes.AGENTS]).toBeDefined();
+  });
+
+  it('should add new permission types to existing roles', async () => {
+    const partialUserRole = {
+      name: SystemRoles.USER,
+      [PermissionTypes.PROMPTS]: roleDefaults[SystemRoles.USER][PermissionTypes.PROMPTS],
+      [PermissionTypes.BOOKMARKS]: roleDefaults[SystemRoles.USER][PermissionTypes.BOOKMARKS],
+    };
+
+    await new Role(partialUserRole).save();
+
+    await initializeRoles();
+
+    const userRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+
+    expect(userRole[PermissionTypes.AGENTS]).toBeDefined();
+    expect(userRole[PermissionTypes.AGENTS].CREATE).toBeDefined();
+    expect(userRole[PermissionTypes.AGENTS].USE).toBeDefined();
+    expect(userRole[PermissionTypes.AGENTS].SHARED_GLOBAL).toBeDefined();
+  });
+
+  it('should handle multiple runs without duplicating or modifying data', async () => {
+    await initializeRoles();
+    await initializeRoles();
+
+    const adminRoles = await Role.find({ name: SystemRoles.ADMIN });
+    const userRoles = await Role.find({ name: SystemRoles.USER });
+
+    expect(adminRoles).toHaveLength(1);
+    expect(userRoles).toHaveLength(1);
+
+    const adminRole = adminRoles[0].toObject();
+    const userRole = userRoles[0].toObject();
+
+    // Check if all permission types exist
+    Object.values(PermissionTypes).forEach((permType) => {
+      expect(adminRole[permType]).toBeDefined();
+      expect(userRole[permType]).toBeDefined();
+    });
+  });
+
+  it('should update roles with missing permission types from roleDefaults', async () => {
+    const partialAdminRole = {
+      name: SystemRoles.ADMIN,
+      [PermissionTypes.PROMPTS]: {
+        [Permissions.USE]: false,
+        [Permissions.CREATE]: false,
+        [Permissions.SHARED_GLOBAL]: false,
+      },
+      [PermissionTypes.BOOKMARKS]: roleDefaults[SystemRoles.ADMIN][PermissionTypes.BOOKMARKS],
+    };
+
+    await new Role(partialAdminRole).save();
+
+    await initializeRoles();
+
+    const adminRole = await Role.findOne({ name: SystemRoles.ADMIN }).lean();
+
+    expect(adminRole[PermissionTypes.PROMPTS]).toEqual(partialAdminRole[PermissionTypes.PROMPTS]);
+    expect(adminRole[PermissionTypes.AGENTS]).toBeDefined();
+    expect(adminRole[PermissionTypes.AGENTS].CREATE).toBeDefined();
+    expect(adminRole[PermissionTypes.AGENTS].USE).toBeDefined();
+    expect(adminRole[PermissionTypes.AGENTS].SHARED_GLOBAL).toBeDefined();
+  });
+
+  it('should include MULTI_CONVO permissions when creating default roles', async () => {
+    await initializeRoles();
+
+    const adminRole = await Role.findOne({ name: SystemRoles.ADMIN }).lean();
+    const userRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+
+    expect(adminRole[PermissionTypes.MULTI_CONVO]).toBeDefined();
+    expect(userRole[PermissionTypes.MULTI_CONVO]).toBeDefined();
+
+    // Check if MULTI_CONVO permissions match defaults
+    expect(adminRole[PermissionTypes.MULTI_CONVO].USE).toBe(
+      roleDefaults[SystemRoles.ADMIN][PermissionTypes.MULTI_CONVO].USE,
+    );
+    expect(userRole[PermissionTypes.MULTI_CONVO].USE).toBe(
+      roleDefaults[SystemRoles.USER][PermissionTypes.MULTI_CONVO].USE,
+    );
+  });
+
+  it('should add MULTI_CONVO permissions to existing roles without them', async () => {
+    const partialUserRole = {
+      name: SystemRoles.USER,
+      [PermissionTypes.PROMPTS]: roleDefaults[SystemRoles.USER][PermissionTypes.PROMPTS],
+      [PermissionTypes.BOOKMARKS]: roleDefaults[SystemRoles.USER][PermissionTypes.BOOKMARKS],
+    };
+
+    await new Role(partialUserRole).save();
+
+    await initializeRoles();
+
+    const userRole = await Role.findOne({ name: SystemRoles.USER }).lean();
+
+    expect(userRole[PermissionTypes.MULTI_CONVO]).toBeDefined();
+    expect(userRole[PermissionTypes.MULTI_CONVO].USE).toBeDefined();
+  });
 });
diff --git a/api/models/inviteUser.js b/api/models/inviteUser.js
index c04bd9467a5..6cd699fd668 100644
--- a/api/models/inviteUser.js
+++ b/api/models/inviteUser.js
@@ -1,6 +1,5 @@
-const crypto = require('crypto');
-const bcrypt = require('bcryptjs');
 const mongoose = require('mongoose');
+const { getRandomValues, hashToken } = require('~/server/utils/crypto');
 const { createToken, findToken } = require('./Token');
 const logger = require('~/config/winston');
 
@@ -18,8 +17,8 @@ const logger = require('~/config/winston');
  */
 const createInvite = async (email) => {
   try {
-    let token = crypto.randomBytes(32).toString('hex');
-    const hash = bcrypt.hashSync(token, 10);
+    const token = await getRandomValues(32);
+    const hash = await hashToken(token);
     const encodedToken = encodeURIComponent(token);
 
     const fakeUserId = new mongoose.Types.ObjectId();
@@ -50,7 +49,7 @@ const createInvite = async (email) => {
 const getInvite = async (encodedToken, email) => {
   try {
     const token = decodeURIComponent(encodedToken);
-    const hash = bcrypt.hashSync(token, 10);
+    const hash = await hashToken(token);
     const invite = await findToken({ token: hash, email });
 
     if (!invite) {
@@ -59,7 +58,7 @@ const getInvite = async (encodedToken, email) => {
 
     return invite;
   } catch (error) {
-    logger.error('[getInvite] Error getting invite', error);
+    logger.error('[getInvite] Error getting invite:', error);
     return { error: true, message: error.message };
   }
 };
diff --git a/api/models/schema/agent.js b/api/models/schema/agent.js
index 97f0527916c..819398ee7cb 100644
--- a/api/models/schema/agent.js
+++ b/api/models/schema/agent.js
@@ -57,6 +57,11 @@ const agentSchema = mongoose.Schema(
       ref: 'User',
       required: true,
     },
+    projectIds: {
+      type: [mongoose.Schema.Types.ObjectId],
+      ref: 'Project',
+      index: true,
+    },
   },
   {
     timestamps: true,
diff --git a/api/models/schema/banner.js b/api/models/schema/banner.js
new file mode 100644
index 00000000000..7fd86c1b677
--- /dev/null
+++ b/api/models/schema/banner.js
@@ -0,0 +1,36 @@
+const mongoose = require('mongoose');
+
+const bannerSchema = mongoose.Schema(
+  {
+    bannerId: {
+      type: String,
+      required: true,
+    },
+    message: {
+      type: String,
+      required: true,
+    },
+    displayFrom: {
+      type: Date,
+      required: true,
+      default: Date.now,
+    },
+    displayTo: {
+      type: Date,
+    },
+    type: {
+      type: String,
+      enum: ['banner', 'popup'],
+      default: 'banner',
+    },
+    isPublic: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  { timestamps: true },
+);
+
+const Banner = mongoose.model('Banner', bannerSchema);
+module.exports = Banner;
diff --git a/api/models/schema/defaults.js b/api/models/schema/defaults.js
index 4a99a683734..6dced3af86c 100644
--- a/api/models/schema/defaults.js
+++ b/api/models/schema/defaults.js
@@ -13,6 +13,11 @@ const conversationPreset = {
     type: String,
     required: false,
   },
+  // for bedrock only
+  region: {
+    type: String,
+    required: false,
+  },
   // for azureOpenAI, openAI only
   chatGptLabel: {
     type: String,
@@ -78,6 +83,9 @@ const conversationPreset = {
   promptCache: {
     type: Boolean,
   },
+  system: {
+    type: String,
+  },
   // files
   resendFiles: {
     type: Boolean,
diff --git a/api/models/schema/projectSchema.js b/api/models/schema/projectSchema.js
index 0e27c6a8f9f..dfa68a06c22 100644
--- a/api/models/schema/projectSchema.js
+++ b/api/models/schema/projectSchema.js
@@ -21,6 +21,11 @@ const projectSchema = new Schema(
       ref: 'PromptGroup',
       default: [],
     },
+    agentIds: {
+      type: [String],
+      ref: 'Agent',
+      default: [],
+    },
   },
   {
     timestamps: true,
diff --git a/api/models/schema/roleSchema.js b/api/models/schema/roleSchema.js
index ebd1d0bc4b2..36e9d3f7b6e 100644
--- a/api/models/schema/roleSchema.js
+++ b/api/models/schema/roleSchema.js
@@ -28,6 +28,26 @@ const roleSchema = new mongoose.Schema({
       default: true,
     },
   },
+  [PermissionTypes.AGENTS]: {
+    [Permissions.SHARED_GLOBAL]: {
+      type: Boolean,
+      default: false,
+    },
+    [Permissions.USE]: {
+      type: Boolean,
+      default: true,
+    },
+    [Permissions.CREATE]: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  [PermissionTypes.MULTI_CONVO]: {
+    [Permissions.USE]: {
+      type: Boolean,
+      default: true,
+    },
+  },
 });
 
 const Role = mongoose.model('Role', roleSchema);
diff --git a/api/models/tx.js b/api/models/tx.js
index 1b515cca2af..062816cf35f 100644
--- a/api/models/tx.js
+++ b/api/models/tx.js
@@ -3,38 +3,28 @@ const defaultRate = 6;
 
 /** AWS Bedrock pricing */
 const bedrockValues = {
-  'anthropic.claude-3-haiku-20240307-v1:0': { prompt: 0.25, completion: 1.25 },
-  'anthropic.claude-3-sonnet-20240229-v1:0': { prompt: 3.0, completion: 15.0 },
-  'anthropic.claude-3-opus-20240229-v1:0': { prompt: 15.0, completion: 75.0 },
-  'anthropic.claude-3-5-sonnet-20240620-v1:0': { prompt: 3.0, completion: 15.0 },
-  'anthropic.claude-v2:1': { prompt: 8.0, completion: 24.0 },
-  'anthropic.claude-instant-v1': { prompt: 0.8, completion: 2.4 },
-  'meta.llama2-13b-chat-v1': { prompt: 0.75, completion: 1.0 },
-  'meta.llama2-70b-chat-v1': { prompt: 1.95, completion: 2.56 },
-  'meta.llama3-8b-instruct-v1:0': { prompt: 0.3, completion: 0.6 },
-  'meta.llama3-70b-instruct-v1:0': { prompt: 2.65, completion: 3.5 },
-  'meta.llama3-1-8b-instruct-v1:0': { prompt: 0.3, completion: 0.6 },
-  'meta.llama3-1-70b-instruct-v1:0': { prompt: 2.65, completion: 3.5 },
-  'meta.llama3-1-405b-instruct-v1:0': { prompt: 5.32, completion: 16.0 },
-  'mistral.mistral-7b-instruct-v0:2': { prompt: 0.15, completion: 0.2 },
-  'mistral.mistral-small-2402-v1:0': { prompt: 0.15, completion: 0.2 },
-  'mistral.mixtral-8x7b-instruct-v0:1': { prompt: 0.45, completion: 0.7 },
-  'mistral.mistral-large-2402-v1:0': { prompt: 4.0, completion: 12.0 },
-  'mistral.mistral-large-2407-v1:0': { prompt: 3.0, completion: 9.0 },
-  'cohere.command-text-v14': { prompt: 1.5, completion: 2.0 },
-  'cohere.command-light-text-v14': { prompt: 0.3, completion: 0.6 },
-  'cohere.command-r-v1:0': { prompt: 0.5, completion: 1.5 },
-  'cohere.command-r-plus-v1:0': { prompt: 3.0, completion: 15.0 },
+  'llama2-13b': { prompt: 0.75, completion: 1.0 },
+  'llama2-70b': { prompt: 1.95, completion: 2.56 },
+  'llama3-8b': { prompt: 0.3, completion: 0.6 },
+  'llama3-70b': { prompt: 2.65, completion: 3.5 },
+  'llama3-1-8b': { prompt: 0.3, completion: 0.6 },
+  'llama3-1-70b': { prompt: 2.65, completion: 3.5 },
+  'llama3-1-405b': { prompt: 5.32, completion: 16.0 },
+  'mistral-7b': { prompt: 0.15, completion: 0.2 },
+  'mistral-small': { prompt: 0.15, completion: 0.2 },
+  'mixtral-8x7b': { prompt: 0.45, completion: 0.7 },
+  'mistral-large-2402': { prompt: 4.0, completion: 12.0 },
+  'mistral-large-2407': { prompt: 3.0, completion: 9.0 },
+  'command-text': { prompt: 1.5, completion: 2.0 },
+  'command-light': { prompt: 0.3, completion: 0.6 },
   'ai21.j2-mid-v1': { prompt: 12.5, completion: 12.5 },
   'ai21.j2-ultra-v1': { prompt: 18.8, completion: 18.8 },
+  'ai21.jamba-instruct-v1:0': { prompt: 0.5, completion: 0.7 },
   'amazon.titan-text-lite-v1': { prompt: 0.15, completion: 0.2 },
   'amazon.titan-text-express-v1': { prompt: 0.2, completion: 0.6 },
+  'amazon.titan-text-premier-v1:0': { prompt: 0.5, completion: 1.5 },
 };
 
-for (const [key, value] of Object.entries(bedrockValues)) {
-  bedrockValues[`bedrock/${key}`] = value;
-}
-
 /**
  * Mapping of model token sizes to their respective multipliers for prompt and completion.
  * The rates are 1 USD per 1M tokens.
@@ -47,6 +37,9 @@ const tokenValues = Object.assign(
     '4k': { prompt: 1.5, completion: 2 },
     '16k': { prompt: 3, completion: 4 },
     'gpt-3.5-turbo-1106': { prompt: 1, completion: 2 },
+    'o1-preview': { prompt: 15, completion: 60 },
+    'o1-mini': { prompt: 3, completion: 12 },
+    o1: { prompt: 15, completion: 60 },
     'gpt-4o-2024-08-06': { prompt: 2.5, completion: 10 },
     'gpt-4o-mini': { prompt: 0.15, completion: 0.6 },
     'gpt-4o': { prompt: 5, completion: 15 },
@@ -59,6 +52,7 @@ const tokenValues = Object.assign(
     'claude-3-haiku': { prompt: 0.25, completion: 1.25 },
     'claude-2.1': { prompt: 8, completion: 24 },
     'claude-2': { prompt: 8, completion: 24 },
+    'claude-instant': { prompt: 0.8, completion: 2.4 },
     'claude-': { prompt: 0.8, completion: 2.4 },
     'command-r-plus': { prompt: 3, completion: 15 },
     'command-r': { prompt: 0.5, completion: 1.5 },
@@ -104,6 +98,12 @@ const getValueKey = (model, endpoint) => {
     return 'gpt-3.5-turbo-1106';
   } else if (modelName.includes('gpt-3.5')) {
     return '4k';
+  } else if (modelName.includes('o1-preview')) {
+    return 'o1-preview';
+  } else if (modelName.includes('o1-mini')) {
+    return 'o1-mini';
+  } else if (modelName.includes('o1')) {
+    return 'o1';
   } else if (modelName.includes('gpt-4o-2024-08-06')) {
     return 'gpt-4o-2024-08-06';
   } else if (modelName.includes('gpt-4o-mini')) {
diff --git a/api/models/tx.spec.js b/api/models/tx.spec.js
index f0a118c0122..c8a8b335e3c 100644
--- a/api/models/tx.spec.js
+++ b/api/models/tx.spec.js
@@ -1,3 +1,4 @@
+const { EModelEndpoint } = require('librechat-data-provider');
 const {
   defaultRate,
   tokenValues,
@@ -224,34 +225,18 @@ describe('AWS Bedrock Model Tests', () => {
 
   it('should return the correct prompt multipliers for all models', () => {
     const results = awsModels.map((model) => {
-      const multiplier = getMultiplier({ valueKey: model, tokenType: 'prompt' });
-      return multiplier === tokenValues[model].prompt;
+      const valueKey = getValueKey(model, EModelEndpoint.bedrock);
+      const multiplier = getMultiplier({ valueKey, tokenType: 'prompt' });
+      return tokenValues[valueKey].prompt && multiplier === tokenValues[valueKey].prompt;
     });
     expect(results.every(Boolean)).toBe(true);
   });
 
   it('should return the correct completion multipliers for all models', () => {
     const results = awsModels.map((model) => {
-      const multiplier = getMultiplier({ valueKey: model, tokenType: 'completion' });
-      return multiplier === tokenValues[model].completion;
-    });
-    expect(results.every(Boolean)).toBe(true);
-  });
-
-  it('should return the correct prompt multipliers for all models with Bedrock prefix', () => {
-    const results = awsModels.map((model) => {
-      const modelName = `bedrock/${model}`;
-      const multiplier = getMultiplier({ valueKey: modelName, tokenType: 'prompt' });
-      return multiplier === tokenValues[model].prompt;
-    });
-    expect(results.every(Boolean)).toBe(true);
-  });
-
-  it('should return the correct completion multipliers for all models with Bedrock prefix', () => {
-    const results = awsModels.map((model) => {
-      const modelName = `bedrock/${model}`;
-      const multiplier = getMultiplier({ valueKey: modelName, tokenType: 'completion' });
-      return multiplier === tokenValues[model].completion;
+      const valueKey = getValueKey(model, EModelEndpoint.bedrock);
+      const multiplier = getMultiplier({ valueKey, tokenType: 'completion' });
+      return tokenValues[valueKey].completion && multiplier === tokenValues[valueKey].completion;
     });
     expect(results.every(Boolean)).toBe(true);
   });
diff --git a/api/package.json b/api/package.json
index 43d8609a8e5..1c74543a67e 100644
--- a/api/package.json
+++ b/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@librechat/backend",
-  "version": "v0.7.5-rc1",
+  "version": "v0.7.5-rc2",
   "description": "",
   "scripts": {
     "start": "echo 'please run this from the root directory'",
@@ -43,8 +43,8 @@
     "@langchain/core": "^0.2.18",
     "@langchain/google-genai": "^0.0.11",
     "@langchain/google-vertexai": "^0.0.17",
-    "@librechat/agents": "^1.4.1",
-    "axios": "^1.3.4",
+    "@librechat/agents": "^1.5.2",
+    "axios": "^1.7.7",
     "bcryptjs": "^2.4.3",
     "cheerio": "^1.0.0-rc.12",
     "cohere-ai": "^7.9.1",
@@ -55,7 +55,7 @@
     "cors": "^2.8.5",
     "dedent": "^1.5.3",
     "dotenv": "^16.0.3",
-    "express": "^4.18.2",
+    "express": "^4.21.0",
     "express-mongo-sanitize": "^2.2.0",
     "express-rate-limit": "^6.9.0",
     "express-session": "^1.17.3",
@@ -76,11 +76,11 @@
     "meilisearch": "^0.38.0",
     "mime": "^3.0.0",
     "module-alias": "^2.2.3",
-    "mongoose": "^7.1.1",
+    "mongoose": "^7.3.3",
     "multer": "^1.4.5-lts.1",
     "nanoid": "^3.3.7",
     "nodejs-gpt": "^1.37.4",
-    "nodemailer": "^6.9.4",
+    "nodemailer": "^6.9.15",
     "ollama": "^0.5.0",
     "openai": "^4.47.1",
     "openai-chat-tokens": "^0.2.8",
@@ -101,7 +101,6 @@
     "ua-parser-js": "^1.0.36",
     "winston": "^3.11.0",
     "winston-daily-rotate-file": "^4.7.1",
-    "ws": "^8.17.0",
     "zod": "^3.22.4"
   },
   "devDependencies": {
diff --git a/api/server/controllers/AskController.js b/api/server/controllers/AskController.js
index ce6e0fb1726..d2d774b0092 100644
--- a/api/server/controllers/AskController.js
+++ b/api/server/controllers/AskController.js
@@ -16,7 +16,12 @@ const AskController = async (req, res, next, initializeClient, addTitle) => {
     overrideParentMessageId = null,
   } = req.body;
 
-  logger.debug('[AskController]', { text, conversationId, ...endpointOption });
+  logger.debug('[AskController]', {
+    text,
+    conversationId,
+    ...endpointOption,
+    modelsConfig: endpointOption.modelsConfig ? 'exists' : '',
+  });
 
   let userMessage;
   let userMessagePromise;
@@ -123,11 +128,6 @@ const AskController = async (req, res, next, initializeClient, addTitle) => {
     };
 
     let response = await client.sendMessage(text, messageOptions);
-
-    if (overrideParentMessageId) {
-      response.parentMessageId = overrideParentMessageId;
-    }
-
     response.endpoint = endpointOption.endpoint;
 
     const { conversation = {} } = await client.responsePromise;
diff --git a/api/server/controllers/EditController.js b/api/server/controllers/EditController.js
index b3b94fcebba..28fe2c4fea1 100644
--- a/api/server/controllers/EditController.js
+++ b/api/server/controllers/EditController.js
@@ -25,6 +25,7 @@ const EditController = async (req, res, next, initializeClient) => {
     isContinued,
     conversationId,
     ...endpointOption,
+    modelsConfig: endpointOption.modelsConfig ? 'exists' : '',
   });
 
   let userMessage;
diff --git a/api/server/controllers/EndpointController.js b/api/server/controllers/EndpointController.js
index d80ea6b14f9..1e716870c32 100644
--- a/api/server/controllers/EndpointController.js
+++ b/api/server/controllers/EndpointController.js
@@ -44,6 +44,14 @@ async function endpointController(req, res) {
     };
   }
 
+  if (mergedConfig[EModelEndpoint.bedrock] && req.app.locals?.[EModelEndpoint.bedrock]) {
+    const { availableRegions } = req.app.locals[EModelEndpoint.bedrock];
+    mergedConfig[EModelEndpoint.bedrock] = {
+      ...mergedConfig[EModelEndpoint.bedrock],
+      availableRegions,
+    };
+  }
+
   const endpointsConfig = orderEndpointsConfig(mergedConfig);
 
   await cache.set(CacheKeys.ENDPOINT_CONFIG, endpointsConfig);
diff --git a/api/server/controllers/agents/callbacks.js b/api/server/controllers/agents/callbacks.js
index 9649f56a53b..f6c1972b4fe 100644
--- a/api/server/controllers/agents/callbacks.js
+++ b/api/server/controllers/agents/callbacks.js
@@ -1,7 +1,10 @@
 const { GraphEvents, ToolEndHandler, ChatModelStreamHandler } = require('@librechat/agents');
 
+/** @typedef {import('@librechat/agents').Graph} Graph */
 /** @typedef {import('@librechat/agents').EventHandler} EventHandler */
+/** @typedef {import('@librechat/agents').ModelEndData} ModelEndData */
 /** @typedef {import('@librechat/agents').ChatModelStreamHandler} ChatModelStreamHandler */
+/** @typedef {import('@librechat/agents').ContentAggregatorResult['aggregateContent']} ContentAggregator */
 /** @typedef {import('@librechat/agents').GraphEvents} GraphEvents */
 
 /**
@@ -18,18 +21,55 @@ const sendEvent = (res, event) => {
   res.write(`event: message\ndata: ${JSON.stringify(event)}\n\n`);
 };
 
+class ModelEndHandler {
+  /**
+   * @param {Array<UsageMetadata>} collectedUsage
+   */
+  constructor(collectedUsage) {
+    if (!Array.isArray(collectedUsage)) {
+      throw new Error('collectedUsage must be an array');
+    }
+    this.collectedUsage = collectedUsage;
+  }
+
+  /**
+   * @param {string} event
+   * @param {ModelEndData | undefined} data
+   * @param {Record<string, unknown> | undefined} metadata
+   * @param {Graph} graph
+   * @returns
+   */
+  handle(event, data, metadata, graph) {
+    if (!graph || !metadata) {
+      console.warn(`Graph or metadata not found in ${event} event`);
+      return;
+    }
+
+    const usage = data?.output?.usage_metadata;
+
+    if (usage) {
+      this.collectedUsage.push(usage);
+    }
+  }
+}
+
 /**
  * Get default handlers for stream events.
- * @param {{ res?: ServerResponse }} options - The options object.
+ * @param {Object} options - The options object.
+ * @param {ServerResponse} options.res - The options object.
+ * @param {ContentAggregator} options.aggregateContent - The options object.
+ * @param {Array<UsageMetadata>} options.collectedUsage - The list of collected usage metadata.
  * @returns {Record<string, t.EventHandler>} The default handlers.
  * @throws {Error} If the request is not found.
  */
-function getDefaultHandlers({ res }) {
-  if (!res) {
-    throw new Error('Request not found');
+function getDefaultHandlers({ res, aggregateContent, collectedUsage }) {
+  if (!res || !aggregateContent) {
+    throw new Error(
+      `[getDefaultHandlers] Missing required options: res: ${!res}, aggregateContent: ${!aggregateContent}`,
+    );
   }
   const handlers = {
-    // [GraphEvents.CHAT_MODEL_END]: new ModelEndHandler(),
+    [GraphEvents.CHAT_MODEL_END]: new ModelEndHandler(collectedUsage),
     [GraphEvents.TOOL_END]: new ToolEndHandler(),
     [GraphEvents.CHAT_MODEL_STREAM]: new ChatModelStreamHandler(),
     [GraphEvents.ON_RUN_STEP]: {
@@ -40,6 +80,7 @@ function getDefaultHandlers({ res }) {
        */
       handle: (event, data) => {
         sendEvent(res, { event, data });
+        aggregateContent({ event, data });
       },
     },
     [GraphEvents.ON_RUN_STEP_DELTA]: {
@@ -50,6 +91,7 @@ function getDefaultHandlers({ res }) {
        */
       handle: (event, data) => {
         sendEvent(res, { event, data });
+        aggregateContent({ event, data });
       },
     },
     [GraphEvents.ON_RUN_STEP_COMPLETED]: {
@@ -60,6 +102,7 @@ function getDefaultHandlers({ res }) {
        */
       handle: (event, data) => {
         sendEvent(res, { event, data });
+        aggregateContent({ event, data });
       },
     },
     [GraphEvents.ON_MESSAGE_DELTA]: {
@@ -70,6 +113,7 @@ function getDefaultHandlers({ res }) {
        */
       handle: (event, data) => {
         sendEvent(res, { event, data });
+        aggregateContent({ event, data });
       },
     },
   };
diff --git a/api/server/controllers/agents/client.js b/api/server/controllers/agents/client.js
index 82e6a6f48a8..137068ddd6a 100644
--- a/api/server/controllers/agents/client.js
+++ b/api/server/controllers/agents/client.js
@@ -7,9 +7,11 @@
 // validateVisionModel,
 // mapModelToAzureConfig,
 // } = require('librechat-data-provider');
-const { Callback } = require('@librechat/agents');
+const { Callback, createMetadataAggregator } = require('@librechat/agents');
 const {
+  Constants,
   EModelEndpoint,
+  bedrockOutputParser,
   providerEndpointMap,
   removeNullishValues,
 } = require('librechat-data-provider');
@@ -23,15 +25,27 @@ const {
   formatAgentMessages,
   createContextHandlers,
 } = require('~/app/clients/prompts');
+const { encodeAndFormat } = require('~/server/services/Files/images/encode');
 const Tokenizer = require('~/server/services/Tokenizer');
+const { spendTokens } = require('~/models/spendTokens');
 const BaseClient = require('~/app/clients/BaseClient');
 // const { sleep } = require('~/server/utils');
 const { createRun } = require('./run');
 const { logger } = require('~/config');
 
+/** @typedef {import('@librechat/agents').MessageContentComplex} MessageContentComplex */
+
+// const providerSchemas = {
+// [EModelEndpoint.bedrock]: true,
+// };
+
+const providerParsers = {
+  [EModelEndpoint.bedrock]: bedrockOutputParser,
+};
+
 class AgentClient extends BaseClient {
   constructor(options = {}) {
-    super(options);
+    super(null, options);
 
     /** @type {'discard' | 'summarize'} */
     this.contextStrategy = 'discard';
@@ -39,11 +53,31 @@ class AgentClient extends BaseClient {
     /** @deprecated @type {true} - Is a Chat Completion Request */
     this.isChatCompletion = true;
 
-    const { maxContextTokens, modelOptions = {}, ...clientOptions } = options;
+    /** @type {AgentRun} */
+    this.run;
+
+    const {
+      maxContextTokens,
+      modelOptions = {},
+      contentParts,
+      collectedUsage,
+      ...clientOptions
+    } = options;
 
     this.modelOptions = modelOptions;
     this.maxContextTokens = maxContextTokens;
-    this.options = Object.assign({ endpoint: EModelEndpoint.agents }, clientOptions);
+    /** @type {MessageContentComplex[]} */
+    this.contentParts = contentParts;
+    /** @type {Array<UsageMetadata>} */
+    this.collectedUsage = collectedUsage;
+    this.options = Object.assign({ endpoint: options.endpoint }, clientOptions);
+  }
+
+  /**
+   * Returns the aggregated content parts for the current run.
+   * @returns {MessageContentComplex[]} */
+  getContentParts() {
+    return this.contentParts;
   }
 
   setOptions(options) {
@@ -112,9 +146,27 @@ class AgentClient extends BaseClient {
   }
 
   getSaveOptions() {
+    const parseOptions = providerParsers[this.options.endpoint];
+    let runOptions =
+      this.options.endpoint === EModelEndpoint.agents
+        ? {
+          model: undefined,
+          // TODO:
+          // would need to be override settings; otherwise, model needs to be undefined
+          // model: this.override.model,
+          // instructions: this.override.instructions,
+          // additional_instructions: this.override.additional_instructions,
+        }
+        : {};
+
+    if (parseOptions) {
+      runOptions = parseOptions(this.modelOptions);
+    }
+
     return removeNullishValues(
       Object.assign(
         {
+          endpoint: this.options.endpoint,
           agent_id: this.options.agent.id,
           modelLabel: this.options.modelLabel,
           maxContextTokens: this.options.maxContextTokens,
@@ -122,15 +174,8 @@ class AgentClient extends BaseClient {
           imageDetail: this.options.imageDetail,
           spec: this.options.spec,
         },
-        this.modelOptions,
-        {
-          model: undefined,
-          // TODO:
-          // would need to be override settings; otherwise, model needs to be undefined
-          // model: this.override.model,
-          // instructions: this.override.instructions,
-          // additional_instructions: this.override.additional_instructions,
-        },
+        // TODO: PARSE OPTIONS BY PROVIDER, MAY CONTAIN SENSITIVE DATA
+        runOptions,
       ),
     );
   }
@@ -142,6 +187,16 @@ class AgentClient extends BaseClient {
     };
   }
 
+  async addImageURLs(message, attachments) {
+    const { files, image_urls } = await encodeAndFormat(
+      this.options.req,
+      attachments,
+      this.options.agent.provider,
+    );
+    message.image_urls = image_urls.length ? image_urls : undefined;
+    return files;
+  }
+
   async buildMessages(
     messages,
     parentMessageId,
@@ -270,25 +325,34 @@ class AgentClient extends BaseClient {
   /** @type {sendCompletion} */
   async sendCompletion(payload, opts = {}) {
     this.modelOptions.user = this.user;
-    return await this.chatCompletion({
+    await this.chatCompletion({
       payload,
       onProgress: opts.onProgress,
       abortController: opts.abortController,
     });
+    return this.contentParts;
   }
 
-  // async recordTokenUsage({ promptTokens, completionTokens, context = 'message' }) {
-  //   await spendTokens(
-  //     {
-  //       context,
-  //       model: this.modelOptions.model,
-  //       conversationId: this.conversationId,
-  //       user: this.user ?? this.options.req.user?.id,
-  //       endpointTokenConfig: this.options.endpointTokenConfig,
-  //     },
-  //     { promptTokens, completionTokens },
-  //   );
-  // }
+  /**
+   * @param {Object} params
+   * @param {string} [params.model]
+   * @param {string} [params.context='message']
+   * @param {UsageMetadata[]} [params.collectedUsage=this.collectedUsage]
+   */
+  async recordCollectedUsage({ model, context = 'message', collectedUsage = this.collectedUsage }) {
+    for (const usage of collectedUsage) {
+      await spendTokens(
+        {
+          context,
+          model: model ?? this.modelOptions.model,
+          conversationId: this.conversationId,
+          user: this.user ?? this.options.req.user?.id,
+          endpointTokenConfig: this.options.endpointTokenConfig,
+        },
+        { promptTokens: usage.input_tokens, completionTokens: usage.output_tokens },
+      );
+    }
+  }
 
   async chatCompletion({ payload, abortController = null }) {
     try {
@@ -398,9 +462,8 @@ class AgentClient extends BaseClient {
       //   });
       // }
 
-      // const streamRate = this.options.streamRate ?? Constants.DEFAULT_STREAM_RATE;
-
       const run = await createRun({
+        req: this.options.req,
         agent: this.options.agent,
         tools: this.options.tools,
         toolMap: this.options.toolMap,
@@ -415,6 +478,7 @@ class AgentClient extends BaseClient {
           thread_id: this.conversationId,
         },
         run_id: this.responseMessageId,
+        signal: abortController.signal,
         streamMode: 'values',
         version: 'v2',
       };
@@ -423,8 +487,10 @@ class AgentClient extends BaseClient {
         throw new Error('Failed to create run');
       }
 
+      this.run = run;
+
       const messages = formatAgentMessages(payload);
-      const runMessages = await run.processStream({ messages }, config, {
+      await run.processStream({ messages }, config, {
         [Callback.TOOL_ERROR]: (graph, error, toolId) => {
           logger.error(
             '[api/server/controllers/agents/client.js #chatCompletion] Tool Error',
@@ -433,14 +499,94 @@ class AgentClient extends BaseClient {
           );
         },
       });
-      // console.dir(runMessages, { depth: null });
-      return runMessages;
+      this.recordCollectedUsage({ context: 'message' }).catch((err) => {
+        logger.error(
+          '[api/server/controllers/agents/client.js #chatCompletion] Error recording collected usage',
+          err,
+        );
+      });
     } catch (err) {
-      logger.error(
-        '[api/server/controllers/agents/client.js #chatCompletion] Unhandled error type',
+      if (!abortController.signal.aborted) {
+        logger.error(
+          '[api/server/controllers/agents/client.js #sendCompletion] Unhandled error type',
+          err,
+        );
+        throw err;
+      }
+
+      logger.warn(
+        '[api/server/controllers/agents/client.js #sendCompletion] Operation aborted',
         err,
       );
-      throw err;
+    }
+  }
+
+  /**
+   *
+   * @param {Object} params
+   * @param {string} params.text
+   * @param {string} params.conversationId
+   */
+  async titleConvo({ text }) {
+    if (!this.run) {
+      throw new Error('Run not initialized');
+    }
+    const { handleLLMEnd, collected: collectedMetadata } = createMetadataAggregator();
+    const clientOptions = {};
+    const providerConfig = this.options.req.app.locals[this.options.agent.provider];
+    if (
+      providerConfig &&
+      providerConfig.titleModel &&
+      providerConfig.titleModel !== Constants.CURRENT_MODEL
+    ) {
+      clientOptions.model = providerConfig.titleModel;
+    }
+    try {
+      const titleResult = await this.run.generateTitle({
+        inputText: text,
+        contentParts: this.contentParts,
+        clientOptions,
+        chainOptions: {
+          callbacks: [
+            {
+              handleLLMEnd,
+            },
+          ],
+        },
+      });
+
+      const collectedUsage = collectedMetadata.map((item) => {
+        let input_tokens, output_tokens;
+
+        if (item.usage) {
+          input_tokens = item.usage.input_tokens || item.usage.inputTokens;
+          output_tokens = item.usage.output_tokens || item.usage.outputTokens;
+        } else if (item.tokenUsage) {
+          input_tokens = item.tokenUsage.promptTokens;
+          output_tokens = item.tokenUsage.completionTokens;
+        }
+
+        return {
+          input_tokens: input_tokens,
+          output_tokens: output_tokens,
+        };
+      });
+
+      this.recordCollectedUsage({
+        model: clientOptions.model,
+        context: 'title',
+        collectedUsage,
+      }).catch((err) => {
+        logger.error(
+          '[api/server/controllers/agents/client.js #titleConvo] Error recording collected usage',
+          err,
+        );
+      });
+
+      return titleResult.title;
+    } catch (err) {
+      logger.error('[api/server/controllers/agents/client.js #titleConvo] Error', err);
+      return;
     }
   }
 
diff --git a/api/server/controllers/agents/demo.js b/api/server/controllers/agents/demo.js
deleted file mode 100644
index c90745ba80d..00000000000
--- a/api/server/controllers/agents/demo.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Import the necessary modules
-const path = require('path');
-const base = path.resolve(__dirname, '..', '..', '..', '..', 'api');
-console.log(base);
-//api/server/controllers/agents/demo.js
-require('module-alias')({ base });
-const connectDb = require('~/lib/db/connectDb');
-const AgentClient = require('./client');
-
-// Define the user and message options
-const user = 'user123';
-const parentMessageId = 'pmid123';
-const conversationId = 'cid456';
-const maxContextTokens = 200000;
-const req = {
-  user: { id: user },
-};
-const progressOptions = {
-  res: {},
-};
-
-// Define the message options
-const messageOptions = {
-  user,
-  parentMessageId,
-  conversationId,
-  progressOptions,
-};
-
-async function main() {
-  await connectDb();
-  const client = new AgentClient({ req, maxContextTokens });
-
-  const text = 'Hello, this is a test message.';
-
-  try {
-    let response = await client.sendMessage(text, messageOptions);
-    console.log('Response:', response);
-  } catch (error) {
-    console.error('Error sending message:', error);
-  }
-}
-
-main();
diff --git a/api/server/controllers/agents/request.js b/api/server/controllers/agents/request.js
index 6480205979b..2006d4e6ea5 100644
--- a/api/server/controllers/agents/request.js
+++ b/api/server/controllers/agents/request.js
@@ -1,4 +1,4 @@
-const { Constants, getResponseSender } = require('librechat-data-provider');
+const { Constants } = require('librechat-data-provider');
 const { createAbortController, handleAbortError } = require('~/server/middleware');
 const { sendMessage } = require('~/server/utils');
 const { saveMessage } = require('~/models');
@@ -9,22 +9,17 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {
     text,
     endpointOption,
     conversationId,
-    modelDisplayLabel,
     parentMessageId = null,
     overrideParentMessageId = null,
   } = req.body;
 
+  let sender;
   let userMessage;
-  let userMessagePromise;
   let promptTokens;
   let userMessageId;
   let responseMessageId;
+  let userMessagePromise;
 
-  const sender = getResponseSender({
-    ...endpointOption,
-    model: endpointOption.modelOptions.model,
-    modelDisplayLabel,
-  });
   const newConvo = !conversationId;
   const user = req.user.id;
 
@@ -39,6 +34,8 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {
         responseMessageId = data[key];
       } else if (key === 'promptTokens') {
         promptTokens = data[key];
+      } else if (key === 'sender') {
+        sender = data[key];
       } else if (!conversationId && key === 'conversationId') {
         conversationId = data[key];
       }
@@ -46,6 +43,7 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {
   };
 
   try {
+    /** @type {{ client: TAgentClient }} */
     const { client } = await initializeClient({ req, res, endpointOption });
 
     const getAbortData = () => ({
@@ -54,8 +52,8 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {
       promptTokens,
       conversationId,
       userMessagePromise,
-      // text: getPartialText(),
       messageId: responseMessageId,
+      content: client.getContentParts(),
       parentMessageId: overrideParentMessageId ?? userMessageId,
     });
 
@@ -90,11 +88,6 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {
     };
 
     let response = await client.sendMessage(text, messageOptions);
-
-    if (overrideParentMessageId) {
-      response.parentMessageId = overrideParentMessageId;
-    }
-
     response.endpoint = endpointOption.endpoint;
 
     const { conversation = {} } = await client.responsePromise;
@@ -103,7 +96,6 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {
 
     if (client.options.attachments) {
       userMessage.files = client.options.attachments;
-      conversation.model = endpointOption.modelOptions.model;
       delete userMessage.image_urls;
     }
 
diff --git a/api/server/controllers/agents/run.js b/api/server/controllers/agents/run.js
index d30d43bd9d3..5aeefa122db 100644
--- a/api/server/controllers/agents/run.js
+++ b/api/server/controllers/agents/run.js
@@ -1,4 +1,4 @@
-const { Run } = require('@librechat/agents');
+const { Run, Providers } = require('@librechat/agents');
 const { providerEndpointMap } = require('librechat-data-provider');
 
 /**
@@ -14,11 +14,12 @@ const { providerEndpointMap } = require('librechat-data-provider');
  * Creates a new Run instance with custom handlers and configuration.
  *
  * @param {Object} options - The options for creating the Run instance.
+ * @param {ServerRequest} [options.req] - The server request.
+ * @param {string | undefined} [options.runId] - Optional run ID; otherwise, a new run ID will be generated.
  * @param {Agent} options.agent - The agent for this run.
  * @param {StructuredTool[] | undefined} [options.tools] - The tools to use in the run.
  * @param {Record<string, StructuredTool[]> | undefined} [options.toolMap] - The tool map for the run.
  * @param {Record<GraphEvents, EventHandler> | undefined} [options.customHandlers] - Custom event handlers.
- * @param {string | undefined} [options.runId] - Optional run ID; otherwise, a new run ID will be generated.
  * @param {ClientOptions} [options.modelOptions] - Optional model to use; if not provided, it will use the default from modelMap.
  * @param {boolean} [options.streaming=true] - Whether to use streaming.
  * @param {boolean} [options.streamUsage=true] - Whether to stream usage information.
@@ -43,15 +44,22 @@ async function createRun({
     modelOptions,
   );
 
+  const graphConfig = {
+    runId,
+    llmConfig,
+    tools,
+    toolMap,
+    instructions: agent.instructions,
+    additional_instructions: agent.additional_instructions,
+  };
+
+  // TEMPORARY FOR TESTING
+  if (agent.provider === Providers.ANTHROPIC) {
+    graphConfig.streamBuffer = 2000;
+  }
+
   return Run.create({
-    graphConfig: {
-      runId,
-      llmConfig,
-      tools,
-      toolMap,
-      instructions: agent.instructions,
-      additional_instructions: agent.additional_instructions,
-    },
+    graphConfig,
     customHandlers,
   });
 }
diff --git a/api/server/controllers/agents/v1.js b/api/server/controllers/agents/v1.js
index 2a9911c5416..65e37f2618c 100644
--- a/api/server/controllers/agents/v1.js
+++ b/api/server/controllers/agents/v1.js
@@ -1,5 +1,5 @@
 const { nanoid } = require('nanoid');
-const { FileContext } = require('librechat-data-provider');
+const { FileContext, Constants } = require('librechat-data-provider');
 const {
   getAgent,
   createAgent,
@@ -9,6 +9,8 @@ const {
 } = require('~/models/Agent');
 const { getStrategyFunctions } = require('~/server/services/Files/strategies');
 const { uploadImageBuffer } = require('~/server/services/Files/process');
+const { getProjectByName } = require('~/models/Project');
+const { updateAgentProjects } = require('~/models/Agent');
 const { deleteFileByFilter } = require('~/models/File');
 const { logger } = require('~/config');
 
@@ -53,16 +55,35 @@ const createAgentHandler = async (req, res) => {
  * @param {object} req - Express Request
  * @param {object} req.params - Request params
  * @param {string} req.params.id - Agent identifier.
- * @returns {Agent} 200 - success response - application/json
+ * @param {object} req.user - Authenticated user information
+ * @param {string} req.user.id - User ID
+ * @returns {Promise<Agent>} 200 - success response - application/json
  * @returns {Error} 404 - Agent not found
  */
 const getAgentHandler = async (req, res) => {
   try {
     const id = req.params.id;
-    const agent = await getAgent({ id });
+    const author = req.user.id;
+
+    let query = { id, author };
+
+    const globalProject = await getProjectByName(Constants.GLOBAL_PROJECT_NAME, ['agentIds']);
+    if (globalProject && (globalProject.agentIds?.length ?? 0) > 0) {
+      query = {
+        $or: [{ id, $in: globalProject.agentIds }, query],
+      };
+    }
+
+    const agent = await getAgent(query);
+
     if (!agent) {
       return res.status(404).json({ error: 'Agent not found' });
     }
+
+    if (agent.author !== author) {
+      delete agent.author;
+    }
+
     return res.status(200).json(agent);
   } catch (error) {
     logger.error('[/Agents/:id] Error retrieving agent', error);
@@ -82,7 +103,17 @@ const getAgentHandler = async (req, res) => {
 const updateAgentHandler = async (req, res) => {
   try {
     const id = req.params.id;
-    const updatedAgent = await updateAgent({ id, author: req.user.id }, req.body);
+    const { projectIds, removeProjectIds, ...updateData } = req.body;
+
+    let updatedAgent;
+    if (Object.keys(updateData).length > 0) {
+      updatedAgent = await updateAgent({ id, author: req.user.id }, updateData);
+    }
+
+    if (projectIds || removeProjectIds) {
+      updatedAgent = await updateAgentProjects(id, projectIds, removeProjectIds);
+    }
+
     return res.json(updatedAgent);
   } catch (error) {
     logger.error('[/Agents/:id] Error updating Agent', error);
@@ -119,13 +150,13 @@ const deleteAgentHandler = async (req, res) => {
  * @param {object} req - Express Request
  * @param {object} req.query - Request query
  * @param {string} [req.query.user] - The user ID of the agent's author.
- * @returns {AgentListResponse} 200 - success response - application/json
+ * @returns {Promise<AgentListResponse>} 200 - success response - application/json
  */
 const getListAgentsHandler = async (req, res) => {
   try {
-    const { user } = req.query;
-    const filter = user ? { author: user } : {};
-    const data = await getListAgents(filter);
+    const data = await getListAgents({
+      author: req.user.id,
+    });
     return res.json(data);
   } catch (error) {
     logger.error('[/Agents] Error listing Agents', error);
diff --git a/api/server/index.js b/api/server/index.js
index 3fa5778301c..3bc0a050031 100644
--- a/api/server/index.js
+++ b/api/server/index.js
@@ -106,13 +106,16 @@ const startServer = async () => {
   app.use('/api/share', routes.share);
   app.use('/api/roles', routes.roles);
   app.use('/api/agents', routes.agents);
+  app.use('/api/banner', routes.banner);
+  app.use('/api/bedrock', routes.bedrock);
 
   app.use('/api/tags', routes.tags);
 
   app.use((req, res) => {
     // Replace lang attribute in index.html with lang from cookies or accept-language header
     const lang = req.cookies.lang || req.headers['accept-language']?.split(',')[0] || 'en-US';
-    const updatedIndexHtml = indexHTML.replace(/lang="en-US"/g, `lang="${lang}"`);
+    const saneLang = lang.replace(/"/g, '&quot;'); // sanitize untrusted user input
+    const updatedIndexHtml = indexHTML.replace(/lang="en-US"/g, `lang="${saneLang}"`);
     res.send(updatedIndexHtml);
   });
 
diff --git a/api/server/middleware/abortMiddleware.js b/api/server/middleware/abortMiddleware.js
index e855c0cb69d..6e608e1cc1e 100644
--- a/api/server/middleware/abortMiddleware.js
+++ b/api/server/middleware/abortMiddleware.js
@@ -1,4 +1,4 @@
-const { isAssistantsEndpoint } = require('librechat-data-provider');
+const { isAssistantsEndpoint, ErrorTypes } = require('librechat-data-provider');
 const { sendMessage, sendError, countTokens, isEnabled } = require('~/server/utils');
 const { truncateText, smartTruncateText } = require('~/app/clients/prompts');
 const clearPendingReq = require('~/cache/clearPendingReq');
@@ -107,7 +107,7 @@ const createAbortController = (req, res, getAbortData, getReqData) => {
       finish_reason: 'incomplete',
       endpoint: endpointOption.endpoint,
       iconURL: endpointOption.iconURL,
-      model: endpointOption.modelOptions.model,
+      model: endpointOption.modelOptions?.model ?? endpointOption.model_parameters?.model,
       unfinished: false,
       error: false,
       isCreatedByUser: false,
@@ -165,10 +165,18 @@ const handleAbortError = async (res, req, error, data) => {
     );
   }
 
-  const errorText = error?.message?.includes('"type"')
+  let errorText = error?.message?.includes('"type"')
     ? error.message
     : 'An error occurred while processing your request. Please contact the Admin.';
 
+  if (error?.type === ErrorTypes.INVALID_REQUEST) {
+    errorText = `{"type":"${ErrorTypes.INVALID_REQUEST}"}`;
+  }
+
+  if (error?.message?.includes('does not support \'system\'')) {
+    errorText = `{"type":"${ErrorTypes.NO_SYSTEM_MESSAGES}"}`;
+  }
+
   const respondWithError = async (partialText) => {
     let options = {
       sender,
diff --git a/api/server/middleware/buildEndpointOption.js b/api/server/middleware/buildEndpointOption.js
index 83e06d77c33..2b4ba40172d 100644
--- a/api/server/middleware/buildEndpointOption.js
+++ b/api/server/middleware/buildEndpointOption.js
@@ -5,6 +5,7 @@ const assistants = require('~/server/services/Endpoints/assistants');
 const gptPlugins = require('~/server/services/Endpoints/gptPlugins');
 const { processFiles } = require('~/server/services/Files/process');
 const anthropic = require('~/server/services/Endpoints/anthropic');
+const bedrock = require('~/server/services/Endpoints/bedrock');
 const openAI = require('~/server/services/Endpoints/openAI');
 const agents = require('~/server/services/Endpoints/agents');
 const custom = require('~/server/services/Endpoints/custom');
@@ -17,6 +18,7 @@ const buildFunction = {
   [EModelEndpoint.google]: google.buildOptions,
   [EModelEndpoint.custom]: custom.buildOptions,
   [EModelEndpoint.agents]: agents.buildOptions,
+  [EModelEndpoint.bedrock]: bedrock.buildOptions,
   [EModelEndpoint.azureOpenAI]: openAI.buildOptions,
   [EModelEndpoint.anthropic]: anthropic.buildOptions,
   [EModelEndpoint.gptPlugins]: gptPlugins.buildOptions,
diff --git a/api/server/middleware/optionalJwtAuth.js b/api/server/middleware/optionalJwtAuth.js
new file mode 100644
index 00000000000..8aa1c27e007
--- /dev/null
+++ b/api/server/middleware/optionalJwtAuth.js
@@ -0,0 +1,17 @@
+const passport = require('passport');
+
+// This middleware does not require authentication,
+// but if the user is authenticated, it will set the user object.
+const optionalJwtAuth = (req, res, next) => {
+  passport.authenticate('jwt', { session: false }, (err, user) => {
+    if (err) {
+      return next(err);
+    }
+    if (user) {
+      req.user = user;
+    }
+    next();
+  })(req, res, next);
+};
+
+module.exports = optionalJwtAuth;
diff --git a/api/server/middleware/roles/generateCheckAccess.js b/api/server/middleware/roles/generateCheckAccess.js
index 900921ef80d..ffc0ddc6133 100644
--- a/api/server/middleware/roles/generateCheckAccess.js
+++ b/api/server/middleware/roles/generateCheckAccess.js
@@ -1,4 +1,3 @@
-const { SystemRoles } = require('librechat-data-provider');
 const { getRoleByName } = require('~/models/Role');
 
 /**
@@ -17,10 +16,6 @@ const generateCheckAccess = (permissionType, permissions, bodyProps = {}) => {
         return res.status(401).json({ message: 'Authorization required' });
       }
 
-      if (user.role === SystemRoles.ADMIN) {
-        return next();
-      }
-
       const role = await getRoleByName(user.role);
       if (role && role[permissionType]) {
         const hasAnyPermission = permissions.some((permission) => {
diff --git a/api/server/routes/agents/actions.js b/api/server/routes/agents/actions.js
index e79f749fc13..dde3293b42a 100644
--- a/api/server/routes/agents/actions.js
+++ b/api/server/routes/agents/actions.js
@@ -41,7 +41,7 @@ router.post('/:agent_id', async (req, res) => {
       return res.status(400).json({ message: 'No functions provided' });
     }
 
-    let metadata = encryptMetadata(_metadata);
+    let metadata = await encryptMetadata(_metadata);
 
     let { domain } = metadata;
     domain = await domainParser(req, domain, true);
diff --git a/api/server/routes/agents/v1.js b/api/server/routes/agents/v1.js
index 1001873fe41..d3a3005bd55 100644
--- a/api/server/routes/agents/v1.js
+++ b/api/server/routes/agents/v1.js
@@ -1,11 +1,30 @@
 const multer = require('multer');
 const express = require('express');
+const { PermissionTypes, Permissions } = require('librechat-data-provider');
+const { requireJwtAuth, generateCheckAccess } = require('~/server/middleware');
 const v1 = require('~/server/controllers/agents/v1');
 const actions = require('./actions');
 
 const upload = multer();
 const router = express.Router();
 
+const checkAgentAccess = generateCheckAccess(PermissionTypes.AGENTS, [Permissions.USE]);
+const checkAgentCreate = generateCheckAccess(PermissionTypes.AGENTS, [
+  Permissions.USE,
+  Permissions.CREATE,
+]);
+
+const checkGlobalAgentShare = generateCheckAccess(
+  PermissionTypes.AGENTS,
+  [Permissions.USE, Permissions.CREATE],
+  {
+    [Permissions.SHARED_GLOBAL]: ['projectIds', 'removeProjectIds'],
+  },
+);
+
+router.use(requireJwtAuth);
+router.use(checkAgentAccess);
+
 /**
  * Agent actions route.
  * @route GET|POST /agents/actions
@@ -27,7 +46,7 @@ router.use('/tools', (req, res) => {
  * @param {AgentCreateParams} req.body - The agent creation parameters.
  * @returns {Agent} 201 - Success response - application/json
  */
-router.post('/', v1.createAgent);
+router.post('/', checkAgentCreate, v1.createAgent);
 
 /**
  * Retrieves an agent.
@@ -35,7 +54,7 @@ router.post('/', v1.createAgent);
  * @param {string} req.params.id - Agent identifier.
  * @returns {Agent} 200 - Success response - application/json
  */
-router.get('/:id', v1.getAgent);
+router.get('/:id', checkAgentAccess, v1.getAgent);
 
 /**
  * Updates an agent.
@@ -44,7 +63,7 @@ router.get('/:id', v1.getAgent);
  * @param {AgentUpdateParams} req.body - The agent update parameters.
  * @returns {Agent} 200 - Success response - application/json
  */
-router.patch('/:id', v1.updateAgent);
+router.patch('/:id', checkGlobalAgentShare, v1.updateAgent);
 
 /**
  * Deletes an agent.
@@ -52,7 +71,7 @@ router.patch('/:id', v1.updateAgent);
  * @param {string} req.params.id - Agent identifier.
  * @returns {Agent} 200 - success response - application/json
  */
-router.delete('/:id', v1.deleteAgent);
+router.delete('/:id', checkAgentCreate, v1.deleteAgent);
 
 /**
  * Returns a list of agents.
@@ -60,9 +79,7 @@ router.delete('/:id', v1.deleteAgent);
  * @param {AgentListParams} req.query - The agent list parameters for pagination and sorting.
  * @returns {AgentListResponse} 200 - success response - application/json
  */
-router.get('/', v1.getListAgents);
-
-// TODO: handle private agents
+router.get('/', checkAgentAccess, v1.getListAgents);
 
 /**
  * Uploads and updates an avatar for a specific agent.
@@ -72,6 +89,6 @@ router.get('/', v1.getListAgents);
  * @param {string} [req.body.metadata] - Optional metadata for the agent's avatar.
  * @returns {Object} 200 - success response - application/json
  */
-router.post('/avatar/:agent_id', upload.single('file'), v1.uploadAgentAvatar);
+router.post('/avatar/:agent_id', checkAgentAccess, upload.single('file'), v1.uploadAgentAvatar);
 
 module.exports = router;
diff --git a/api/server/routes/banner.js b/api/server/routes/banner.js
new file mode 100644
index 00000000000..cf7eafd017d
--- /dev/null
+++ b/api/server/routes/banner.js
@@ -0,0 +1,15 @@
+const express = require('express');
+
+const { getBanner } = require('~/models/Banner');
+const optionalJwtAuth = require('~/server/middleware/optionalJwtAuth');
+const router = express.Router();
+
+router.get('/', optionalJwtAuth, async (req, res) => {
+  try {
+    res.status(200).send(await getBanner(req.user));
+  } catch (error) {
+    res.status(500).json({ message: 'Error getting banner' });
+  }
+});
+
+module.exports = router;
diff --git a/api/server/routes/bedrock/chat.js b/api/server/routes/bedrock/chat.js
new file mode 100644
index 00000000000..605a012710c
--- /dev/null
+++ b/api/server/routes/bedrock/chat.js
@@ -0,0 +1,36 @@
+const express = require('express');
+
+const router = express.Router();
+const {
+  setHeaders,
+  handleAbort,
+  // validateModel,
+  // validateEndpoint,
+  buildEndpointOption,
+} = require('~/server/middleware');
+const { initializeClient } = require('~/server/services/Endpoints/bedrock');
+const AgentController = require('~/server/controllers/agents/request');
+const addTitle = require('~/server/services/Endpoints/bedrock/title');
+
+router.post('/abort', handleAbort());
+
+/**
+ * @route POST /
+ * @desc Chat with an assistant
+ * @access Public
+ * @param {express.Request} req - The request object, containing the request data.
+ * @param {express.Response} res - The response object, used to send back a response.
+ * @returns {void}
+ */
+router.post(
+  '/',
+  // validateModel,
+  // validateEndpoint,
+  buildEndpointOption,
+  setHeaders,
+  async (req, res, next) => {
+    await AgentController(req, res, next, initializeClient, addTitle);
+  },
+);
+
+module.exports = router;
diff --git a/api/server/routes/bedrock/index.js b/api/server/routes/bedrock/index.js
new file mode 100644
index 00000000000..b1a9efec4cc
--- /dev/null
+++ b/api/server/routes/bedrock/index.js
@@ -0,0 +1,19 @@
+const express = require('express');
+const router = express.Router();
+const {
+  uaParser,
+  checkBan,
+  requireJwtAuth,
+  // concurrentLimiter,
+  // messageIpLimiter,
+  // messageUserLimiter,
+} = require('~/server/middleware');
+
+const chat = require('./chat');
+
+router.use(requireJwtAuth);
+router.use(checkBan);
+router.use(uaParser);
+router.use('/chat', chat);
+
+module.exports = router;
diff --git a/api/server/routes/config.js b/api/server/routes/config.js
index 3fc90c14bc5..f6669169acd 100644
--- a/api/server/routes/config.js
+++ b/api/server/routes/config.js
@@ -1,5 +1,5 @@
 const express = require('express');
-const { CacheKeys, defaultSocialLogins } = require('librechat-data-provider');
+const { CacheKeys, defaultSocialLogins, Constants } = require('librechat-data-provider');
 const { getLdapConfig } = require('~/server/services/Config/ldap');
 const { getProjectByName } = require('~/models/Project');
 const { isEnabled } = require('~/server/utils');
@@ -32,7 +32,7 @@ router.get('/', async function (req, res) {
     return today.getMonth() === 1 && today.getDate() === 11;
   };
 
-  const instanceProject = await getProjectByName('instance', '_id');
+  const instanceProject = await getProjectByName(Constants.GLOBAL_PROJECT_NAME, '_id');
 
   const ldap = getLdapConfig();
 
diff --git a/api/server/routes/convos.js b/api/server/routes/convos.js
index 104b0616f81..47a8ef19a8f 100644
--- a/api/server/routes/convos.js
+++ b/api/server/routes/convos.js
@@ -109,8 +109,14 @@ router.post('/clear', async (req, res) => {
 router.post('/update', async (req, res) => {
   const update = req.body.arg;
 
+  if (!update.conversationId) {
+    return res.status(400).json({ error: 'conversationId is required' });
+  }
+
   try {
-    const dbResponse = await saveConvo(req, update, { context: 'POST /api/convos/update' });
+    const dbResponse = await saveConvo(req, update, {
+      context: `POST /api/convos/update ${update.conversationId}`,
+    });
     res.status(201).json(dbResponse);
   } catch (error) {
     logger.error('Error updating conversation', error);
diff --git a/api/server/routes/index.js b/api/server/routes/index.js
index 90ba5c73add..4aba91e9548 100644
--- a/api/server/routes/index.js
+++ b/api/server/routes/index.js
@@ -8,6 +8,7 @@ const presets = require('./presets');
 const prompts = require('./prompts');
 const balance = require('./balance');
 const plugins = require('./plugins');
+const bedrock = require('./bedrock');
 const search = require('./search');
 const models = require('./models');
 const convos = require('./convos');
@@ -23,6 +24,7 @@ const edit = require('./edit');
 const keys = require('./keys');
 const user = require('./user');
 const ask = require('./ask');
+const banner = require('./banner');
 
 module.exports = {
   ask,
@@ -36,6 +38,7 @@ module.exports = {
   files,
   share,
   agents,
+  bedrock,
   convos,
   search,
   prompts,
@@ -50,4 +53,5 @@ module.exports = {
   assistants,
   categories,
   staticRoute,
+  banner,
 };
diff --git a/api/server/routes/messages.js b/api/server/routes/messages.js
index f510f31f63e..0abca92001d 100644
--- a/api/server/routes/messages.js
+++ b/api/server/routes/messages.js
@@ -1,4 +1,5 @@
 const express = require('express');
+const { ContentTypes } = require('librechat-data-provider');
 const { saveConvo, saveMessage, getMessages, updateMessage, deleteMessages } = require('~/models');
 const { requireJwtAuth, validateMessageReq } = require('~/server/middleware');
 const { countTokens } = require('~/server/utils');
@@ -54,11 +55,50 @@ router.get('/:conversationId/:messageId', validateMessageReq, async (req, res) =
 
 router.put('/:conversationId/:messageId', validateMessageReq, async (req, res) => {
   try {
-    const { messageId, model } = req.params;
-    const { text } = req.body;
-    const tokenCount = await countTokens(text, model);
-    const result = await updateMessage(req, { messageId, text, tokenCount });
-    res.status(200).json(result);
+    const { conversationId, messageId } = req.params;
+    const { text, index, model } = req.body;
+
+    if (index === undefined) {
+      const tokenCount = await countTokens(text, model);
+      const result = await updateMessage(req, { messageId, text, tokenCount });
+      return res.status(200).json(result);
+    }
+
+    if (typeof index !== 'number' || index < 0) {
+      return res.status(400).json({ error: 'Invalid index' });
+    }
+
+    const message = (await getMessages({ conversationId, messageId }, 'content tokenCount'))?.[0];
+    if (!message) {
+      return res.status(404).json({ error: 'Message not found' });
+    }
+
+    const existingContent = message.content;
+    if (!Array.isArray(existingContent) || index >= existingContent.length) {
+      return res.status(400).json({ error: 'Invalid index' });
+    }
+
+    const updatedContent = [...existingContent];
+    if (!updatedContent[index]) {
+      return res.status(400).json({ error: 'Content part not found' });
+    }
+
+    if (updatedContent[index].type !== ContentTypes.TEXT) {
+      return res.status(400).json({ error: 'Cannot update non-text content' });
+    }
+
+    const oldText = updatedContent[index].text;
+    updatedContent[index] = { type: ContentTypes.TEXT, text };
+
+    let tokenCount = message.tokenCount;
+    if (tokenCount !== undefined) {
+      const oldTokenCount = await countTokens(oldText, model);
+      const newTokenCount = await countTokens(text, model);
+      tokenCount = Math.max(0, tokenCount - oldTokenCount) + newTokenCount;
+    }
+
+    const result = await updateMessage(req, { messageId, content: updatedContent, tokenCount });
+    return res.status(200).json(result);
   } catch (error) {
     logger.error('Error updating message:', error);
     res.status(500).json({ error: 'Internal server error' });
diff --git a/api/server/routes/prompts.js b/api/server/routes/prompts.js
index 5a6dcafcb69..54128d3b395 100644
--- a/api/server/routes/prompts.js
+++ b/api/server/routes/prompts.js
@@ -24,6 +24,7 @@ const checkPromptCreate = generateCheckAccess(PermissionTypes.PROMPTS, [
   Permissions.USE,
   Permissions.CREATE,
 ]);
+
 const checkGlobalPromptShare = generateCheckAccess(
   PermissionTypes.PROMPTS,
   [Permissions.USE, Permissions.CREATE],
diff --git a/api/server/routes/roles.js b/api/server/routes/roles.js
index 06005ad40e8..36152e2c7e4 100644
--- a/api/server/routes/roles.js
+++ b/api/server/routes/roles.js
@@ -20,7 +20,10 @@ router.get('/:roleName', async (req, res) => {
   // TODO: TEMP, use a better parsing for roleName
   const roleName = _r.toUpperCase();
 
-  if (req.user.role !== SystemRoles.ADMIN && !roleDefaults[roleName]) {
+  if (
+    (req.user.role !== SystemRoles.ADMIN && roleName === SystemRoles.ADMIN) ||
+    (req.user.role !== SystemRoles.ADMIN && !roleDefaults[roleName])
+  ) {
     return res.status(403).send({ message: 'Unauthorized' });
   }
 
diff --git a/api/server/routes/tags.js b/api/server/routes/tags.js
index c9f637c473b..d3e27d37110 100644
--- a/api/server/routes/tags.js
+++ b/api/server/routes/tags.js
@@ -61,7 +61,8 @@ router.post('/', async (req, res) => {
  */
 router.put('/:tag', async (req, res) => {
   try {
-    const tag = await updateConversationTag(req.user.id, req.params.tag, req.body);
+    const decodedTag = decodeURIComponent(req.params.tag);
+    const tag = await updateConversationTag(req.user.id, decodedTag, req.body);
     if (tag) {
       res.status(200).json(tag);
     } else {
@@ -81,7 +82,8 @@ router.put('/:tag', async (req, res) => {
  */
 router.delete('/:tag', async (req, res) => {
   try {
-    const tag = await deleteConversationTag(req.user.id, req.params.tag);
+    const decodedTag = decodeURIComponent(req.params.tag);
+    const tag = await deleteConversationTag(req.user.id, decodedTag);
     if (tag) {
       res.status(200).json(tag);
     } else {
diff --git a/api/server/services/ActionService.js b/api/server/services/ActionService.js
index 04a9b9829d1..da69548b43d 100644
--- a/api/server/services/ActionService.js
+++ b/api/server/services/ActionService.js
@@ -165,7 +165,7 @@ async function createActionTool({ action, requestBuilder, zodSchema, name, descr
  * Encrypts sensitive metadata values for an action.
  *
  * @param {ActionMetadata} metadata - The action metadata to encrypt.
- * @returns {ActionMetadata} The updated action metadata with encrypted values.
+ * @returns {Promise<ActionMetadata>} The updated action metadata with encrypted values.
  */
 async function encryptMetadata(metadata) {
   const encryptedMetadata = { ...metadata };
diff --git a/api/server/services/AppService.js b/api/server/services/AppService.js
index eae83bc6e09..f99e9628711 100644
--- a/api/server/services/AppService.js
+++ b/api/server/services/AppService.js
@@ -8,6 +8,7 @@ const { loadDefaultInterface } = require('./start/interface');
 const { azureConfigSetup } = require('./start/azureOpenAI');
 const { loadAndFormatTools } = require('./ToolService');
 const { initializeRoles } = require('~/models/Role');
+const { cleanup } = require('./cleanup');
 const paths = require('~/config/paths');
 
 /**
@@ -17,6 +18,7 @@ const paths = require('~/config/paths');
  * @param {Express.Application} app - The Express application object.
  */
 const AppService = async (app) => {
+  cleanup();
   await initializeRoles();
   /** @type {TCustomConfig}*/
   const config = (await loadCustomConfig()) ?? {};
@@ -94,18 +96,19 @@ const AppService = async (app) => {
     );
   }
 
-  if (endpoints?.[EModelEndpoint.openAI]) {
-    endpointLocals[EModelEndpoint.openAI] = endpoints[EModelEndpoint.openAI];
-  }
-  if (endpoints?.[EModelEndpoint.google]) {
-    endpointLocals[EModelEndpoint.google] = endpoints[EModelEndpoint.google];
-  }
-  if (endpoints?.[EModelEndpoint.anthropic]) {
-    endpointLocals[EModelEndpoint.anthropic] = endpoints[EModelEndpoint.anthropic];
-  }
-  if (endpoints?.[EModelEndpoint.gptPlugins]) {
-    endpointLocals[EModelEndpoint.gptPlugins] = endpoints[EModelEndpoint.gptPlugins];
-  }
+  const endpointKeys = [
+    EModelEndpoint.openAI,
+    EModelEndpoint.google,
+    EModelEndpoint.bedrock,
+    EModelEndpoint.anthropic,
+    EModelEndpoint.gptPlugins,
+  ];
+
+  endpointKeys.forEach((key) => {
+    if (endpoints?.[key]) {
+      endpointLocals[key] = endpoints[key];
+    }
+  });
 
   app.locals = {
     ...defaultLocals,
diff --git a/api/server/services/Config/EndpointService.js b/api/server/services/Config/EndpointService.js
index b2f82f383be..56768905b82 100644
--- a/api/server/services/Config/EndpointService.js
+++ b/api/server/services/Config/EndpointService.js
@@ -45,6 +45,9 @@ module.exports = {
       AZURE_ASSISTANTS_BASE_URL,
       EModelEndpoint.azureAssistants,
     ),
+    [EModelEndpoint.bedrock]: generateConfig(
+      process.env.BEDROCK_AWS_SECRET_ACCESS_KEY ?? process.env.BEDROCK_AWS_DEFAULT_REGION,
+    ),
     /* key will be part of separate config */
     [EModelEndpoint.agents]: generateConfig(process.env.I_AM_A_TEAPOT),
   },
diff --git a/api/server/services/Config/loadDefaultEConfig.js b/api/server/services/Config/loadDefaultEConfig.js
index df331d92fb0..c11ddbe9d5b 100644
--- a/api/server/services/Config/loadDefaultEConfig.js
+++ b/api/server/services/Config/loadDefaultEConfig.js
@@ -9,22 +9,13 @@ const { config } = require('./EndpointService');
  */
 async function loadDefaultEndpointsConfig(req) {
   const { google, gptPlugins } = await loadAsyncEndpoints(req);
-  const {
-    openAI,
-    agents,
-    assistants,
-    azureAssistants,
-    bingAI,
-    anthropic,
-    azureOpenAI,
-    chatGPTBrowser,
-  } = config;
+  const { assistants, azureAssistants, bingAI, azureOpenAI, chatGPTBrowser } = config;
 
   const enabledEndpoints = getEnabledEndpoints();
 
   const endpointConfig = {
-    [EModelEndpoint.openAI]: openAI,
-    [EModelEndpoint.agents]: agents,
+    [EModelEndpoint.openAI]: config[EModelEndpoint.openAI],
+    [EModelEndpoint.agents]: config[EModelEndpoint.agents],
     [EModelEndpoint.assistants]: assistants,
     [EModelEndpoint.azureAssistants]: azureAssistants,
     [EModelEndpoint.azureOpenAI]: azureOpenAI,
@@ -32,7 +23,8 @@ async function loadDefaultEndpointsConfig(req) {
     [EModelEndpoint.bingAI]: bingAI,
     [EModelEndpoint.chatGPTBrowser]: chatGPTBrowser,
     [EModelEndpoint.gptPlugins]: gptPlugins,
-    [EModelEndpoint.anthropic]: anthropic,
+    [EModelEndpoint.anthropic]: config[EModelEndpoint.anthropic],
+    [EModelEndpoint.bedrock]: config[EModelEndpoint.bedrock],
   };
 
   const orderedAndFilteredEndpoints = enabledEndpoints.reduce((config, key, index) => {
diff --git a/api/server/services/Config/loadDefaultModels.js b/api/server/services/Config/loadDefaultModels.js
index e06b73c0c0a..464e84d44e4 100644
--- a/api/server/services/Config/loadDefaultModels.js
+++ b/api/server/services/Config/loadDefaultModels.js
@@ -3,6 +3,7 @@ const { useAzurePlugins } = require('~/server/services/Config/EndpointService').
 const {
   getOpenAIModels,
   getGoogleModels,
+  getBedrockModels,
   getAnthropicModels,
   getChatGPTBrowserModels,
 } = require('~/server/services/ModelService');
@@ -38,6 +39,7 @@ async function loadDefaultModels(req) {
     [EModelEndpoint.chatGPTBrowser]: chatGPTBrowser,
     [EModelEndpoint.assistants]: assistants,
     [EModelEndpoint.azureAssistants]: azureAssistants,
+    [EModelEndpoint.bedrock]: getBedrockModels(),
   };
 }
 
diff --git a/api/server/services/Endpoints/agents/build.js b/api/server/services/Endpoints/agents/build.js
index 256901057de..d04dee9a06d 100644
--- a/api/server/services/Endpoints/agents/build.js
+++ b/api/server/services/Endpoints/agents/build.js
@@ -2,7 +2,7 @@ const { getAgent } = require('~/models/Agent');
 const { logger } = require('~/config');
 
 const buildOptions = (req, endpoint, parsedBody) => {
-  const { agent_id, instructions, spec, ...rest } = parsedBody;
+  const { agent_id, instructions, spec, ...model_parameters } = parsedBody;
 
   const agentPromise = getAgent({
     id: agent_id,
@@ -19,9 +19,7 @@ const buildOptions = (req, endpoint, parsedBody) => {
     agent_id,
     instructions,
     spec,
-    modelOptions: {
-      ...rest,
-    },
+    model_parameters,
   };
 
   return endpointOption;
diff --git a/api/server/services/Endpoints/agents/initialize.js b/api/server/services/Endpoints/agents/initialize.js
index 8627775ce5d..a079e2145fb 100644
--- a/api/server/services/Endpoints/agents/initialize.js
+++ b/api/server/services/Endpoints/agents/initialize.js
@@ -11,7 +11,12 @@
 
 const { z } = require('zod');
 const { tool } = require('@langchain/core/tools');
-const { EModelEndpoint, providerEndpointMap } = require('librechat-data-provider');
+const { createContentAggregator } = require('@librechat/agents');
+const {
+  EModelEndpoint,
+  providerEndpointMap,
+  getResponseSender,
+} = require('librechat-data-provider');
 const { getDefaultHandlers } = require('~/server/controllers/agents/callbacks');
 // for testing purposes
 // const createTavilySearchTool = require('~/app/clients/tools/structured/TavilySearch');
@@ -53,7 +58,8 @@ const initializeClient = async ({ req, res, endpointOption }) => {
   }
 
   // TODO: use endpointOption to determine options/modelOptions
-  const eventHandlers = getDefaultHandlers({ res });
+  const { contentParts, aggregateContent } = createContentAggregator();
+  const eventHandlers = getDefaultHandlers({ res, aggregateContent });
 
   // const tools = [createTavilySearchTool()];
   // const tools = [_getWeather];
@@ -90,7 +96,7 @@ const initializeClient = async ({ req, res, endpointOption }) => {
   }
 
   // TODO: pass-in override settings that are specific to current run
-  endpointOption.modelOptions.model = agent.model;
+  endpointOption.model_parameters.model = agent.model;
   const options = await getOptions({
     req,
     res,
@@ -101,13 +107,21 @@ const initializeClient = async ({ req, res, endpointOption }) => {
   });
   modelOptions = Object.assign(modelOptions, options.llmConfig);
 
+  const sender = getResponseSender({
+    ...endpointOption,
+    model: endpointOption.model_parameters.model,
+  });
+
   const client = new AgentClient({
     req,
     agent,
     tools,
+    sender,
     toolMap,
+    contentParts,
     modelOptions,
     eventHandlers,
+    endpoint: EModelEndpoint.agents,
     configOptions: options.configOptions,
     maxContextTokens:
       agent.max_context_tokens ??
diff --git a/api/server/services/Endpoints/anthropic/addTitle.js b/api/server/services/Endpoints/anthropic/addTitle.js
index b69c04de688..5c477632d27 100644
--- a/api/server/services/Endpoints/anthropic/addTitle.js
+++ b/api/server/services/Endpoints/anthropic/addTitle.js
@@ -23,7 +23,7 @@ const addTitle = async (req, { text, response, client }) => {
 
   const title = await client.titleConvo({
     text,
-    responseText: response?.text,
+    responseText: response?.text ?? '',
     conversationId: response.conversationId,
   });
   await titleCache.set(key, title, 120000);
diff --git a/api/server/services/Endpoints/bedrock/build.js b/api/server/services/Endpoints/bedrock/build.js
new file mode 100644
index 00000000000..d6fb0636a93
--- /dev/null
+++ b/api/server/services/Endpoints/bedrock/build.js
@@ -0,0 +1,44 @@
+const { removeNullishValues, bedrockInputParser } = require('librechat-data-provider');
+const generateArtifactsPrompt = require('~/app/clients/prompts/artifacts');
+const { logger } = require('~/config');
+
+const buildOptions = (endpoint, parsedBody) => {
+  const {
+    modelLabel: name,
+    promptPrefix,
+    maxContextTokens,
+    resendFiles = true,
+    imageDetail,
+    iconURL,
+    greeting,
+    spec,
+    artifacts,
+    ...model_parameters
+  } = parsedBody;
+  let parsedParams = model_parameters;
+  try {
+    parsedParams = bedrockInputParser.parse(model_parameters);
+  } catch (error) {
+    logger.warn('Failed to parse bedrock input', error);
+  }
+  const endpointOption = removeNullishValues({
+    endpoint,
+    name,
+    resendFiles,
+    imageDetail,
+    iconURL,
+    greeting,
+    spec,
+    promptPrefix,
+    maxContextTokens,
+    model_parameters: parsedParams,
+  });
+
+  if (typeof artifacts === 'string') {
+    endpointOption.artifactsPrompt = generateArtifactsPrompt({ endpoint, artifacts });
+  }
+
+  return endpointOption;
+};
+
+module.exports = { buildOptions };
diff --git a/api/server/services/Endpoints/bedrock/index.js b/api/server/services/Endpoints/bedrock/index.js
new file mode 100644
index 00000000000..8989f7df8c6
--- /dev/null
+++ b/api/server/services/Endpoints/bedrock/index.js
@@ -0,0 +1,7 @@
+const build = require('./build');
+const initialize = require('./initialize');
+
+module.exports = {
+  ...build,
+  ...initialize,
+};
diff --git a/api/server/services/Endpoints/bedrock/initialize.js b/api/server/services/Endpoints/bedrock/initialize.js
new file mode 100644
index 00000000000..4a7e98a4ad4
--- /dev/null
+++ b/api/server/services/Endpoints/bedrock/initialize.js
@@ -0,0 +1,76 @@
+const { createContentAggregator } = require('@librechat/agents');
+const {
+  EModelEndpoint,
+  providerEndpointMap,
+  getResponseSender,
+} = require('librechat-data-provider');
+const { getDefaultHandlers } = require('~/server/controllers/agents/callbacks');
+// const { loadAgentTools } = require('~/server/services/ToolService');
+const getOptions = require('~/server/services/Endpoints/bedrock/options');
+const AgentClient = require('~/server/controllers/agents/client');
+const { getModelMaxTokens } = require('~/utils');
+
+const initializeClient = async ({ req, res, endpointOption }) => {
+  if (!endpointOption) {
+    throw new Error('Endpoint option not provided');
+  }
+
+  /** @type {Array<UsageMetadata>} */
+  const collectedUsage = [];
+  const { contentParts, aggregateContent } = createContentAggregator();
+  const eventHandlers = getDefaultHandlers({ res, aggregateContent, collectedUsage });
+
+  // const tools = [createTavilySearchTool()];
+
+  /** @type {Agent} */
+  const agent = {
+    id: EModelEndpoint.bedrock,
+    name: endpointOption.name,
+    instructions: endpointOption.promptPrefix,
+    provider: EModelEndpoint.bedrock,
+    model: endpointOption.model_parameters.model,
+    model_parameters: endpointOption.model_parameters,
+  };
+
+  if (typeof endpointOption.artifactsPrompt === 'string' && endpointOption.artifactsPrompt) {
+    agent.instructions = `${agent.instructions ?? ''}\n${endpointOption.artifactsPrompt}`.trim();
+  }
+
+  let modelOptions = { model: agent.model };
+
+  // TODO: pass-in override settings that are specific to current run
+  const options = await getOptions({
+    req,
+    res,
+    endpointOption,
+  });
+
+  modelOptions = Object.assign(modelOptions, options.llmConfig);
+  const maxContextTokens =
+    agent.max_context_tokens ??
+    getModelMaxTokens(modelOptions.model, providerEndpointMap[agent.provider]);
+
+  const sender = getResponseSender({
+    ...endpointOption,
+    model: endpointOption.model_parameters.model,
+  });
+
+  const client = new AgentClient({
+    req,
+    agent,
+    sender,
+    // tools,
+    // toolMap,
+    modelOptions,
+    contentParts,
+    eventHandlers,
+    collectedUsage,
+    maxContextTokens,
+    endpoint: EModelEndpoint.bedrock,
+    configOptions: options.configOptions,
+    attachments: endpointOption.attachments,
+  });
+  return { client };
+};
+
+module.exports = { initializeClient };
diff --git a/api/server/services/Endpoints/bedrock/options.js b/api/server/services/Endpoints/bedrock/options.js
new file mode 100644
index 00000000000..405d76fe4df
--- /dev/null
+++ b/api/server/services/Endpoints/bedrock/options.js
@@ -0,0 +1,101 @@
+const { HttpsProxyAgent } = require('https-proxy-agent');
+const {
+  EModelEndpoint,
+  Constants,
+  AuthType,
+  removeNullishValues,
+} = require('librechat-data-provider');
+const { getUserKey, checkUserKeyExpiry } = require('~/server/services/UserService');
+const { sleep } = require('~/server/utils');
+
+const getOptions = async ({ req, endpointOption }) => {
+  const {
+    BEDROCK_AWS_SECRET_ACCESS_KEY,
+    BEDROCK_AWS_ACCESS_KEY_ID,
+    BEDROCK_REVERSE_PROXY,
+    BEDROCK_AWS_DEFAULT_REGION,
+    PROXY,
+  } = process.env;
+  const expiresAt = req.body.key;
+  const isUserProvided = BEDROCK_AWS_SECRET_ACCESS_KEY === AuthType.USER_PROVIDED;
+
+  let credentials = isUserProvided
+    ? await getUserKey({ userId: req.user.id, name: EModelEndpoint.bedrock })
+    : {
+      accessKeyId: BEDROCK_AWS_ACCESS_KEY_ID,
+      secretAccessKey: BEDROCK_AWS_SECRET_ACCESS_KEY,
+    };
+
+  if (!credentials) {
+    throw new Error('Bedrock credentials not provided. Please provide them again.');
+  }
+
+  if (
+    !isUserProvided &&
+    (credentials.accessKeyId === undefined || credentials.accessKeyId === '') &&
+    (credentials.secretAccessKey === undefined || credentials.secretAccessKey === '')
+  ) {
+    credentials = undefined;
+  }
+
+  if (expiresAt && isUserProvided) {
+    checkUserKeyExpiry(expiresAt, EModelEndpoint.bedrock);
+  }
+
+  /** @type {number} */
+  let streamRate = Constants.DEFAULT_STREAM_RATE;
+
+  /** @type {undefined | TBaseEndpoint} */
+  const bedrockConfig = req.app.locals[EModelEndpoint.bedrock];
+
+  if (bedrockConfig && bedrockConfig.streamRate) {
+    streamRate = bedrockConfig.streamRate;
+  }
+
+  /** @type {undefined | TBaseEndpoint} */
+  const allConfig = req.app.locals.all;
+  if (allConfig && allConfig.streamRate) {
+    streamRate = allConfig.streamRate;
+  }
+
+  /** @type {import('@librechat/agents').BedrockConverseClientOptions} */
+  const requestOptions = Object.assign(
+    {
+      model: endpointOption.model,
+      region: BEDROCK_AWS_DEFAULT_REGION,
+      streaming: true,
+      streamUsage: true,
+      callbacks: [
+        {
+          handleLLMNewToken: async () => {
+            if (!streamRate) {
+              return;
+            }
+            await sleep(streamRate);
+          },
+        },
+      ],
+    },
+    endpointOption.model_parameters,
+  );
+
+  if (credentials) {
+    requestOptions.credentials = credentials;
+  }
+
+  const configOptions = {};
+  if (PROXY) {
+    configOptions.httpAgent = new HttpsProxyAgent(PROXY);
+  }
+
+  if (BEDROCK_REVERSE_PROXY) {
+    configOptions.endpointHost = BEDROCK_REVERSE_PROXY;
+  }
+
+  return {
+    llmConfig: removeNullishValues(requestOptions),
+    configOptions,
+  };
+};
+
+module.exports = getOptions;
diff --git a/api/server/services/Endpoints/bedrock/title.js b/api/server/services/Endpoints/bedrock/title.js
new file mode 100644
index 00000000000..520b9f78c43
--- /dev/null
+++ b/api/server/services/Endpoints/bedrock/title.js
@@ -0,0 +1,40 @@
+const { CacheKeys } = require('librechat-data-provider');
+const getLogStores = require('~/cache/getLogStores');
+const { isEnabled } = require('~/server/utils');
+const { saveConvo } = require('~/models');
+
+const addTitle = async (req, { text, response, client }) => {
+  const { TITLE_CONVO = true } = process.env ?? {};
+  if (!isEnabled(TITLE_CONVO)) {
+    return;
+  }
+
+  if (client.options.titleConvo === false) {
+    return;
+  }
+
+  // If the request was aborted, don't generate the title.
+  if (client.abortController.signal.aborted) {
+    return;
+  }
+
+  const titleCache = getLogStores(CacheKeys.GEN_TITLE);
+  const key = `${req.user.id}-${response.conversationId}`;
+
+  const title = await client.titleConvo({
+    text,
+    responseText: response?.text ?? '',
+    conversationId: response.conversationId,
+  });
+  await titleCache.set(key, title, 120000);
+  await saveConvo(
+    req,
+    {
+      conversationId: response.conversationId,
+      title,
+    },
+    { context: 'api/server/services/Endpoints/bedrock/title.js' },
+  );
+};
+
+module.exports = addTitle;
diff --git a/api/server/services/Endpoints/google/addTitle.js b/api/server/services/Endpoints/google/addTitle.js
index 14eafe841d7..f21d123214b 100644
--- a/api/server/services/Endpoints/google/addTitle.js
+++ b/api/server/services/Endpoints/google/addTitle.js
@@ -49,7 +49,7 @@ const addTitle = async (req, { text, response, client }) => {
 
   const title = await titleClient.titleConvo({
     text,
-    responseText: response?.text,
+    responseText: response?.text ?? '',
     conversationId: response.conversationId,
   });
   await titleCache.set(key, title, 120000);
diff --git a/api/server/services/Endpoints/openAI/addTitle.js b/api/server/services/Endpoints/openAI/addTitle.js
index af886dd22df..35291c5e310 100644
--- a/api/server/services/Endpoints/openAI/addTitle.js
+++ b/api/server/services/Endpoints/openAI/addTitle.js
@@ -23,7 +23,7 @@ const addTitle = async (req, { text, response, client }) => {
 
   const title = await client.titleConvo({
     text,
-    responseText: response?.text,
+    responseText: response?.text ?? '',
     conversationId: response.conversationId,
   });
   await titleCache.set(key, title, 120000);
diff --git a/api/server/services/Files/Audio/streamAudio.js b/api/server/services/Files/Audio/streamAudio.js
index 4d1157bd349..7b6bef03f84 100644
--- a/api/server/services/Files/Audio/streamAudio.js
+++ b/api/server/services/Files/Audio/streamAudio.js
@@ -1,4 +1,3 @@
-const WebSocket = require('ws');
 const { CacheKeys, findLastSeparatorIndex, SEPARATORS } = require('librechat-data-provider');
 const { getLogStores } = require('~/cache');
 
@@ -44,33 +43,6 @@ function getRandomVoiceId(voiceIds) {
  * @property {string[]} normalizedAlignment.chars
  */
 
-/**
- *
- * @param {Record<string, unknown | undefined>} parameters
- * @returns
- */
-function assembleQuery(parameters) {
-  let query = '';
-  let hasQuestionMark = false;
-
-  for (const [key, value] of Object.entries(parameters)) {
-    if (value == null) {
-      continue;
-    }
-
-    if (!hasQuestionMark) {
-      query += '?';
-      hasQuestionMark = true;
-    } else {
-      query += '&';
-    }
-
-    query += `${key}=${value}`;
-  }
-
-  return query;
-}
-
 const MAX_NOT_FOUND_COUNT = 6;
 const MAX_NO_CHANGE_COUNT = 10;
 
@@ -197,144 +169,6 @@ function splitTextIntoChunks(text, chunkSize = 4000) {
   return chunks;
 }
 
-/**
- * Input stream text to speech
- * @param {Express.Response} res
- * @param {AsyncIterable<string>} textStream
- * @param {(token: string) => Promise<boolean>} callback - Whether to continue the stream or not
- * @returns {AsyncGenerator<AudioChunk>}
- */
-function inputStreamTextToSpeech(res, textStream, callback) {
-  const model = 'eleven_monolingual_v1';
-  const wsUrl = `wss://api.elevenlabs.io/v1/text-to-speech/${getRandomVoiceId()}/stream-input${assembleQuery(
-    {
-      model_id: model,
-      // flush: true,
-      // optimize_streaming_latency: this.settings.optimizeStreamingLatency,
-      optimize_streaming_latency: 1,
-      // output_format: this.settings.outputFormat,
-    },
-  )}`;
-  const socket = new WebSocket(wsUrl);
-
-  socket.onopen = function () {
-    const streamStart = {
-      text: ' ',
-      voice_settings: {
-        stability: 0.5,
-        similarity_boost: 0.8,
-      },
-      xi_api_key: process.env.ELEVENLABS_API_KEY,
-      // generation_config: { chunk_length_schedule: [50, 90, 120, 150, 200] },
-    };
-
-    socket.send(JSON.stringify(streamStart));
-
-    // send stream until done
-    const streamComplete = new Promise((resolve, reject) => {
-      (async () => {
-        let textBuffer = '';
-        let shouldContinue = true;
-        for await (const textDelta of textStream) {
-          textBuffer += textDelta;
-
-          // using ". " as separator: sending in full sentences improves the quality
-          // of the audio output significantly.
-          const separatorIndex = findLastSeparatorIndex(textBuffer);
-
-          // Callback for textStream (will return false if signal is aborted)
-          shouldContinue = await callback(textDelta);
-
-          if (separatorIndex === -1) {
-            continue;
-          }
-
-          if (!shouldContinue) {
-            break;
-          }
-
-          const textToProcess = textBuffer.slice(0, separatorIndex);
-          textBuffer = textBuffer.slice(separatorIndex + 1);
-
-          const request = {
-            text: textToProcess,
-            try_trigger_generation: true,
-          };
-
-          socket.send(JSON.stringify(request));
-        }
-
-        // send remaining text:
-        if (shouldContinue && textBuffer.length > 0) {
-          socket.send(
-            JSON.stringify({
-              text: `${textBuffer} `, // append space
-              try_trigger_generation: true,
-            }),
-          );
-        }
-      })()
-        .then(resolve)
-        .catch(reject);
-    });
-
-    streamComplete
-      .then(() => {
-        const endStream = {
-          text: '',
-        };
-
-        socket.send(JSON.stringify(endStream));
-      })
-      .catch((e) => {
-        console.error('Error streaming text to speech:', e);
-        throw e;
-      });
-  };
-
-  return (async function* audioStream() {
-    let isDone = false;
-    let chunks = [];
-    let resolve;
-    let waitForMessage = new Promise((r) => (resolve = r));
-
-    socket.onmessage = function (event) {
-      // console.log(event);
-      const audioChunk = JSON.parse(event.data);
-      if (audioChunk.audio && audioChunk.alignment) {
-        res.write(`event: audio\ndata: ${event.data}\n\n`);
-        chunks.push(audioChunk);
-        resolve(null);
-        waitForMessage = new Promise((r) => (resolve = r));
-      } else if (audioChunk.isFinal) {
-        isDone = true;
-        resolve(null);
-      } else if (audioChunk.message) {
-        console.warn('Received Elevenlabs message:', audioChunk.message);
-        resolve(null);
-      }
-    };
-
-    socket.onerror = function (error) {
-      console.error('WebSocket error:', error);
-      // throw error;
-    };
-
-    socket.onclose = function () {
-      isDone = true;
-      resolve(null);
-    };
-
-    while (!isDone) {
-      await waitForMessage;
-      yield* chunks;
-      chunks = [];
-    }
-
-    res.write('event: end\ndata: \n\n');
-  })();
-}
-
 /**
  *
  * @param {AsyncIterable<string>} llmStream
@@ -349,7 +183,6 @@ async function* llmMessageSource(llmStream) {
 }
 
 module.exports = {
-  inputStreamTextToSpeech,
   findLastSeparatorIndex,
   createChunkProcessor,
   splitTextIntoChunks,
diff --git a/api/server/services/Files/images/encode.js b/api/server/services/Files/images/encode.js
index 4edb0bd56ce..05c9fc1d33f 100644
--- a/api/server/services/Files/images/encode.js
+++ b/api/server/services/Files/images/encode.js
@@ -23,7 +23,13 @@ async function fetchImageToBase64(url) {
   }
 }
 
-const base64Only = new Set([EModelEndpoint.google, EModelEndpoint.anthropic, 'Ollama', 'ollama']);
+const base64Only = new Set([
+  EModelEndpoint.google,
+  EModelEndpoint.anthropic,
+  'Ollama',
+  'ollama',
+  EModelEndpoint.bedrock,
+]);
 
 /**
  * Encodes and formats the given files.
diff --git a/api/server/services/ModelService.js b/api/server/services/ModelService.js
index b6ca6e4f4bb..7d2a3ae9ec9 100644
--- a/api/server/services/ModelService.js
+++ b/api/server/services/ModelService.js
@@ -5,6 +5,21 @@ const { extractBaseURL, inputSchema, processModelData, logAxiosError } = require
 const { OllamaClient } = require('~/app/clients/OllamaClient');
 const getLogStores = require('~/cache/getLogStores');
 
+/**
+ * Splits a string by commas and trims each resulting value.
+ * @param {string} input - The input string to split.
+ * @returns {string[]} An array of trimmed values.
+ */
+const splitAndTrim = (input) => {
+  if (!input || typeof input !== 'string') {
+    return [];
+  }
+  return input
+    .split(',')
+    .map((item) => item.trim())
+    .filter(Boolean);
+};
+
 const { openAIApiKey, userProvidedOpenAI } = require('./Config/EndpointService').config;
 
 /**
@@ -194,7 +209,7 @@ const getOpenAIModels = async (opts) => {
   }
 
   if (process.env[key]) {
-    models = String(process.env[key]).split(',');
+    models = splitAndTrim(process.env[key]);
     return models;
   }
 
@@ -208,7 +223,7 @@ const getOpenAIModels = async (opts) => {
 const getChatGPTBrowserModels = () => {
   let models = ['text-davinci-002-render-sha', 'gpt-4'];
   if (process.env.CHATGPT_MODELS) {
-    models = String(process.env.CHATGPT_MODELS).split(',');
+    models = splitAndTrim(process.env.CHATGPT_MODELS);
   }
 
   return models;
@@ -217,7 +232,7 @@ const getChatGPTBrowserModels = () => {
 const getAnthropicModels = () => {
   let models = defaultModels[EModelEndpoint.anthropic];
   if (process.env.ANTHROPIC_MODELS) {
-    models = String(process.env.ANTHROPIC_MODELS).split(',');
+    models = splitAndTrim(process.env.ANTHROPIC_MODELS);
   }
 
   return models;
@@ -226,7 +241,16 @@ const getAnthropicModels = () => {
 const getGoogleModels = () => {
   let models = defaultModels[EModelEndpoint.google];
   if (process.env.GOOGLE_MODELS) {
-    models = String(process.env.GOOGLE_MODELS).split(',');
+    models = splitAndTrim(process.env.GOOGLE_MODELS);
+  }
+
+  return models;
+};
+
+const getBedrockModels = () => {
+  let models = defaultModels[EModelEndpoint.bedrock];
+  if (process.env.BEDROCK_AWS_MODELS) {
+    models = splitAndTrim(process.env.BEDROCK_AWS_MODELS);
   }
 
   return models;
@@ -234,7 +258,9 @@ const getGoogleModels = () => {
 
 module.exports = {
   fetchModels,
+  splitAndTrim,
   getOpenAIModels,
+  getBedrockModels,
   getChatGPTBrowserModels,
   getAnthropicModels,
   getGoogleModels,
diff --git a/api/server/services/ModelService.spec.js b/api/server/services/ModelService.spec.js
index fc7c8b1079a..4e4647ee35d 100644
--- a/api/server/services/ModelService.spec.js
+++ b/api/server/services/ModelService.spec.js
@@ -1,7 +1,16 @@
 const axios = require('axios');
+const { EModelEndpoint, defaultModels } = require('librechat-data-provider');
 const { logger } = require('~/config');
 
-const { fetchModels, getOpenAIModels } = require('./ModelService');
+const {
+  fetchModels,
+  splitAndTrim,
+  getOpenAIModels,
+  getGoogleModels,
+  getBedrockModels,
+  getAnthropicModels,
+} = require('./ModelService');
+
 jest.mock('~/utils', () => {
   const originalUtils = jest.requireActual('~/utils');
   return {
@@ -329,3 +338,71 @@ describe('fetchModels with Ollama specific logic', () => {
     );
   });
 });
+
+describe('splitAndTrim', () => {
+  it('should split a string by commas and trim each value', () => {
+    const input = ' model1, model2 , model3,model4 ';
+    const expected = ['model1', 'model2', 'model3', 'model4'];
+    expect(splitAndTrim(input)).toEqual(expected);
+  });
+
+  it('should return an empty array for empty input', () => {
+    expect(splitAndTrim('')).toEqual([]);
+  });
+
+  it('should return an empty array for null input', () => {
+    expect(splitAndTrim(null)).toEqual([]);
+  });
+
+  it('should return an empty array for undefined input', () => {
+    expect(splitAndTrim(undefined)).toEqual([]);
+  });
+
+  it('should filter out empty values after trimming', () => {
+    const input = 'model1,,  ,model2,';
+    const expected = ['model1', 'model2'];
+    expect(splitAndTrim(input)).toEqual(expected);
+  });
+});
+
+describe('getAnthropicModels', () => {
+  it('returns default models when ANTHROPIC_MODELS is not set', () => {
+    delete process.env.ANTHROPIC_MODELS;
+    const models = getAnthropicModels();
+    expect(models).toEqual(defaultModels[EModelEndpoint.anthropic]);
+  });
+
+  it('returns models from ANTHROPIC_MODELS when set', () => {
+    process.env.ANTHROPIC_MODELS = 'claude-1, claude-2 ';
+    const models = getAnthropicModels();
+    expect(models).toEqual(['claude-1', 'claude-2']);
+  });
+});
+
+describe('getGoogleModels', () => {
+  it('returns default models when GOOGLE_MODELS is not set', () => {
+    delete process.env.GOOGLE_MODELS;
+    const models = getGoogleModels();
+    expect(models).toEqual(defaultModels[EModelEndpoint.google]);
+  });
+
+  it('returns models from GOOGLE_MODELS when set', () => {
+    process.env.GOOGLE_MODELS = 'gemini-pro, bard ';
+    const models = getGoogleModels();
+    expect(models).toEqual(['gemini-pro', 'bard']);
+  });
+});
+
+describe('getBedrockModels', () => {
+  it('returns default models when BEDROCK_AWS_MODELS is not set', () => {
+    delete process.env.BEDROCK_AWS_MODELS;
+    const models = getBedrockModels();
+    expect(models).toEqual(defaultModels[EModelEndpoint.bedrock]);
+  });
+
+  it('returns models from BEDROCK_AWS_MODELS when set', () => {
+    process.env.BEDROCK_AWS_MODELS = 'anthropic.claude-v2, ai21.j2-ultra ';
+    const models = getBedrockModels();
+    expect(models).toEqual(['anthropic.claude-v2', 'ai21.j2-ultra']);
+  });
+});
diff --git a/api/server/services/cleanup.js b/api/server/services/cleanup.js
new file mode 100644
index 00000000000..814c0ecc94c
--- /dev/null
+++ b/api/server/services/cleanup.js
@@ -0,0 +1,13 @@
+const { logger } = require('~/config');
+const { deleteNullOrEmptyConversations } = require('~/models/Conversation');
+const cleanup = async () => {
+  try {
+    await deleteNullOrEmptyConversations();
+  } catch (error) {
+    logger.error('[cleanup] Error during app cleanup', error);
+  } finally {
+    logger.debug('Startup cleanup complete');
+  }
+};
+
+module.exports = { cleanup };
diff --git a/api/server/services/start/interface.js b/api/server/services/start/interface.js
index 314babbcf54..bf31eb78b89 100644
--- a/api/server/services/start/interface.js
+++ b/api/server/services/start/interface.js
@@ -31,11 +31,18 @@ async function loadDefaultInterface(config, configDefaults, roleName = SystemRol
     termsOfService: interfaceConfig?.termsOfService ?? defaults.termsOfService,
     bookmarks: interfaceConfig?.bookmarks ?? defaults.bookmarks,
     prompts: interfaceConfig?.prompts ?? defaults.prompts,
+    multiConvo: interfaceConfig?.multiConvo ?? defaults.multiConvo,
   });
 
   await updateAccessPermissions(roleName, {
     [PermissionTypes.PROMPTS]: { [Permissions.USE]: loadedInterface.prompts },
     [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: loadedInterface.bookmarks },
+    [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: loadedInterface.multiConvo },
+  });
+  await updateAccessPermissions(SystemRoles.ADMIN, {
+    [PermissionTypes.PROMPTS]: { [Permissions.USE]: loadedInterface.prompts },
+    [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: loadedInterface.bookmarks },
+    [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: loadedInterface.multiConvo },
   });
 
   let i = 0;
diff --git a/api/server/services/start/interface.spec.js b/api/server/services/start/interface.spec.js
index 2009e043ccb..62239a6a297 100644
--- a/api/server/services/start/interface.spec.js
+++ b/api/server/services/start/interface.spec.js
@@ -16,6 +16,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: true },
+      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
     });
   });
 
@@ -28,6 +29,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: false },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: false },
+      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
     });
   });
 
@@ -40,6 +42,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: undefined },
+      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
     });
   });
 
@@ -52,6 +55,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: undefined },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: undefined },
+      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
     });
   });
 
@@ -64,6 +68,7 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: false },
+      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
     });
   });
 
@@ -76,6 +81,72 @@ describe('loadDefaultInterface', () => {
     expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
       [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
       [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: true },
+      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
+    });
+  });
+
+  it('should call updateAccessPermissions with the correct parameters when multiConvo is true', async () => {
+    const config = { interface: { multiConvo: true } };
+    const configDefaults = { interface: {} };
+
+    await loadDefaultInterface(config, configDefaults);
+
+    expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
+      [PermissionTypes.PROMPTS]: { [Permissions.USE]: undefined },
+      [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: undefined },
+      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: true },
+    });
+  });
+
+  it('should call updateAccessPermissions with false when multiConvo is false', async () => {
+    const config = { interface: { multiConvo: false } };
+    const configDefaults = { interface: {} };
+
+    await loadDefaultInterface(config, configDefaults);
+
+    expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
+      [PermissionTypes.PROMPTS]: { [Permissions.USE]: undefined },
+      [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: undefined },
+      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: false },
+    });
+  });
+
+  it('should call updateAccessPermissions with undefined when multiConvo is not specified in config', async () => {
+    const config = {};
+    const configDefaults = { interface: {} };
+
+    await loadDefaultInterface(config, configDefaults);
+
+    expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
+      [PermissionTypes.PROMPTS]: { [Permissions.USE]: undefined },
+      [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: undefined },
+      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: undefined },
+    });
+  });
+
+  it('should call updateAccessPermissions with all interface options including multiConvo', async () => {
+    const config = { interface: { prompts: true, bookmarks: false, multiConvo: true } };
+    const configDefaults = { interface: {} };
+
+    await loadDefaultInterface(config, configDefaults);
+
+    expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
+      [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
+      [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: false },
+      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: true },
+    });
+  });
+
+  it('should use default values for multiConvo when config is undefined', async () => {
+    const config = undefined;
+    const configDefaults = { interface: { prompts: true, bookmarks: true, multiConvo: false } };
+
+    await loadDefaultInterface(config, configDefaults);
+
+    expect(updateAccessPermissions).toHaveBeenCalledWith(SystemRoles.USER, {
+      [PermissionTypes.PROMPTS]: { [Permissions.USE]: true },
+      [PermissionTypes.BOOKMARKS]: { [Permissions.USE]: true },
+      [PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: false },
     });
   });
 });
diff --git a/api/server/utils/crypto.js b/api/server/utils/crypto.js
index c143506cc54..ea71df51ad0 100644
--- a/api/server/utils/crypto.js
+++ b/api/server/utils/crypto.js
@@ -102,4 +102,14 @@ async function hashToken(str) {
   return Buffer.from(hashBuffer).toString('hex');
 }
 
-module.exports = { encrypt, decrypt, encryptV2, decryptV2, hashToken };
+async function getRandomValues(length) {
+  if (!Number.isInteger(length) || length <= 0) {
+    throw new Error('Length must be a positive integer');
+  }
+
+  const randomValues = new Uint8Array(length);
+  webcrypto.getRandomValues(randomValues);
+  return Buffer.from(randomValues).toString('hex');
+}
+
+module.exports = { encrypt, decrypt, encryptV2, decryptV2, hashToken, getRandomValues };
diff --git a/api/strategies/ldapStrategy.js b/api/strategies/ldapStrategy.js
index 756e1da4227..4d9124bb6ad 100644
--- a/api/strategies/ldapStrategy.js
+++ b/api/strategies/ldapStrategy.js
@@ -14,6 +14,7 @@ const {
   LDAP_FULL_NAME,
   LDAP_ID,
   LDAP_USERNAME,
+  LDAP_EMAIL,
   LDAP_TLS_REJECT_UNAUTHORIZED,
 } = process.env;
 
@@ -43,6 +44,9 @@ if (LDAP_ID) {
 if (LDAP_USERNAME) {
   searchAttributes.push(LDAP_USERNAME);
 }
+if (LDAP_EMAIL) {
+  searchAttributes.push(LDAP_EMAIL);
+}
 const rejectUnauthorized = isEnabled(LDAP_TLS_REJECT_UNAUTHORIZED);
 
 const ldapOptions = {
@@ -76,15 +80,6 @@ const ldapLogin = new LdapStrategy(ldapOptions, async (userinfo, done) => {
     return done(null, false, { message: 'Invalid credentials' });
   }
 
-  if (!userinfo.mail) {
-    logger.warn(
-      '[ldapStrategy]',
-      'No email attributes found in userinfo',
-      JSON.stringify(userinfo, null, 2),
-    );
-    return done(null, false, { message: 'Invalid credentials' });
-  }
-
   try {
     const ldapId =
       (LDAP_ID && userinfo[LDAP_ID]) || userinfo.uid || userinfo.sAMAccountName || userinfo.mail;
@@ -100,12 +95,25 @@ const ldapLogin = new LdapStrategy(ldapOptions, async (userinfo, done) => {
     const username =
       (LDAP_USERNAME && userinfo[LDAP_USERNAME]) || userinfo.givenName || userinfo.mail;
 
+    const mail = (LDAP_EMAIL && userinfo[LDAP_EMAIL]) || userinfo.mail || username + '@ldap.local';
+
+    if (!userinfo.mail && !(LDAP_EMAIL && userinfo[LDAP_EMAIL])) {
+      logger.warn(
+        '[ldapStrategy]',
+        `No valid email attribute found in LDAP userinfo. Using fallback email: ${username}@ldap.local`,
+        `LDAP_EMAIL env var: ${LDAP_EMAIL || 'not set'}`,
+        `Available userinfo attributes: ${Object.keys(userinfo).join(', ')}`,
+        'Full userinfo:',
+        JSON.stringify(userinfo, null, 2),
+      );
+    }
+
     if (!user) {
       user = {
         provider: 'ldap',
         ldapId,
         username,
-        email: userinfo.mail,
+        email: mail,
         emailVerified: true, // The ldap server administrator should verify the email
         name: fullName,
       };
@@ -116,7 +124,7 @@ const ldapLogin = new LdapStrategy(ldapOptions, async (userinfo, done) => {
       // so update the user information with the values registered in LDAP
       user.provider = 'ldap';
       user.ldapId = ldapId;
-      user.email = userinfo.mail;
+      user.email = mail;
       user.username = username;
       user.name = fullName;
     }
diff --git a/api/typedefs.js b/api/typedefs.js
index 6591d192b12..163768f58ac 100644
--- a/api/typedefs.js
+++ b/api/typedefs.js
@@ -20,12 +20,30 @@
  * @memberof typedefs
  */
 
+/**
+ * @exports AgentRun
+ * @typedef {import('@librechat/agents').Run} AgentRun
+ * @memberof typedefs
+ */
+
+/**
+ * @exports IState
+ * @typedef {import('@librechat/agents').IState} IState
+ * @memberof typedefs
+ */
+
 /**
  * @exports ClientCallbacks
  * @typedef {import('@librechat/agents').ClientCallbacks} ClientCallbacks
  * @memberof typedefs
  */
 
+/**
+ * @exports BedrockClientOptions
+ * @typedef {import('@librechat/agents').BedrockConverseClientOptions} BedrockClientOptions
+ * @memberof typedefs
+ */
+
 /**
  * @exports StreamEventData
  * @typedef {import('@librechat/agents').StreamEventData} StreamEventData
@@ -38,6 +56,12 @@
  * @memberof typedefs
  */
 
+/**
+ * @exports UsageMetadata
+ * @typedef {import('@langchain/core/messages').UsageMetadata} UsageMetadata
+ * @memberof typedefs
+ */
+
 /**
  * @exports Ollama
  * @typedef {import('ollama').Ollama} Ollama
@@ -893,6 +917,12 @@
  * @memberof typedefs
  */
 
+/**
+ * @exports TAgentClient
+ * @typedef {import('./server/controllers/agents/client')} TAgentClient
+ * @memberof typedefs
+ */
+
 /**
  * @exports ImportBatchBuilder
  * @typedef {import('./server/utils/import/importBatchBuilder.js').ImportBatchBuilder} ImportBatchBuilder
@@ -1413,7 +1443,19 @@
  */
 
 /**
- * @typedef {AnthropicStreamUsage} StreamUsage - Stream usage for all providers (currently only Anthropic)
+ * @exports OpenAIUsageMetadata
+ * @typedef {Object} OpenAIUsageMetadata -  Usage statistics related to the run. This value will be `null` if the run is not in a terminal state (i.e. `in_progress`, `queued`, etc.).
+ * @property {number} [usage.completion_tokens] - Number of completion tokens used over the course of the run.
+ * @property {number} [usage.prompt_tokens] - Number of prompt tokens used over the course of the run.
+ * @property {number} [usage.total_tokens] - Total number of tokens used (prompt + completion).
+ * @property {number} [usage.reasoning_tokens] - Total number of tokens used for reasoning (OpenAI o1 models).
+ * @property {Object} [usage.completion_tokens_details] - Further details on the completion tokens used (OpenAI o1 models).
+ * @property {number} [usage.completion_tokens_details.reasoning_tokens] - Total number of tokens used for reasoning (OpenAI o1 models).
+ * @memberof typedefs
+ */
+
+/**
+ * @typedef {AnthropicStreamUsage | OpenAIUsageMetadata | UsageMetadata} StreamUsage - Stream usage for all providers (currently only Anthropic, OpenAI, LangChain)
  */
 
 /* Native app/client methods */
diff --git a/api/utils/tokens.js b/api/utils/tokens.js
index 83246c5b74d..8c2a8a6cc18 100644
--- a/api/utils/tokens.js
+++ b/api/utils/tokens.js
@@ -2,18 +2,21 @@ const z = require('zod');
 const { EModelEndpoint } = require('librechat-data-provider');
 
 const openAIModels = {
+  o1: 127500, // -500 from max
+  'o1-mini': 127500, // -500 from max
+  'o1-preview': 127500, // -500 from max
   'gpt-4': 8187, // -5 from max
   'gpt-4-0613': 8187, // -5 from max
   'gpt-4-32k': 32758, // -10 from max
   'gpt-4-32k-0314': 32758, // -10 from max
   'gpt-4-32k-0613': 32758, // -10 from max
-  'gpt-4-1106': 127990, // -10 from max
-  'gpt-4-0125': 127990, // -10 from max
-  'gpt-4o': 127990, // -10 from max
-  'gpt-4o-mini': 127990, // -10 from max
-  'gpt-4o-2024-08-06': 127990, // -10 from max
-  'gpt-4-turbo': 127990, // -10 from max
-  'gpt-4-vision': 127990, // -10 from max
+  'gpt-4-1106': 127500, // -500 from max
+  'gpt-4-0125': 127500, // -500 from max
+  'gpt-4o': 127500, // -500 from max
+  'gpt-4o-mini': 127500, // -500 from max
+  'gpt-4o-2024-08-06': 127500, // -500 from max
+  'gpt-4-turbo': 127500, // -500 from max
+  'gpt-4-vision': 127500, // -500 from max
   'gpt-3.5-turbo': 16375, // -10 from max
   'gpt-3.5-turbo-0613': 4092, // -5 from max
   'gpt-3.5-turbo-0301': 4092, // -5 from max
@@ -21,9 +24,15 @@ const openAIModels = {
   'gpt-3.5-turbo-16k-0613': 16375, // -10 from max
   'gpt-3.5-turbo-1106': 16375, // -10 from max
   'gpt-3.5-turbo-0125': 16375, // -10 from max
+};
+
+const mistralModels = {
   'mistral-': 31990, // -10 from max
-  llama3: 8187, // -5 from max
-  'llama-3': 8187, // -5 from max
+  'mistral-7b': 31990, // -10 from max
+  'mistral-small': 31990, // -10 from max
+  'mixtral-8x7b': 31990, // -10 from max
+  'mistral-large-2402': 127500,
+  'mistral-large-2407': 127500,
 };
 
 const cohereModels = {
@@ -54,6 +63,7 @@ const googleModels = {
 
 const anthropicModels = {
   'claude-': 100000,
+  'claude-instant': 100000,
   'claude-2': 100000,
   'claude-2.1': 200000,
   'claude-3-haiku': 200000,
@@ -63,7 +73,38 @@ const anthropicModels = {
   'claude-3.5-sonnet': 200000,
 };
 
-const aggregateModels = { ...openAIModels, ...googleModels, ...anthropicModels, ...cohereModels };
+const metaModels = {
+  'llama2-13b': 4000,
+  'llama2-70b': 4000,
+  'llama3-8b': 8000,
+  'llama3-70b': 8000,
+  'llama3-1-8b': 127500,
+  'llama3-1-70b': 127500,
+  'llama3-1-405b': 127500,
+};
+
+const ai21Models = {
+  'ai21.j2-mid-v1': 8182, // -10 from max
+  'ai21.j2-ultra-v1': 8182, // -10 from max
+  'ai21.jamba-instruct-v1:0': 255500, // -500 from max
+};
+
+const amazonModels = {
+  'amazon.titan-text-lite-v1': 4000,
+  'amazon.titan-text-express-v1': 8000,
+  'amazon.titan-text-premier-v1:0': 31500, // -500 from max
+};
+
+const bedrockModels = {
+  ...anthropicModels,
+  ...mistralModels,
+  ...cohereModels,
+  ...metaModels,
+  ...ai21Models,
+  ...amazonModels,
+};
+
+const aggregateModels = { ...openAIModels, ...googleModels, ...bedrockModels };
 
 const maxTokensMap = {
   [EModelEndpoint.azureOpenAI]: openAIModels,
@@ -72,6 +113,29 @@ const maxTokensMap = {
   [EModelEndpoint.custom]: aggregateModels,
   [EModelEndpoint.google]: googleModels,
   [EModelEndpoint.anthropic]: anthropicModels,
+  [EModelEndpoint.bedrock]: bedrockModels,
+};
+
+const modelMaxOutputs = {
+  o1: 32268, // -500 from max: 32,768
+  'o1-mini': 65136, // -500 from max: 65,536
+  'o1-preview': 32268, // -500 from max: 32,768
+  system_default: 1024,
+};
+
+const anthropicMaxOutputs = {
+  'claude-3-haiku': 4096,
+  'claude-3-sonnet': 4096,
+  'claude-3-opus': 4096,
+  'claude-3.5-sonnet': 8192,
+  'claude-3-5-sonnet': 8192,
+};
+
+const maxOutputTokensMap = {
+  [EModelEndpoint.anthropic]: anthropicMaxOutputs,
+  [EModelEndpoint.azureOpenAI]: modelMaxOutputs,
+  [EModelEndpoint.openAI]: modelMaxOutputs,
+  [EModelEndpoint.custom]: modelMaxOutputs,
 };
 
 /**
@@ -93,27 +157,15 @@ function findMatchingPattern(modelName, tokensMap) {
 }
 
 /**
- * Retrieves the maximum tokens for a given model name. If the exact model name isn't found,
- * it searches for partial matches within the model name, checking keys in reverse order.
+ * Retrieves a token value for a given model name from a tokens map.
  *
  * @param {string} modelName - The name of the model to look up.
- * @param {string} endpoint - The endpoint (default is 'openAI').
- * @param {EndpointTokenConfig} [endpointTokenConfig] - Token Config for current endpoint to use for max tokens lookup
- * @returns {number|undefined} The maximum tokens for the given model or undefined if no match is found.
- *
- * @example
- * getModelMaxTokens('gpt-4-32k-0613'); // Returns 32767
- * getModelMaxTokens('gpt-4-32k-unknown'); // Returns 32767
- * getModelMaxTokens('unknown-model'); // Returns undefined
+ * @param {EndpointTokenConfig | Record<string, number>} tokensMap - The map of model names to token values.
+ * @param {string} [key='context'] - The key to look up in the tokens map.
+ * @returns {number|undefined} The token value for the given model or undefined if no match is found.
  */
-function getModelMaxTokens(modelName, endpoint = EModelEndpoint.openAI, endpointTokenConfig) {
-  if (typeof modelName !== 'string') {
-    return undefined;
-  }
-
-  /** @type {EndpointTokenConfig | Record<string, number>} */
-  const tokensMap = endpointTokenConfig ?? maxTokensMap[endpoint];
-  if (!tokensMap) {
+function getModelTokenValue(modelName, tokensMap, key = 'context') {
+  if (typeof modelName !== 'string' || !tokensMap) {
     return undefined;
   }
 
@@ -129,10 +181,36 @@ function getModelMaxTokens(modelName, endpoint = EModelEndpoint.openAI, endpoint
 
   if (matchedPattern) {
     const result = tokensMap[matchedPattern];
-    return result?.context ?? result;
+    return result?.[key] ?? result ?? tokensMap.system_default;
   }
 
-  return undefined;
+  return tokensMap.system_default;
+}
+
+/**
+ * Retrieves the maximum tokens for a given model name.
+ *
+ * @param {string} modelName - The name of the model to look up.
+ * @param {string} endpoint - The endpoint (default is 'openAI').
+ * @param {EndpointTokenConfig} [endpointTokenConfig] - Token Config for current endpoint to use for max tokens lookup
+ * @returns {number|undefined} The maximum tokens for the given model or undefined if no match is found.
+ */
+function getModelMaxTokens(modelName, endpoint = EModelEndpoint.openAI, endpointTokenConfig) {
+  const tokensMap = endpointTokenConfig ?? maxTokensMap[endpoint];
+  return getModelTokenValue(modelName, tokensMap);
+}
+
+/**
+ * Retrieves the maximum output tokens for a given model name.
+ *
+ * @param {string} modelName - The name of the model to look up.
+ * @param {string} endpoint - The endpoint (default is 'openAI').
+ * @param {EndpointTokenConfig} [endpointTokenConfig] - Token Config for current endpoint to use for max tokens lookup
+ * @returns {number|undefined} The maximum output tokens for the given model or undefined if no match is found.
+ */
+function getModelMaxOutputTokens(modelName, endpoint = EModelEndpoint.openAI, endpointTokenConfig) {
+  const tokensMap = endpointTokenConfig ?? maxOutputTokensMap[endpoint];
+  return getModelTokenValue(modelName, tokensMap, 'output');
 }
 
 /**
@@ -259,7 +337,8 @@ module.exports = {
   maxTokensMap,
   inputSchema,
   modelSchema,
-  getModelMaxTokens,
   matchModelName,
   processModelData,
+  getModelMaxTokens,
+  getModelMaxOutputTokens,
 };
diff --git a/api/utils/tokens.spec.js b/api/utils/tokens.spec.js
index afcd4b217a8..e76e01a5684 100644
--- a/api/utils/tokens.spec.js
+++ b/api/utils/tokens.spec.js
@@ -20,18 +20,6 @@ describe('getModelMaxTokens', () => {
     );
   });
 
-  test('should return correct tokens for LLama 3 models', () => {
-    expect(getModelMaxTokens('meta-llama/llama-3-8b')).toBe(
-      maxTokensMap[EModelEndpoint.openAI]['llama-3'],
-    );
-    expect(getModelMaxTokens('meta-llama/llama-3-8b')).toBe(
-      maxTokensMap[EModelEndpoint.openAI]['llama3'],
-    );
-    expect(getModelMaxTokens('llama-3-500b')).toBe(maxTokensMap[EModelEndpoint.openAI]['llama-3']);
-    expect(getModelMaxTokens('llama3-70b')).toBe(maxTokensMap[EModelEndpoint.openAI]['llama3']);
-    expect(getModelMaxTokens('llama3:latest')).toBe(maxTokensMap[EModelEndpoint.openAI]['llama3']);
-  });
-
   test('should return undefined for no match', () => {
     expect(getModelMaxTokens('unknown-model')).toBeUndefined();
   });
diff --git a/client/index.html b/client/index.html
index 633685704c8..3363299f437 100644
--- a/client/index.html
+++ b/client/index.html
@@ -1,48 +1,61 @@
 <!DOCTYPE html>
 <html lang="en-US">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="theme-color" content="#171717">
-    <meta name="mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-    <title>RaisChat</title>
-    <link
-      rel="shortcut icon"
-      href="#"
-    />
-    <link
-      rel="icon"
-      type="image/png"
-      sizes="32x32"
-      href="/assets/favicon-32x32.png"
-    />
-    <link
-      rel="icon"
-      type="image/png"
-      sizes="16x16"
-      href="/assets/favicon-16x16.png"
-    />
-    <link
-      rel="apple-touch-icon"
-      href="/assets/apple-touch-icon-180x180.png"
-    />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1"
-    />
-    <script
-      defer
-      type="module"
-      src="/src/main.jsx"
-    ></script>
-  </head>
-  <body>
-    <div id="root"></div>
 
-    <script
-      type="module"
-      src="/src/main.jsx"
-    ></script>
-  </body>
-</html>
+<head>
+  <meta charset="utf-8" />
+  <meta name="theme-color" content="#171717" />
+  <meta name="mobile-web-app-capable" content="yes" />
+  <meta name="apple-mobile-web-app-capable" content="yes" />
+  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+  <title>RaisChat</title>
+  <link rel="shortcut icon" href="#" />
+  <link rel="icon" type="image/png" sizes="32x32" href="/assets/favicon-32x32.png" />
+  <link rel="icon" type="image/png" sizes="16x16" href="/assets/favicon-16x16.png" />
+  <link rel="apple-touch-icon" href="/assets/apple-touch-icon-180x180.png" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <style>
+    html,
+    body {
+      margin: 0;
+      padding: 0;
+      height: 100%;
+    }
+  </style>
+  <script>
+    const theme = localStorage.getItem('color-theme');
+    const loadingContainerStyle = document.createElement('style');
+    let backgroundColor;
+
+    if (theme === 'dark') {
+      backgroundColor = '#0d0d0d';
+    } else if (theme === 'light') {
+      backgroundColor = '#ffffff';
+    } else if (theme === 'system') {
+      const prefersDarkScheme = window.matchMedia('(prefers-color-scheme: dark)').matches;
+      backgroundColor = prefersDarkScheme ? '#0d0d0d' : '#ffffff';
+    } else {
+      backgroundColor = '#ffffff';
+    }
+
+    loadingContainerStyle.innerHTML = `
+        #loading-container {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          height: 100vh;
+          background-color: ${backgroundColor};
+        }
+      `;
+    document.head.appendChild(loadingContainerStyle);
+  </script>
+  <script defer type="module" src="/src/main.jsx"></script>
+</head>
+
+<body>
+  <div id="root">
+    <div id="loading-container"></div>
+  </div>
+  <script type="module" src="/src/main.jsx"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/client/package.json b/client/package.json
index 9ea26134598..7803a6cf272 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@librechat/frontend",
-  "version": "v0.7.5-rc1",
+  "version": "v0.7.5-rc2",
   "description": "",
   "type": "module",
   "scripts": {
@@ -28,7 +28,7 @@
   },
   "homepage": "https://librechat.ai",
   "dependencies": {
-    "@ariakit/react": "^0.4.8",
+    "@ariakit/react": "^0.4.11",
     "@codesandbox/sandpack-react": "^2.18.2",
     "@dicebear/collection": "^7.0.4",
     "@dicebear/core": "^7.0.4",
@@ -54,7 +54,7 @@
     "@tanstack/react-query": "^4.28.0",
     "@tanstack/react-table": "^8.11.7",
     "@zattoo/use-double-click": "1.2.0",
-    "axios": "^1.3.4",
+    "axios": "^1.7.7",
     "class-variance-authority": "^0.6.0",
     "clsx": "^1.2.1",
     "copy-to-clipboard": "^3.3.3",
@@ -63,6 +63,7 @@
     "downloadjs": "^1.4.7",
     "export-from-json": "^1.7.2",
     "filenamify": "^6.0.0",
+    "framer-motion": "^11.5.4",
     "html-to-image": "^1.11.11",
     "image-blob-reduce": "^4.1.0",
     "js-cookie": "^3.0.5",
diff --git a/client/src/Providers/AnnouncerContext.tsx b/client/src/Providers/AnnouncerContext.tsx
index 34437d4e305..a45cbd20897 100644
--- a/client/src/Providers/AnnouncerContext.tsx
+++ b/client/src/Providers/AnnouncerContext.tsx
@@ -1,10 +1,6 @@
 // AnnouncerContext.tsx
 import React from 'react';
-
-export interface AnnounceOptions {
-  message: string;
-  isStatus?: boolean;
-}
+import type { AnnounceOptions } from '~/common';
 
 interface AnnouncerContextType {
   announceAssertive: (options: AnnounceOptions) => void;
diff --git a/client/src/common/a11y.ts b/client/src/common/a11y.ts
new file mode 100644
index 00000000000..0a0e56eab2f
--- /dev/null
+++ b/client/src/common/a11y.ts
@@ -0,0 +1,6 @@
+export interface AnnounceOptions {
+  message: string;
+  isStatus?: boolean;
+}
+
+export const MESSAGE_UPDATE_INTERVAL = 7000;
diff --git a/client/src/common/agents-types.ts b/client/src/common/agents-types.ts
index eaf64f4c6cb..07633a68dbd 100644
--- a/client/src/common/agents-types.ts
+++ b/client/src/common/agents-types.ts
@@ -1,8 +1,8 @@
 import { Capabilities } from 'librechat-data-provider';
 import type { Agent, AgentProvider, AgentModelParameters } from 'librechat-data-provider';
-import type { Option, ExtendedFile } from './types';
+import type { OptionWithIcon, ExtendedFile } from './types';
 
-export type TAgentOption = Option &
+export type TAgentOption = OptionWithIcon &
   Agent & {
     files?: Array<[string, ExtendedFile]>;
     code_files?: Array<[string, ExtendedFile]>;
@@ -23,5 +23,5 @@ export type AgentForm = {
   model: string | null;
   model_parameters: AgentModelParameters;
   tools?: string[];
-  provider?: AgentProvider | Option;
+  provider?: AgentProvider | OptionWithIcon;
 } & AgentCapabilities;
diff --git a/client/src/common/index.ts b/client/src/common/index.ts
index 29739c7bd8f..85dda0700cb 100644
--- a/client/src/common/index.ts
+++ b/client/src/common/index.ts
@@ -1,3 +1,4 @@
+export * from './a11y';
 export * from './artifacts';
 export * from './types';
 export * from './assistants-types';
diff --git a/client/src/common/types.ts b/client/src/common/types.ts
index bf003fbf68e..461dfcbe488 100644
--- a/client/src/common/types.ts
+++ b/client/src/common/types.ts
@@ -339,8 +339,12 @@ export type TAdditionalProps = {
 export type TMessageContentProps = TInitialProps & TAdditionalProps;
 
 export type TText = Pick<TInitialProps, 'text'> & { className?: string };
-export type TEditProps = Pick<TInitialProps, 'text' | 'isSubmitting'> &
-  Omit<TAdditionalProps, 'isCreatedByUser'>;
+export type TEditProps = Pick<TInitialProps, 'isSubmitting'> &
+  Omit<TAdditionalProps, 'isCreatedByUser' | 'siblingIdx'> & {
+    text?: string;
+    index?: number;
+    siblingIdx: number | null;
+  };
 export type TDisplayProps = TText &
   Pick<TAdditionalProps, 'isCreatedByUser' | 'message'> & {
     showCursor?: boolean;
@@ -536,3 +540,9 @@ export type TVectorStore = {
 };
 
 export type TThread = { id: string; createdAt: string };
+
+declare global {
+  interface Window {
+    google_tag_manager?: unknown;
+  }
+}
\ No newline at end of file
diff --git a/client/src/components/Auth/AuthLayout.tsx b/client/src/components/Auth/AuthLayout.tsx
index da53dcb2fb6..1d7c34add26 100644
--- a/client/src/components/Auth/AuthLayout.tsx
+++ b/client/src/components/Auth/AuthLayout.tsx
@@ -3,6 +3,7 @@ import { BlinkAnimation } from './BlinkAnimation';
 import { TStartupConfig } from 'librechat-data-provider';
 import SocialLoginRender from './SocialLoginRender';
 import { ThemeSelector } from '~/components/ui';
+import { Banner } from '../Banners';
 import Footer from './Footer';
 
 const ErrorRender = ({ children }: { children: React.ReactNode }) => (
@@ -56,6 +57,7 @@ function AuthLayout({
 
   return (
     <div className="relative flex min-h-screen flex-col bg-white dark:bg-gray-900" style={{ display: 'flex', justifyContent: 'center' }}>
+      <Banner />
       <BlinkAnimation active={isFetching}>
         <div className="mt-12 w-full bg-cover" style={{ height: '14rem' }}>
           <img src="/assets/raischat.webp" className="h-full w-full object-contain" alt="Logo" />
diff --git a/client/src/components/Auth/LoginForm.tsx b/client/src/components/Auth/LoginForm.tsx
index 030c8be4934..abc18e48e9e 100644
--- a/client/src/components/Auth/LoginForm.tsx
+++ b/client/src/components/Auth/LoginForm.tsx
@@ -81,7 +81,7 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit, startupConfig, error,
         method="POST"
         onSubmit={handleSubmit((data) => onSubmit(data))}
       >
-        <div className="mb-2">
+        <div className="mb-4">
           <div className="relative">
             <input
               type="text"
@@ -97,12 +97,20 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit, startupConfig, error,
                 },
               })}
               aria-invalid={!!errors.email}
-              className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-gray-300 bg-transparent px-3.5 pb-3.5 pt-4 text-sm text-gray-900 focus:border-sky-500 focus:outline-none focus:ring-0 dark:border-gray-600 dark:text-white dark:focus:border-sky-500"
+              className="
+                webkit-dark-styles transition-color peer w-full rounded-2xl border border-border-light
+                bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 focus:border-green-500 focus:outline-none
+              "
               placeholder=" "
             />
             <label
               htmlFor="email"
-              className="absolute start-1 top-2 z-10 origin-[0] -translate-y-4 scale-75 transform bg-white px-3 text-sm text-gray-500 duration-100 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-2 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-3 peer-focus:text-sky-600 dark:bg-gray-900 dark:text-gray-400 dark:peer-focus:text-sky-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4"
+              className="
+                absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200
+                peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100
+                peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-green-600 dark:peer-focus:text-green-500
+                rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4
+                "
             >
               {useUsernameLogin
                 ? localize('com_auth_username').replace(/ \(.*$/, '')
@@ -124,12 +132,20 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit, startupConfig, error,
                 maxLength: { value: 128, message: localize('com_auth_password_max_length') },
               })}
               aria-invalid={!!errors.password}
-              className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-gray-300 bg-transparent px-3.5 pb-3.5 pt-4 text-sm text-gray-900 focus:border-sky-500 focus:outline-none focus:ring-0 dark:border-gray-600 dark:text-white dark:focus:border-sky-500"
+              className="
+                webkit-dark-styles transition-color peer w-full rounded-2xl border border-border-light
+                bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 focus:border-green-500 focus:outline-none
+                "
               placeholder=" "
             />
             <label
               htmlFor="password"
-              className="absolute start-1 top-2 z-10 origin-[0] -translate-y-4 scale-75 transform bg-white px-3 text-sm text-gray-500 duration-100 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-2 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-3 peer-focus:text-sky-600 dark:bg-gray-900 dark:text-gray-400 dark:peer-focus:text-sky-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4"
+              className="
+                absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200
+                peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100
+                peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-green-600 dark:peer-focus:text-green-500
+                rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4
+                "
             >
               {localize('com_auth_password')}
             </label>
@@ -146,7 +162,7 @@ const LoginForm: React.FC<TLoginFormProps> = ({ onSubmit, startupConfig, error,
             aria-label="Sign in"
             data-testid="login-button"
             type="submit"
-            className="w-full transform rounded-md bg-sky-500 px-4 py-3 tracking-wide text-white transition-colors duration-200 hover:bg-sky-550 focus:bg-sky-550 focus:outline-none disabled:cursor-not-allowed disabled:hover:bg-sky-500"
+            className="btn-primary w-full transform rounded-2xl px-4 py-3 tracking-wide transition-colors duration-200"
           >
             {localize('com_auth_continue')}
           </button>
diff --git a/client/src/components/Auth/Registration.tsx b/client/src/components/Auth/Registration.tsx
index 1caacabb4a1..2dbe35ed4aa 100644
--- a/client/src/components/Auth/Registration.tsx
+++ b/client/src/components/Auth/Registration.tsx
@@ -57,7 +57,7 @@ const Registration: React.FC = () => {
   });
 
   const renderInput = (id: string, label: string, type: string, validation: object) => (
-    <div className="mb-2">
+    <div className="mb-4">
       <div className="relative">
         <input
           id={id}
@@ -69,19 +69,27 @@ const Registration: React.FC = () => {
             validation,
           )}
           aria-invalid={!!errors[id]}
-          className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-gray-300 bg-transparent px-3.5 pb-3.5 pt-4 text-sm text-gray-900 focus:border-sky-500 focus:outline-none focus:ring-0 dark:border-gray-600 dark:text-white dark:focus:border-sky-500"
+          className="
+            webkit-dark-styles transition-color peer w-full rounded-2xl border border-border-light
+            bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 focus:border-green-500 focus:outline-none
+          "
           placeholder=" "
           data-testid={id}
         />
         <label
           htmlFor={id}
-          className="absolute start-1 top-2 z-10 origin-[0] -translate-y-4 scale-75 transform bg-white px-3 text-sm text-gray-500 duration-100 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-2 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-3 peer-focus:text-sky-600 dark:bg-gray-900 dark:text-gray-400 dark:peer-focus:text-sky-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4"
+          className="
+            absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200
+            peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100
+            peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-green-500
+            rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4
+          "
         >
           {localize(label)}
         </label>
       </div>
       {errors[id] && (
-        <span role="alert" className="mt-1 text-sm text-red-500 dark:text-red-900">
+        <span role="alert" className="mt-1 text-sm text-red-500">
           {String(errors[id]?.message) ?? ''}
         </span>
       )}
@@ -175,7 +183,7 @@ const Registration: React.FC = () => {
                 disabled={Object.keys(errors).length > 0}
                 type="submit"
                 aria-label="Submit registration"
-                className="w-full transform rounded-md bg-sky-500 px-4 py-3 tracking-wide text-white transition-colors duration-200 hover:bg-sky-550 focus:bg-sky-550 focus:outline-none disabled:cursor-not-allowed disabled:hover:bg-sky-500"
+                className="btn-primary w-full transform rounded-2xl px-4 py-3 tracking-wide transition-colors duration-200"
               >
                 {isSubmitting ? <Spinner /> : localize('com_auth_continue')}
               </button>
diff --git a/client/src/components/Auth/RequestPasswordReset.tsx b/client/src/components/Auth/RequestPasswordReset.tsx
index e6c4832ca5b..e87a47a550c 100644
--- a/client/src/components/Auth/RequestPasswordReset.tsx
+++ b/client/src/components/Auth/RequestPasswordReset.tsx
@@ -104,12 +104,20 @@ function RequestPasswordReset() {
               },
             })}
             aria-invalid={!!errors.email}
-            className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-gray-300 bg-transparent px-3.5 pb-3.5 pt-4 text-sm text-gray-900 focus:border-sky-500 focus:outline-none focus:ring-0 dark:border-gray-600 dark:text-white dark:focus:border-sky-500"
+            className="
+              webkit-dark-styles transition-color peer w-full rounded-2xl border border-border-light
+              bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 focus:border-green-500 focus:outline-none
+            "
             placeholder=" "
           />
           <label
             htmlFor="email"
-            className="absolute start-1 top-2 z-10 origin-[0] -translate-y-4 scale-75 transform bg-white px-3 text-sm text-gray-500 duration-100 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-2 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-3 peer-focus:text-sky-600 dark:bg-gray-900 dark:text-gray-400 dark:peer-focus:text-sky-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4"
+            className="
+            absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200
+            peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100
+            peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-green-500
+            rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4
+            "
           >
             {localize('com_auth_email_address')}
           </label>
@@ -124,7 +132,7 @@ function RequestPasswordReset() {
         <button
           type="submit"
           disabled={!!errors.email}
-          className="w-full transform rounded-md bg-sky-500 px-4 py-3 tracking-wide text-white transition-colors duration-200 hover:bg-sky-550 focus:bg-sky-550 focus:outline-none disabled:cursor-not-allowed disabled:hover:bg-sky-500"
+          className="btn-primary w-full transform rounded-2xl px-4 py-3 tracking-wide transition-colors duration-200"
         >
           {localize('com_auth_continue')}
         </button>
diff --git a/client/src/components/Auth/ResetPassword.tsx b/client/src/components/Auth/ResetPassword.tsx
index 4af60991d60..11734c92eb9 100644
--- a/client/src/components/Auth/ResetPassword.tsx
+++ b/client/src/components/Auth/ResetPassword.tsx
@@ -89,12 +89,20 @@ function ResetPassword() {
               },
             })}
             aria-invalid={!!errors.password}
-            className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-gray-300 bg-transparent px-3.5 pb-3.5 pt-4 text-sm text-gray-900 focus:border-sky-500 focus:outline-none focus:ring-0 dark:border-gray-600 dark:text-white dark:focus:border-sky-500"
+            className="
+              webkit-dark-styles transition-color peer w-full rounded-2xl border border-border-light
+              bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 focus:border-green-500 focus:outline-none
+           "
             placeholder=" "
           />
           <label
             htmlFor="password"
-            className="absolute start-1 top-2 z-10 origin-[0] -translate-y-4 scale-75 transform bg-white px-3 text-sm text-gray-500 duration-100 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-2 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-3 peer-focus:text-sky-600 dark:bg-gray-900 dark:text-gray-400 dark:peer-focus:text-sky-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4"
+            className="
+              absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200
+              peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100
+              peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-green-500
+              rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4
+          "
           >
             {localize('com_auth_password')}
           </label>
@@ -116,12 +124,20 @@ function ResetPassword() {
               validate: (value) => value === password || localize('com_auth_password_not_match'),
             })}
             aria-invalid={!!errors.confirm_password}
-            className="webkit-dark-styles peer block w-full appearance-none rounded-md border border-gray-300 bg-transparent px-3.5 pb-3.5 pt-4 text-sm text-gray-900 focus:border-sky-500 focus:outline-none focus:ring-0 dark:border-gray-600 dark:text-white dark:focus:border-sky-500"
+            className="
+            webkit-dark-styles transition-color peer w-full rounded-2xl border border-border-light
+            bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 focus:border-green-500 focus:outline-none
+            "
             placeholder=" "
           />
           <label
             htmlFor="confirm_password"
-            className="absolute start-1 top-2 z-10 origin-[0] -translate-y-4 scale-75 transform bg-white px-3 text-sm text-gray-500 duration-100 peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100 peer-focus:top-2 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-3 peer-focus:text-sky-600 dark:bg-gray-900 dark:text-gray-400 dark:peer-focus:text-sky-500 rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4"
+            className="
+              absolute start-3 top-1.5 z-10 origin-[0] -translate-y-4 scale-75 transform bg-surface-primary px-2 text-sm text-text-secondary-alt duration-200
+              peer-placeholder-shown:top-1/2 peer-placeholder-shown:-translate-y-1/2 peer-placeholder-shown:scale-100
+              peer-focus:top-1.5 peer-focus:-translate-y-4 peer-focus:scale-75 peer-focus:px-2 peer-focus:text-green-500
+              rtl:peer-focus:left-auto rtl:peer-focus:translate-x-1/4
+            "
           >
             {localize('com_auth_password_confirm')}
           </label>
@@ -147,7 +163,7 @@ function ResetPassword() {
           disabled={!!errors.password || !!errors.confirm_password}
           type="submit"
           aria-label={localize('com_auth_submit_registration')}
-          className="w-full transform rounded-md bg-sky-500 px-4 py-3 tracking-wide text-white transition-all duration-300 hover:bg-sky-550 focus:bg-sky-550 focus:outline-none"
+          className="btn-primary w-full transform rounded-2xl px-4 py-3 tracking-wide transition-colors duration-200"
         >
           {localize('com_auth_continue')}
         </button>
diff --git a/client/src/components/Auth/SocialButton.tsx b/client/src/components/Auth/SocialButton.tsx
index c9b4bca34f1..1dbf3c704f2 100644
--- a/client/src/components/Auth/SocialButton.tsx
+++ b/client/src/components/Auth/SocialButton.tsx
@@ -1,60 +1,17 @@
-import React, { useState } from 'react';
+import React from 'react';
 
 const SocialButton = ({ id, enabled, serverDomain, oauthPath, Icon, label }) => {
-  const [isHovered, setIsHovered] = useState(false);
-  const [isPressed, setIsPressed] = useState(false);
-  const [activeButton, setActiveButton] = useState(null);
-
   if (!enabled) {
     return null;
   }
 
-  const handleMouseEnter = () => {
-    setIsHovered(true);
-  };
-
-  const handleMouseLeave = () => {
-    setIsHovered(false);
-    if (isPressed) {
-      setIsPressed(false);
-    }
-  };
-
-  const handleMouseDown = () => {
-    setIsPressed(true);
-    setActiveButton(id);
-  };
-
-  const handleMouseUp = () => {
-    setIsPressed(false);
-  };
-
-  const getButtonStyles = () => {
-    // Define Tailwind CSS classes based on state
-    const baseStyles = 'border border-solid border-gray-300 dark:border-gray-600 transition-colors';
-
-    let dynamicStyles = '';
-
-    if (isPressed && activeButton === id) {
-      dynamicStyles = 'bg-blue-200 border-blue-200 dark:bg-blue-900 dark:border-blue-600';
-    } else if (isHovered) {
-      dynamicStyles = 'bg-gray-100 dark:bg-gray-700';
-    }
-
-    return `${baseStyles} ${dynamicStyles}`;
-  };
-
   return (
     <div className="mt-2 flex gap-x-2">
       <a
         aria-label={`${label}`}
-        className={`${getButtonStyles()} flex w-full items-center space-x-3 rounded-md px-5 py-3 text-black transition-colors dark:text-white`}
+        className="flex w-full items-center space-x-3 rounded-2xl border border-border-light bg-surface-primary px-5 py-3 text-text-primary transition-colors duration-200 hover:bg-surface-tertiary"
         href={`${serverDomain}/oauth/${oauthPath}`}
         data-testid={id}
-        onMouseEnter={handleMouseEnter}
-        onMouseLeave={handleMouseLeave}
-        onMouseDown={handleMouseDown}
-        onMouseUp={handleMouseUp}
       >
         <Icon />
         <p>{label}</p>
diff --git a/client/src/components/Auth/__tests__/Login.spec.tsx b/client/src/components/Auth/__tests__/Login.spec.tsx
index 71c3d6592b3..288d7968507 100644
--- a/client/src/components/Auth/__tests__/Login.spec.tsx
+++ b/client/src/components/Auth/__tests__/Login.spec.tsx
@@ -54,6 +54,11 @@ const setup = ({
     },
   },
   useGetStartupConfigReturnValue = mockStartupConfig,
+  useGetBannerQueryReturnValue = {
+    isLoading: false,
+    isError: false,
+    data: {},
+  },
 } = {}) => {
   const mockUseLoginUser = jest
     .spyOn(mockDataProvider, 'useLoginUserMutation')
@@ -71,6 +76,10 @@ const setup = ({
     .spyOn(mockDataProvider, 'useRefreshTokenMutation')
     //@ts-ignore - we don't need all parameters of the QueryObserverSuccessResult
     .mockReturnValue(useRefreshTokenMutationReturnValue);
+  const mockUseGetBannerQuery = jest
+    .spyOn(mockDataProvider, 'useGetBannerQuery')
+    //@ts-ignore - we don't need all parameters of the QueryObserverSuccessResult
+    .mockReturnValue(useGetBannerQueryReturnValue);
   const mockUseOutletContext = jest.spyOn(reactRouter, 'useOutletContext').mockReturnValue({
     startupConfig: useGetStartupConfigReturnValue.data,
   });
@@ -93,6 +102,7 @@ const setup = ({
     mockUseOutletContext,
     mockUseGetStartupConfig,
     mockUseRefreshTokenMutation,
+    mockUseGetBannerQuery,
   };
 };
 
diff --git a/client/src/components/Auth/__tests__/LoginForm.spec.tsx b/client/src/components/Auth/__tests__/LoginForm.spec.tsx
index d30b709eb28..eca8e6ef513 100644
--- a/client/src/components/Auth/__tests__/LoginForm.spec.tsx
+++ b/client/src/components/Auth/__tests__/LoginForm.spec.tsx
@@ -59,6 +59,11 @@ const setup = ({
     isError: false,
     data: mockStartupConfig,
   },
+  useGetBannerQueryReturnValue = {
+    isLoading: false,
+    isError: false,
+    data: {},
+  },
 } = {}) => {
   const mockUseLoginUser = jest
     .spyOn(mockDataProvider, 'useLoginUserMutation')
@@ -76,11 +81,16 @@ const setup = ({
     .spyOn(mockDataProvider, 'useRefreshTokenMutation')
     //@ts-ignore - we don't need all parameters of the QueryObserverSuccessResult
     .mockReturnValue(useRefreshTokenMutationReturnValue);
+  const mockUseGetBannerQuery = jest
+    .spyOn(mockDataProvider, 'useGetBannerQuery')
+    //@ts-ignore - we don't need all parameters of the QueryObserverSuccessResult
+    .mockReturnValue(useGetBannerQueryReturnValue);
   return {
     mockUseLoginUser,
     mockUseGetUserQuery,
     mockUseGetStartupConfig,
     mockUseRefreshTokenMutation,
+    mockUseGetBannerQuery,
   };
 };
 
diff --git a/client/src/components/Auth/__tests__/Registration.spec.tsx b/client/src/components/Auth/__tests__/Registration.spec.tsx
index 16d27617541..0a9b6d4da92 100644
--- a/client/src/components/Auth/__tests__/Registration.spec.tsx
+++ b/client/src/components/Auth/__tests__/Registration.spec.tsx
@@ -50,6 +50,11 @@ const setup = ({
       user: {},
     },
   },
+  useGetBannerQueryReturnValue = {
+    isLoading: false,
+    isError: false,
+    data: {},
+  },
   useGetStartupConfigReturnValue = mockStartupConfig,
 } = {}) => {
   const mockUseRegisterUserMutation = jest
@@ -71,6 +76,10 @@ const setup = ({
   const mockUseOutletContext = jest.spyOn(reactRouter, 'useOutletContext').mockReturnValue({
     startupConfig: useGetStartupConfigReturnValue.data,
   });
+  const mockUseGetBannerQuery = jest
+    .spyOn(mockDataProvider, 'useGetBannerQuery')
+    //@ts-ignore - we don't need all parameters of the QueryObserverSuccessResult
+    .mockReturnValue(useGetBannerQueryReturnValue);
   const renderResult = render(
     <AuthLayout
       startupConfig={useGetStartupConfigReturnValue.data as TStartupConfig}
diff --git a/client/src/components/Banners/Banner.tsx b/client/src/components/Banners/Banner.tsx
new file mode 100644
index 00000000000..cf6fcae570e
--- /dev/null
+++ b/client/src/components/Banners/Banner.tsx
@@ -0,0 +1,48 @@
+import { XIcon } from 'lucide-react';
+import { useRecoilState } from 'recoil';
+import { useGetBannerQuery } from 'librechat-data-provider/react-query';
+import store from '~/store';
+import { useEffect, useRef } from 'react';
+
+export const Banner = ({ onHeightChange }: { onHeightChange?: (height: number) => void }) => {
+  const { data: banner } = useGetBannerQuery();
+  const [hideBannerHint, setHideBannerHint] = useRecoilState<string[]>(store.hideBannerHint);
+  const bannerRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    if (onHeightChange && bannerRef.current) {
+      onHeightChange(bannerRef.current.offsetHeight);
+    }
+  }, [banner, hideBannerHint, onHeightChange]);
+
+  if (!banner || (banner.bannerId && hideBannerHint.includes(banner.bannerId))) {
+    return null;
+  }
+
+  const onClick = () => {
+    setHideBannerHint([...hideBannerHint, banner.bannerId]);
+    if (onHeightChange) {
+      onHeightChange(0); // Reset height when banner is closed
+    }
+  };
+
+  return (
+    <div
+      ref={bannerRef}
+      className="sticky top-0 z-20 flex items-center bg-neutral-900 from-gray-700 to-gray-900 px-2 py-1 text-slate-50 dark:bg-gradient-to-r dark:text-white md:relative"
+    >
+      <div
+        className="w-full truncate px-4 text-center text-sm"
+        dangerouslySetInnerHTML={{ __html: banner.message }}
+      ></div>
+      <button
+        type="button"
+        aria-label="Dismiss banner"
+        className="h-8 w-8 opacity-80 hover:opacity-100"
+        onClick={onClick}
+      >
+        <XIcon className="mx-auto h-4 w-4" />
+      </button>
+    </div>
+  );
+};
diff --git a/client/src/components/Banners/index.ts b/client/src/components/Banners/index.ts
new file mode 100644
index 00000000000..f4930c0719e
--- /dev/null
+++ b/client/src/components/Banners/index.ts
@@ -0,0 +1 @@
+export { Banner } from './Banner';
diff --git a/client/src/components/Bookmarks/DeleteBookmarkButton.tsx b/client/src/components/Bookmarks/DeleteBookmarkButton.tsx
index 1e422659ae4..af12fcc2d34 100644
--- a/client/src/components/Bookmarks/DeleteBookmarkButton.tsx
+++ b/client/src/components/Bookmarks/DeleteBookmarkButton.tsx
@@ -1,11 +1,11 @@
-import { useCallback } from 'react';
+import { useCallback, useState } from 'react';
 import type { FC } from 'react';
+import { Label, OGDialog, OGDialogTrigger, TooltipAnchor } from '~/components/ui';
 import { useDeleteConversationTagMutation } from '~/data-provider';
-import TooltipIcon from '~/components/ui/TooltipIcon';
+import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
 import { NotificationSeverity } from '~/common';
 import { useToastContext } from '~/Providers';
 import { TrashIcon } from '~/components/svg';
-import { Label } from '~/components/ui';
 import { useLocalize } from '~/hooks';
 
 const DeleteBookmarkButton: FC<{
@@ -16,6 +16,7 @@ const DeleteBookmarkButton: FC<{
 }> = ({ bookmark, tabIndex = 0, onFocus, onBlur }) => {
   const localize = useLocalize();
   const { showToast } = useToastContext();
+  const [open, setOpen] = useState(false);
 
   const deleteBookmarkMutation = useDeleteConversationTagMutation({
     onSuccess: () => {
@@ -35,23 +36,48 @@ const DeleteBookmarkButton: FC<{
     await deleteBookmarkMutation.mutateAsync(bookmark);
   }, [bookmark, deleteBookmarkMutation]);
 
+  const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
+    if (event.key === 'Enter') {
+      event.preventDefault();
+      event.stopPropagation();
+      setOpen(!open);
+    }
+  };
+
   return (
-    <TooltipIcon
-      disabled={false}
-      appendLabel={false}
-      title="Delete Bookmark"
-      confirmMessage={
-        <Label htmlFor="bookmark" className="text-left text-sm font-medium">
-          {localize('com_ui_bookmark_delete_confirm')} {bookmark}
-        </Label>
-      }
-      confirm={confirmDelete}
-      className="transition-colors flex size-7 items-center justify-center rounded-lg duration-200 hover:bg-surface-hover"
-      icon={<TrashIcon className="size-4" />}
-      tabIndex={tabIndex}
-      onFocus={onFocus}
-      onBlur={onBlur}
-    />
+    <>
+      <OGDialog open={open} onOpenChange={setOpen}>
+        <OGDialogTrigger asChild>
+          <TooltipAnchor
+            description={localize('com_ui_delete')}
+            className="flex size-7 items-center justify-center rounded-lg transition-colors duration-200 hover:bg-surface-hover"
+            tabIndex={tabIndex}
+            onFocus={onFocus}
+            onBlur={onBlur}
+            onClick={() => setOpen(!open)}
+            onKeyDown={handleKeyDown}
+          >
+            <TrashIcon className="size-4" />
+          </TooltipAnchor>
+        </OGDialogTrigger>
+        <OGDialogTemplate
+          showCloseButton={false}
+          title={localize('com_ui_bookmarks_delete')}
+          className="max-w-[450px]"
+          main={
+            <Label className="text-left text-sm font-medium">
+              {localize('com_ui_bookmark_delete_confirm')} {bookmark}
+            </Label>
+          }
+          selection={{
+            selectHandler: confirmDelete,
+            selectClasses:
+              'bg-red-700 dark:bg-red-600 hover:bg-red-800 dark:hover:bg-red-800 text-white',
+            selectText: localize('com_ui_delete'),
+          }}
+        />
+      </OGDialog>
+    </>
   );
 };
 
diff --git a/client/src/components/Bookmarks/EditBookmarkButton.tsx b/client/src/components/Bookmarks/EditBookmarkButton.tsx
index 78a3a96a76f..adbf32d633a 100644
--- a/client/src/components/Bookmarks/EditBookmarkButton.tsx
+++ b/client/src/components/Bookmarks/EditBookmarkButton.tsx
@@ -2,9 +2,9 @@ import { useState } from 'react';
 import type { FC } from 'react';
 import type { TConversationTag } from 'librechat-data-provider';
 import BookmarkEditDialog from './BookmarkEditDialog';
+import { TooltipAnchor } from '~/components/ui';
 import { EditIcon } from '~/components/svg';
 import { useLocalize } from '~/hooks';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '~/components/ui';
 
 const EditBookmarkButton: FC<{
   bookmark: TConversationTag;
@@ -15,6 +15,12 @@ const EditBookmarkButton: FC<{
   const localize = useLocalize();
   const [open, setOpen] = useState(false);
 
+  const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
+    if (event.key === 'Enter') {
+      setOpen(!open);
+    }
+  };
+
   return (
     <>
       <BookmarkEditDialog
@@ -23,25 +29,17 @@ const EditBookmarkButton: FC<{
         open={open}
         setOpen={setOpen}
       />
-      <button
-        type="button"
-        className="transition-colors flex size-7 items-center justify-center rounded-lg duration-200 hover:bg-surface-hover"
+      <TooltipAnchor
+        description={localize('com_ui_edit')}
         tabIndex={tabIndex}
         onFocus={onFocus}
         onBlur={onBlur}
         onClick={() => setOpen(!open)}
+        className="flex size-7 items-center justify-center rounded-lg transition-colors duration-200 hover:bg-surface-hover"
+        onKeyDown={handleKeyDown}
       >
-        <TooltipProvider delayDuration={250}>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <EditIcon />
-            </TooltipTrigger>
-            <TooltipContent side="top" sideOffset={0}>
-              {localize('com_ui_edit')}
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
-      </button>
+        <EditIcon />
+      </TooltipAnchor>
     </>
   );
 };
diff --git a/client/src/components/Chat/AddMultiConvo.tsx b/client/src/components/Chat/AddMultiConvo.tsx
index 34b11e4074d..8ee85ebb3ab 100644
--- a/client/src/components/Chat/AddMultiConvo.tsx
+++ b/client/src/components/Chat/AddMultiConvo.tsx
@@ -2,13 +2,15 @@ import { PlusCircle } from 'lucide-react';
 import { isAssistantsEndpoint } from 'librechat-data-provider';
 import type { TConversation } from 'librechat-data-provider';
 import { useChatContext, useAddedChatContext } from '~/Providers';
+import { TooltipAnchor } from '~/components';
 import { mainTextareaId } from '~/common';
-import { Button } from '~/components/ui';
+import { useLocalize } from '~/hooks';
 import { cn } from '~/utils';
 
-function AddMultiConvo({ className = '' }: { className?: string }) {
+function AddMultiConvo() {
   const { conversation } = useChatContext();
   const { setConversation: setAddedConvo } = useAddedChatContext();
+  const localize = useLocalize();
 
   const clickHandler = () => {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -33,15 +35,18 @@ function AddMultiConvo({ className = '' }: { className?: string }) {
   }
 
   return (
-    <Button
+    <TooltipAnchor
       id="add-multi-conversation-button"
-      aria-label="Add multi-conversation"
+      aria-label={localize('com_ui_add_multi_conversation')}
+      description={localize('com_ui_add_multi_conversation')}
+      tabIndex={0}
+      role="button"
       onClick={clickHandler}
-      variant="outline"
-      className={cn('h-10 w-10 p-0 transition-all duration-300 ease-in-out', className)}
+      data-testid="parameters-button"
+      className="inline-flex size-10 items-center justify-center rounded-lg border border-border-light bg-transparent text-text-primary transition-all ease-in-out hover:bg-surface-tertiary disabled:pointer-events-none disabled:opacity-50 radix-state-open:bg-surface-tertiary"
     >
-      <PlusCircle size={16} />
-    </Button>
+      <PlusCircle size={16} aria-label="Plus Icon" />
+    </TooltipAnchor>
   );
 }
 
diff --git a/client/src/components/Chat/Footer.tsx b/client/src/components/Chat/Footer.tsx
index d4b04698e24..b534aee0188 100644
--- a/client/src/components/Chat/Footer.tsx
+++ b/client/src/components/Chat/Footer.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import ReactMarkdown from 'react-markdown';
 import TagManager from 'react-gtm-module';
 import { Constants } from 'librechat-data-provider';
@@ -34,13 +34,6 @@ export default function Footer({ className }: { className?: string }) {
     </a>
   );
 
-  if (config?.analyticsGtmId != null) {
-    const tagManagerArgs = {
-      gtmId: config.analyticsGtmId,
-    };
-    TagManager.initialize(tagManagerArgs);
-  }
-
   const mainContentParts = (
     typeof config?.customFooter === 'string'
       ? config.customFooter
@@ -50,6 +43,15 @@ export default function Footer({ className }: { className?: string }) {
         localize('com_ui_latest_footer')
   ).split('|');
 
+  useEffect(() => {
+    if (config?.analyticsGtmId != null && typeof window.google_tag_manager === 'undefined') {
+      const tagManagerArgs = {
+        gtmId: config.analyticsGtmId,
+      };
+      TagManager.initialize(tagManagerArgs);
+    }
+  }, [config?.analyticsGtmId]);
+
   const mainContentRender = mainContentParts.map((text, index) => (
     <React.Fragment key={`main-content-part-${index}`}>
       <ReactMarkdown
diff --git a/client/src/components/Chat/Header.tsx b/client/src/components/Chat/Header.tsx
index 759fa57b023..4333dc393e2 100644
--- a/client/src/components/Chat/Header.tsx
+++ b/client/src/components/Chat/Header.tsx
@@ -26,6 +26,11 @@ export default function Header() {
     permission: Permissions.USE,
   });
 
+  const hasAccessToMultiConvo = useHasAccess({
+    permissionType: PermissionTypes.MULTI_CONVO,
+    permission: Permissions.USE,
+  });
+
   const isSmallScreen = useMediaQuery('(max-width: 768px)');
 
   return (
@@ -38,7 +43,7 @@ export default function Header() {
           {<HeaderOptions interfaceConfig={interfaceConfig} />}
           {interfaceConfig.presets === true && <PresetsMenu />}
           {hasAccessToBookmarks === true && <BookmarkMenu />}
-          <AddMultiConvo />
+          {hasAccessToMultiConvo === true && <AddMultiConvo />}
           {isSmallScreen && (
             <ExportAndShareMenu
               isSharedButtonEnabled={startupConfig?.sharedLinksEnabled ?? false}
diff --git a/client/src/components/Chat/Input/AudioRecorder.tsx b/client/src/components/Chat/Input/AudioRecorder.tsx
index eb0c9093edb..1c950b5180e 100644
--- a/client/src/components/Chat/Input/AudioRecorder.tsx
+++ b/client/src/components/Chat/Input/AudioRecorder.tsx
@@ -1,8 +1,8 @@
 import { useEffect } from 'react';
-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from '~/components/ui';
 import { ListeningIcon, Spinner } from '~/components/svg';
 import { useLocalize, useSpeechToText } from '~/hooks';
 import { useChatFormContext } from '~/Providers';
+import { TooltipAnchor } from '~/components/ui';
 import { globalAudioId } from '~/common';
 import { cn } from '~/utils';
 
@@ -74,29 +74,20 @@ export default function AudioRecorder({
   };
 
   return (
-    <TooltipProvider delayDuration={250}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <button
-            id="audio-recorder"
-            aria-label={localize('com_ui_use_micrphone')}
-            onClick={isListening ? handleStopRecording : handleStartRecording}
-            disabled={disabled}
-            className={cn(
-              'absolute flex h-[30px] w-[30px] items-center justify-center rounded-lg p-0.5 transition-colors hover:bg-gray-200 dark:hover:bg-gray-700',
-              isRTL
-                ? 'bottom-1.5 left-4 md:bottom-3 md:left-12'
-                : 'bottom-1.5 right-12 md:bottom-3 md:right-12',
-            )}
-            type="button"
-          >
-            {renderIcon()}
-          </button>
-        </TooltipTrigger>
-        <TooltipContent side="top" sideOffset={10}>
-          {localize('com_ui_use_micrphone')}
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
+    <TooltipAnchor
+      id="audio-recorder"
+      aria-label={localize('com_ui_use_micrphone')}
+      onClick={isListening ? handleStopRecording : handleStartRecording}
+      disabled={disabled}
+      className={cn(
+        'absolute flex h-[30px] w-[30px] items-center justify-center rounded-lg p-0.5 transition-colors hover:bg-gray-200 dark:hover:bg-gray-700',
+        isRTL
+          ? 'bottom-1.5 left-4 md:bottom-3 md:left-12'
+          : 'bottom-1.5 right-12 md:bottom-3 md:right-12',
+      )}
+      description={localize('com_ui_use_micrphone')}
+    >
+      {renderIcon()}
+    </TooltipAnchor>
   );
 }
diff --git a/client/src/components/Chat/Input/ChatForm.tsx b/client/src/components/Chat/Input/ChatForm.tsx
index 719d9681f36..412983c0100 100644
--- a/client/src/components/Chat/Input/ChatForm.tsx
+++ b/client/src/components/Chat/Input/ChatForm.tsx
@@ -1,4 +1,4 @@
-import { memo, useRef, useMemo } from 'react';
+import { memo, useRef, useMemo, useEffect } from 'react';
 import { useRecoilState, useRecoilValue } from 'recoil';
 import {
   supportsFiles,
@@ -44,6 +44,7 @@ const ChatForm = ({ index = 0 }) => {
   const TextToSpeech = useRecoilValue(store.textToSpeech);
   const automaticPlayback = useRecoilValue(store.automaticPlayback);
 
+  const isSearching = useRecoilValue(store.isSearching);
   const [showStopButton, setShowStopButton] = useRecoilState(store.showStopButtonByIndex(index));
   const [showPlusPopover, setShowPlusPopover] = useRecoilState(store.showPlusPopoverFamily(index));
   const [showMentionPopover, setShowMentionPopover] = useRecoilState(
@@ -123,6 +124,12 @@ const ChatForm = ({ index = 0 }) => {
     },
   });
 
+  useEffect(() => {
+    if (!isSearching && textAreaRef.current && !disableInputs) {
+      textAreaRef.current.focus();
+    }
+  }, [isSearching, disableInputs]);
+
   return (
     <form
       onSubmit={methods.handleSubmit((data) => submitMessage(data))}
@@ -164,9 +171,6 @@ const ChatForm = ({ index = 0 }) => {
             {endpoint && (
               <TextareaAutosize
                 {...registerProps}
-                // TODO: remove autofocus due to a11y issues
-                // eslint-disable-next-line jsx-a11y/no-autofocus
-                autoFocus
                 ref={(e) => {
                   ref(e);
                   textAreaRef.current = e;
diff --git a/client/src/components/Chat/Input/Files/AttachFile.tsx b/client/src/components/Chat/Input/Files/AttachFile.tsx
index d422e30d46d..a39bf254331 100644
--- a/client/src/components/Chat/Input/Files/AttachFile.tsx
+++ b/client/src/components/Chat/Input/Files/AttachFile.tsx
@@ -5,10 +5,10 @@ import {
   fileConfig as defaultFileConfig,
   mergeFileConfig,
 } from 'librechat-data-provider';
+import { FileUpload, TooltipAnchor } from '~/components/ui';
+import { useFileHandling, useLocalize } from '~/hooks';
 import { useGetFileConfig } from '~/data-provider';
 import { AttachmentIcon } from '~/components/svg';
-import { FileUpload } from '~/components/ui';
-import { useFileHandling } from '~/hooks';
 import { cn } from '~/utils';
 
 const AttachFile = ({
@@ -22,6 +22,7 @@ const AttachFile = ({
   isRTL: boolean;
   disabled?: boolean | null;
 }) => {
+  const localize = useLocalize();
   const { handleFileChange } = useFileHandling();
   const { data: fileConfig = defaultFileConfig } = useGetFileConfig({
     select: (data) => mergeFileConfig(data),
@@ -42,17 +43,18 @@ const AttachFile = ({
       )}
     >
       <FileUpload handleFileChange={handleFileChange} className="flex">
-        <button
+        <TooltipAnchor
+          id="audio-recorder"
+          aria-label={localize('com_sidepanel_attach_files')}
           disabled={!!disabled}
-          type="button"
           className="btn relative text-black focus:outline-none focus:ring-2 focus:ring-border-xheavy focus:ring-opacity-50 dark:text-white"
-          aria-label="Attach files"
           style={{ padding: 0 }}
+          description={localize('com_sidepanel_attach_files')}
         >
           <div className="flex w-full items-center justify-center gap-2">
             <AttachmentIcon />
           </div>
-        </button>
+        </TooltipAnchor>
       </FileUpload>
     </div>
   );
diff --git a/client/src/components/Chat/Input/Files/FilesView.tsx b/client/src/components/Chat/Input/Files/FilesView.tsx
index 8791e6c9155..fbe6ea862ce 100644
--- a/client/src/components/Chat/Input/Files/FilesView.tsx
+++ b/client/src/components/Chat/Input/Files/FilesView.tsx
@@ -1,10 +1,9 @@
 import { FileSources, FileContext } from 'librechat-data-provider';
 import type { TFile } from 'librechat-data-provider';
-import { Dialog, DialogContent, DialogHeader, DialogTitle } from '~/components/ui';
+import { OGDialog, OGDialogContent, OGDialogHeader, OGDialogTitle } from '~/components';
 import { useGetFiles } from '~/data-provider';
 import { DataTable, columns } from './Table';
 import { useLocalize } from '~/hooks';
-import { cn } from '~/utils/';
 
 export default function Files({ open, onOpenChange }) {
   const localize = useLocalize();
@@ -19,20 +18,16 @@ export default function Files({ open, onOpenChange }) {
   });
 
   return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent
-        className={cn('w-11/12 overflow-x-auto shadow-2xl dark:bg-gray-700 dark:text-white')}
+    <OGDialog open={open} onOpenChange={onOpenChange}>
+      <OGDialogContent
+        title={localize('com_nav_my_files')}
+        className="w-11/12 overflow-x-auto bg-background text-text-primary shadow-2xl"
       >
-        <DialogHeader>
-          <DialogTitle className="text-lg font-medium leading-6 text-gray-900 dark:text-gray-200">
-            {localize('com_nav_my_files')}
-          </DialogTitle>
-        </DialogHeader>
-        <div className="overflow-x-auto p-0 sm:p-6 sm:pt-4">
-          <DataTable columns={columns} data={files} />
-          <div className="mt-5 sm:mt-4" />
-        </div>
-      </DialogContent>
-    </Dialog>
+        <OGDialogHeader>
+          <OGDialogTitle>{localize('com_nav_my_files')}</OGDialogTitle>
+        </OGDialogHeader>
+        <DataTable columns={columns} data={files} />
+      </OGDialogContent>
+    </OGDialog>
   );
 }
diff --git a/client/src/components/Chat/Input/HeaderOptions.tsx b/client/src/components/Chat/Input/HeaderOptions.tsx
index ae28ae1623b..1696dd63e37 100644
--- a/client/src/components/Chat/Input/HeaderOptions.tsx
+++ b/client/src/components/Chat/Input/HeaderOptions.tsx
@@ -2,17 +2,15 @@ import { useRecoilState } from 'recoil';
 import { Settings2 } from 'lucide-react';
 import { Root, Anchor } from '@radix-ui/react-popover';
 import { useState, useEffect, useMemo } from 'react';
-import { tPresetUpdateSchema, EModelEndpoint } from 'librechat-data-provider';
+import { tPresetUpdateSchema, EModelEndpoint, isParamEndpoint } from 'librechat-data-provider';
 import type { TPreset, TInterfaceConfig } from 'librechat-data-provider';
 import { EndpointSettings, SaveAsPresetDialog, AlternativeSettings } from '~/components/Endpoints';
+import { PluginStoreDialog, TooltipAnchor } from '~/components';
 import { ModelSelect } from '~/components/Input/ModelSelect';
-import { PluginStoreDialog } from '~/components';
+import { useSetIndexOptions, useLocalize } from '~/hooks';
 import OptionsPopover from './OptionsPopover';
 import PopoverButtons from './PopoverButtons';
-import { useSetIndexOptions } from '~/hooks';
 import { useChatContext } from '~/Providers';
-import { Button } from '~/components/ui';
-import { cn, cardStyle } from '~/utils/';
 import store from '~/store';
 
 export default function HeaderOptions({
@@ -24,15 +22,16 @@ export default function HeaderOptions({
   const [showPluginStoreDialog, setShowPluginStoreDialog] = useRecoilState(
     store.showPluginStoreDialog,
   );
+  const localize = useLocalize();
 
   const { showPopover, conversation, latestMessage, setShowPopover, setShowBingToneSetting } =
     useChatContext();
   const { setOption } = useSetIndexOptions();
 
-  const { endpoint, conversationId, jailbreak } = conversation ?? {};
+  const { endpoint, endpointType, conversationId, jailbreak = false } = conversation ?? {};
 
   const altConditions: { [key: string]: boolean } = {
-    bingAI: !!(latestMessage && conversation?.jailbreak && endpoint === 'bingAI'),
+    bingAI: !!(latestMessage && jailbreak && endpoint === 'bingAI'),
   };
 
   const altSettings: { [key: string]: () => void } = {
@@ -65,6 +64,8 @@ export default function HeaderOptions({
   const triggerAdvancedMode = altConditions[endpoint]
     ? altSettings[endpoint]
     : () => setShowPopover((prev) => !prev);
+
+  const paramEndpoint = isParamEndpoint(endpoint, endpointType);
   return (
     <Root
       open={showPopover}
@@ -74,7 +75,7 @@ export default function HeaderOptions({
         <div className="my-auto lg:max-w-2xl xl:max-w-3xl">
           <span className="flex w-full flex-col items-center justify-center gap-0 md:order-none md:m-auto md:gap-2">
             <div className="z-[61] flex w-full items-center justify-center gap-2">
-              {interfaceConfig?.modelSelect && (
+              {interfaceConfig?.modelSelect === true && (
                 <ModelSelect
                   conversation={conversation}
                   setOption={setOption}
@@ -82,25 +83,28 @@ export default function HeaderOptions({
                   popover={true}
                 />
               )}
-              {!noSettings[endpoint] && interfaceConfig?.parameters && (
-                <Button
-                  aria-label="Settings/parameters"
+              {!noSettings[endpoint] &&
+                interfaceConfig?.parameters === true &&
+                paramEndpoint === false && (
+                <TooltipAnchor
                   id="parameters-button"
-                  data-testid="parameters-button"
-                  type="button"
-                  variant="outline"
+                  aria-label={localize('com_ui_model_parameters')}
+                  description={localize('com_ui_model_parameters')}
+                  tabIndex={0}
+                  role="button"
                   onClick={triggerAdvancedMode}
-                  className="flex h-[40px] min-w-4 px-3 radix-state-open:bg-surface-hover"
+                  data-testid="parameters-button"
+                  className="inline-flex size-10 items-center justify-center rounded-lg border border-border-light bg-transparent text-text-primary transition-all ease-in-out hover:bg-surface-tertiary disabled:pointer-events-none disabled:opacity-50 radix-state-open:bg-surface-tertiary"
                 >
-                  <Settings2 className="w-4 text-gray-600 dark:text-white" />
-                </Button>
+                  <Settings2 size={16} aria-label="Settings/Parameters Icon" />
+                </TooltipAnchor>
               )}
             </div>
-            {interfaceConfig?.parameters && (
+            {interfaceConfig?.parameters === true && paramEndpoint === false && (
               <OptionsPopover
                 visible={showPopover}
                 saveAsPreset={saveAsPreset}
-                presetsDisabled={!interfaceConfig.presets}
+                presetsDisabled={!(interfaceConfig.presets ?? false)}
                 PopoverButtons={<PopoverButtons />}
                 closePopover={() => setShowPopover(false)}
               >
@@ -114,7 +118,7 @@ export default function HeaderOptions({
                 </div>
               </OptionsPopover>
             )}
-            {interfaceConfig?.presets && (
+            {interfaceConfig?.presets === true && (
               <SaveAsPresetDialog
                 open={saveAsDialogShow}
                 onOpenChange={setSaveAsDialogShow}
@@ -125,7 +129,7 @@ export default function HeaderOptions({
                 }
               />
             )}
-            {interfaceConfig?.parameters && (
+            {interfaceConfig?.parameters === true && (
               <PluginStoreDialog
                 isOpen={showPluginStoreDialog}
                 setIsOpen={setShowPluginStoreDialog}
diff --git a/client/src/components/Chat/Input/SendButton.tsx b/client/src/components/Chat/Input/SendButton.tsx
index 1da7b591a57..4b80f367ee1 100644
--- a/client/src/components/Chat/Input/SendButton.tsx
+++ b/client/src/components/Chat/Input/SendButton.tsx
@@ -1,7 +1,7 @@
 import React, { forwardRef } from 'react';
 import { useWatch } from 'react-hook-form';
 import type { Control } from 'react-hook-form';
-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from '~/components/ui';
+import { TooltipAnchor } from '~/components/ui';
 import { SendIcon } from '~/components/svg';
 import { useLocalize } from '~/hooks';
 import { cn } from '~/utils';
@@ -17,33 +17,29 @@ const SubmitButton = React.memo(
     (props: { disabled: boolean; isRTL: boolean }, ref: React.ForwardedRef<HTMLButtonElement>) => {
       const localize = useLocalize();
       return (
-        <TooltipProvider delayDuration={250}>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <button
-                ref={ref}
-                aria-label={localize('com_nav_send_message')}
-                id="send-button"
-                disabled={props.disabled}
-                className={cn(
-                  'absolute rounded-lg border border-black p-0.5 text-white outline-offset-4 transition-colors enabled:bg-black disabled:bg-black disabled:text-gray-400 disabled:opacity-10 dark:border-white dark:bg-white dark:disabled:bg-white',
-                  props.isRTL
-                    ? 'bottom-1.5 left-2 md:bottom-3 md:left-3'
-                    : 'bottom-1.5 right-2 md:bottom-3 md:right-3',
-                )}
-                data-testid="send-button"
-                type="submit"
-              >
-                <span className="" data-state="closed">
-                  <SendIcon size={24} />
-                </span>
-              </button>
-            </TooltipTrigger>
-            <TooltipContent side="top" sideOffset={10}>
-              {localize('com_nav_send_message')}
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
+        <TooltipAnchor
+          description={localize('com_nav_send_message')}
+          render={
+            <button
+              ref={ref}
+              aria-label={localize('com_nav_send_message')}
+              id="send-button"
+              disabled={props.disabled}
+              className={cn(
+                'absolute rounded-lg border border-black p-0.5 text-white outline-offset-4 transition-colors enabled:bg-black disabled:cursor-not-allowed disabled:bg-black disabled:text-gray-400 disabled:opacity-10 dark:border-white dark:bg-white dark:disabled:bg-white',
+                props.isRTL
+                  ? 'bottom-1.5 left-2 md:bottom-3 md:left-3'
+                  : 'bottom-1.5 right-2 md:bottom-3 md:right-3',
+              )}
+              data-testid="send-button"
+              type="submit"
+            >
+              <span className="" data-state="closed">
+                <SendIcon size={24} />
+              </span>
+            </button>
+          }
+        ></TooltipAnchor>
       );
     },
   ),
diff --git a/client/src/components/Chat/Landing.tsx b/client/src/components/Chat/Landing.tsx
index 4b6fe03bf5a..06939370905 100644
--- a/client/src/components/Chat/Landing.tsx
+++ b/client/src/components/Chat/Landing.tsx
@@ -2,11 +2,11 @@ import { useMemo } from 'react';
 import { EModelEndpoint, isAssistantsEndpoint, Constants } from 'librechat-data-provider';
 import { useGetEndpointsQuery, useGetStartupConfig } from 'librechat-data-provider/react-query';
 import type { ReactNode } from 'react';
-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from '~/components/ui';
 import { useChatContext, useAssistantsMapContext } from '~/Providers';
 import { useGetAssistantDocsQuery } from '~/data-provider';
 import ConvoIcon from '~/components/Endpoints/ConvoIcon';
 import { useLocalize, useSubmitMessage } from '~/hooks';
+import { TooltipAnchor } from '~/components/ui';
 import { BirthdayIcon } from '~/components/svg';
 import { getIconEndpoint, cn } from '~/utils';
 import ConvoStarter from './ConvoStarter';
@@ -58,66 +58,58 @@ export default function Landing({ Header }: { Header?: ReactNode }) {
   const sendConversationStarter = (text: string) => submitMessage({ text });
 
   return (
-    <TooltipProvider delayDuration={50}>
-      <Tooltip>
-        <div className="relative h-full">
-          <div className="absolute left-0 right-0">{Header != null ? Header : null}</div>
-          <div className="flex h-full flex-col items-center justify-center">
-            <div className={cn('relative h-12 w-12', assistantName && avatar ? 'mb-0' : 'mb-3')}>
-              <ConvoIcon
-                conversation={conversation}
-                assistantMap={assistantMap}
-                endpointsConfig={endpointsConfig}
-                containerClassName={containerClassName}
-                context="landing"
-                className="h-2/3 w-2/3"
-                size={41}
-              />
-              {startupConfig?.showBirthdayIcon === true ? (
-                <div>
-                  <TooltipTrigger>
-                    <BirthdayIcon className="absolute bottom-8 right-2.5" />
-                  </TooltipTrigger>
-                  <TooltipContent side="top" sideOffset={110} className="">
-                    {localize('com_ui_happy_birthday')}
-                  </TooltipContent>
-                </div>
-              ) : null}
-            </div>
-            {assistantName ? (
-              <div className="flex flex-col items-center gap-0 p-2">
-                <div className="text-center text-2xl font-medium dark:text-white">
-                  {assistantName}
-                </div>
-                <div className="max-w-md text-center text-sm font-normal text-text-primary ">
-                  {assistantDesc ? assistantDesc : localize('com_nav_welcome_message')}
-                </div>
-                {/* <div className="mt-1 flex items-center gap-1 text-token-text-tertiary">
-              <div className="text-sm text-token-text-tertiary">By Daniel Avila</div>
-            </div> */}
-              </div>
-            ) : (
-              <h2 className="mb-5 max-w-[75vh] px-12 text-center text-lg font-medium dark:text-white md:px-0 md:text-2xl">
-                {isAssistant
-                  ? conversation?.greeting ?? localize('com_nav_welcome_assistant')
-                  : conversation?.greeting ?? localize('com_nav_welcome_message')}
-              </h2>
-            )}
-            <div className="mt-8 flex flex-wrap justify-center gap-3 px-4">
-              {conversation_starters.length > 0 &&
-                conversation_starters
-                  .slice(0, Constants.MAX_CONVO_STARTERS)
-                  .map((text, index) => (
-                    <ConvoStarter
-                      key={index}
-                      text={text}
-                      onClick={() => sendConversationStarter(text)}
-                    />
-                  ))}
+    <div className="relative h-full">
+      <div className="absolute left-0 right-0">{Header != null ? Header : null}</div>
+      <div className="flex h-full flex-col items-center justify-center">
+        <div className={cn('relative h-12 w-12', assistantName && avatar ? 'mb-0' : 'mb-3')}>
+          <ConvoIcon
+            conversation={conversation}
+            assistantMap={assistantMap}
+            endpointsConfig={endpointsConfig}
+            containerClassName={containerClassName}
+            context="landing"
+            className="h-2/3 w-2/3"
+            size={41}
+          />
+          {startupConfig?.showBirthdayIcon === true ? (
+            <TooltipAnchor
+              className="absolute bottom-8 right-2.5"
+              description={localize('com_ui_happy_birthday')}
+            >
+              <BirthdayIcon />
+            </TooltipAnchor>
+          ) : null}
+        </div>
+        {assistantName ? (
+          <div className="flex flex-col items-center gap-0 p-2">
+            <div className="text-center text-2xl font-medium dark:text-white">{assistantName}</div>
+            <div className="max-w-md text-center text-sm font-normal text-text-primary ">
+              {assistantDesc ? assistantDesc : localize('com_nav_welcome_message')}
             </div>
+            {/* <div className="mt-1 flex items-center gap-1 text-token-text-tertiary">
+            <div className="text-sm text-token-text-tertiary">By Daniel Avila</div>
+          </div> */}
           </div>
+        ) : (
+          <h2 className="mb-5 max-w-[75vh] px-12 text-center text-lg font-medium dark:text-white md:px-0 md:text-2xl">
+            {isAssistant
+              ? conversation?.greeting ?? localize('com_nav_welcome_assistant')
+              : conversation?.greeting ?? localize('com_nav_welcome_message')}
+          </h2>
+        )}
+        <div className="mt-8 flex flex-wrap justify-center gap-3 px-4">
+          {conversation_starters.length > 0 &&
+            conversation_starters
+              .slice(0, Constants.MAX_CONVO_STARTERS)
+              .map((text, index) => (
+                <ConvoStarter
+                  key={index}
+                  text={text}
+                  onClick={() => sendConversationStarter(text)}
+                />
+              ))}
         </div>
-      </Tooltip>
-    </TooltipProvider>
+      </div>
+    </div>
   );
 }
diff --git a/client/src/components/Chat/Menus/Endpoints/Icons.tsx b/client/src/components/Chat/Menus/Endpoints/Icons.tsx
index 913fc5b3f80..b7a775b269e 100644
--- a/client/src/components/Chat/Menus/Endpoints/Icons.tsx
+++ b/client/src/components/Chat/Menus/Endpoints/Icons.tsx
@@ -11,6 +11,7 @@ import {
   CustomMinimalIcon,
   AssistantIcon,
   LightningIcon,
+  BedrockIcon,
   Sparkles,
 } from '~/components/svg';
 import UnknownIcon from './UnknownIcon';
@@ -52,6 +53,10 @@ const AgentAvatar = ({ className = '', agentName, avatar, size }: AgentIconMapPr
   return <BrainCircuit className={cn(agentName === '' ? 'icon-2xl' : '', className)} />;
 };
 
+const Bedrock = ({ className = '' }: IconMapProps) => {
+  return <BedrockIcon className={cn(className, 'h-full w-full')} />;
+};
+
 export const icons = {
   [EModelEndpoint.azureOpenAI]: AzureMinimalIcon,
   [EModelEndpoint.openAI]: GPTIcon,
@@ -64,5 +69,6 @@ export const icons = {
   [EModelEndpoint.assistants]: AssistantAvatar,
   [EModelEndpoint.azureAssistants]: AssistantAvatar,
   [EModelEndpoint.agents]: AgentAvatar,
+  [EModelEndpoint.bedrock]: Bedrock,
   unknown: UnknownIcon,
 };
diff --git a/client/src/components/Chat/Menus/HeaderNewChat.tsx b/client/src/components/Chat/Menus/HeaderNewChat.tsx
index 5ccf4f35bc5..5a9fc403a7d 100644
--- a/client/src/components/Chat/Menus/HeaderNewChat.tsx
+++ b/client/src/components/Chat/Menus/HeaderNewChat.tsx
@@ -1,18 +1,20 @@
 import { NewChatIcon } from '~/components/svg';
 import { useChatContext } from '~/Providers';
-import { useMediaQuery } from '~/hooks';
+import { useMediaQuery, useLocalize } from '~/hooks';
 
 export default function HeaderNewChat() {
   const { newConversation } = useChatContext();
   const isSmallScreen = useMediaQuery('(max-width: 768px)');
+  const localize = useLocalize();
   if (isSmallScreen) {
     return null;
   }
   return (
     <button
       data-testid="wide-header-new-chat-button"
+      aria-label={localize("com_ui_new_chat")}
       type="button"
-      className="btn btn-neutral btn-small border-token-border-medium relative ml-2 flex hidden h-9 w-9 items-center justify-center whitespace-nowrap rounded-lg rounded-lg border focus:ring-0 focus:ring-offset-0 md:flex"
+      className="btn btn-neutral btn-small border-token-border-medium relative ml-2 flex hidden h-9 w-9 items-center justify-center whitespace-nowrap rounded-lg rounded-lg border focus:border-black-500 dark:focus:border-white-500 md:flex"
       onClick={() => newConversation()}
     >
       <div className="flex w-full items-center justify-center gap-2">
diff --git a/client/src/components/Chat/Menus/Presets/EditPresetDialog.tsx b/client/src/components/Chat/Menus/Presets/EditPresetDialog.tsx
index 7f480f7d6fd..adf731b6a6c 100644
--- a/client/src/components/Chat/Menus/Presets/EditPresetDialog.tsx
+++ b/client/src/components/Chat/Menus/Presets/EditPresetDialog.tsx
@@ -11,7 +11,7 @@ import {
   mapEndpoints,
   getConvoSwitchLogic,
 } from '~/utils';
-import { Input, Label, Dropdown, Dialog, DialogClose, DialogButton } from '~/components';
+import { Input, Label, SelectDropDown, Dialog, DialogClose, DialogButton } from '~/components';
 import { useSetIndexOptions, useLocalize, useDebouncedInput } from '~/hooks';
 import PopoverButtons from '~/components/Chat/Input/PopoverButtons';
 import DialogTemplate from '~/components/ui/DialogTemplate';
@@ -146,10 +146,13 @@ const EditPresetDialog = ({
                   <Label htmlFor="endpoint" className="mb-1 text-left text-sm font-medium">
                     {localize('com_endpoint')}
                   </Label>
-                  <Dropdown
+                  <SelectDropDown
                     value={endpoint || ''}
-                    onChange={switchEndpoint}
-                    options={availableEndpoints}
+                    setValue={switchEndpoint}
+                    showLabel={false}
+                    emptyTitle={true}
+                    searchPlaceholder={localize('com_endpoint_search')}
+                    availableValues={availableEndpoints}
                   />
                 </div>
               </div>
diff --git a/client/src/components/Chat/Menus/PresetsMenu.tsx b/client/src/components/Chat/Menus/PresetsMenu.tsx
index ff5d7c10328..3032fa813e5 100644
--- a/client/src/components/Chat/Menus/PresetsMenu.tsx
+++ b/client/src/components/Chat/Menus/PresetsMenu.tsx
@@ -4,7 +4,7 @@ import { Content, Portal, Root, Trigger } from '@radix-ui/react-popover';
 import { EditPresetDialog, PresetItems } from './Presets';
 import { useLocalize, usePresets } from '~/hooks';
 import { useChatContext } from '~/Providers';
-import { Button } from '~/components/ui';
+import { TooltipAnchor } from '~/components';
 
 const PresetsMenu: FC = () => {
   const localize = useLocalize();
@@ -25,17 +25,17 @@ const PresetsMenu: FC = () => {
   return (
     <Root>
       <Trigger asChild>
-        <Button
-          type="button"
-          variant="outline"
-          className="flex h-[40px] min-w-4 px-3 radix-state-open:bg-surface-hover"
+        <TooltipAnchor
           id="presets-button"
-          data-testid="presets-button"
-          title={localize('com_endpoint_examples')}
           aria-label={localize('com_endpoint_examples')}
+          description={localize('com_endpoint_examples')}
+          tabIndex={0}
+          role="button"
+          data-testid="presets-button"
+          className="inline-flex size-10 items-center justify-center rounded-lg border border-border-light bg-transparent text-text-primary transition-all ease-in-out hover:bg-surface-tertiary disabled:pointer-events-none disabled:opacity-50 radix-state-open:bg-surface-tertiary"
         >
-          <BookCopy className="icon-sm" id="presets-button" />
-        </Button>
+          <BookCopy size={16} aria-label="Preset Icon" />
+        </TooltipAnchor>
       </Trigger>
       <Portal>
         <div
diff --git a/client/src/components/Chat/Messages/Content/Container.tsx b/client/src/components/Chat/Messages/Content/Container.tsx
index cbd085e3082..ecc40d6cd17 100644
--- a/client/src/components/Chat/Messages/Content/Container.tsx
+++ b/client/src/components/Chat/Messages/Content/Container.tsx
@@ -1,12 +1,12 @@
 import { TMessage } from 'librechat-data-provider';
 import Files from './Files';
 
-const Container = ({ children, message }: { children: React.ReactNode; message: TMessage }) => (
+const Container = ({ children, message }: { children: React.ReactNode; message?: TMessage }) => (
   <div
     className="text-message flex min-h-[20px] flex-col items-start gap-3 overflow-x-auto [.text-message+&]:mt-5"
     dir="auto"
   >
-    {message.isCreatedByUser && <Files message={message} />}
+    {message?.isCreatedByUser === true && <Files message={message} />}
     {children}
   </div>
 );
diff --git a/client/src/components/Chat/Messages/Content/ContentParts.tsx b/client/src/components/Chat/Messages/Content/ContentParts.tsx
index 3227bce0723..b64a289dd2b 100644
--- a/client/src/components/Chat/Messages/Content/ContentParts.tsx
+++ b/client/src/components/Chat/Messages/Content/ContentParts.tsx
@@ -1,51 +1,80 @@
-import { Suspense } from 'react';
+import { memo } from 'react';
+import { ContentTypes } from 'librechat-data-provider';
 import type { TMessageContentParts } from 'librechat-data-provider';
-import { UnfinishedMessage } from './MessageContent';
-import { DelayedRender } from '~/components/ui';
+import EditTextPart from './Parts/EditTextPart';
 import Part from './Part';
 
-const ContentParts = ({
-  error,
-  unfinished,
-  isSubmitting,
-  isLast,
-  content,
-  ...props
-}: // eslint-disable-next-line @typescript-eslint/no-explicit-any
-any) => {
-  if (error) {
-    // return <ErrorMessage text={text} />;
-  } else {
-    const { message } = props;
-    const { messageId } = message;
+type ContentPartsProps = {
+  content: Array<TMessageContentParts | undefined> | undefined;
+  messageId: string;
+  isCreatedByUser: boolean;
+  isLast: boolean;
+  isSubmitting: boolean;
+  edit?: boolean;
+  enterEdit?: (cancel?: boolean) => void | null | undefined;
+  siblingIdx?: number;
+  setSiblingIdx?:
+    | ((value: number) => void | React.Dispatch<React.SetStateAction<number>>)
+    | null
+    | undefined;
+};
+
+const ContentParts = memo(
+  ({
+    content,
+    messageId,
+    isCreatedByUser,
+    isLast,
+    isSubmitting,
+    edit,
+    enterEdit,
+    siblingIdx,
+    setSiblingIdx,
+  }: ContentPartsProps) => {
+    if (!content) {
+      return null;
+    }
+    if (edit === true && enterEdit && setSiblingIdx) {
+      return (
+        <>
+          {content.map((part, idx) => {
+            if (part?.type !== ContentTypes.TEXT || typeof part.text !== 'string') {
+              return null;
+            }
 
-    return (
-      <>
-        {content
-          .filter((part: TMessageContentParts | undefined) => part)
-          .map((part: TMessageContentParts | undefined, idx: number) => {
-            const showCursor = idx === content.length - 1 && isLast;
             return (
-              <Part
-                key={`display-${messageId}-${idx}`}
-                showCursor={showCursor === true && isSubmitting}
+              <EditTextPart
+                index={idx}
+                text={part.text}
+                messageId={messageId}
                 isSubmitting={isSubmitting}
-                part={part}
-                {...props}
+                enterEdit={enterEdit}
+                siblingIdx={siblingIdx ?? null}
+                setSiblingIdx={setSiblingIdx}
+                key={`edit-${messageId}-${idx}`}
               />
             );
           })}
-        {/* Temporarily remove this */}
-        {/* {!isSubmitting && unfinished && (
-          <Suspense>
-            <DelayedRender delay={250}>
-              <UnfinishedMessage message={message} key={`unfinished-${messageId}`} />
-            </DelayedRender>
-          </Suspense>
-        )} */}
+        </>
+      );
+    }
+    return (
+      <>
+        {content
+          .filter((part) => part)
+          .map((part, idx) => (
+            <Part
+              key={`display-${messageId}-${idx}`}
+              part={part}
+              isSubmitting={isSubmitting}
+              showCursor={idx === content.length - 1 && isLast}
+              messageId={messageId}
+              isCreatedByUser={isCreatedByUser}
+            />
+          ))}
       </>
     );
-  }
-};
+  },
+);
 
 export default ContentParts;
diff --git a/client/src/components/Chat/Messages/Content/EditMessage.tsx b/client/src/components/Chat/Messages/Content/EditMessage.tsx
index 8d7c9ffee18..ae9018d70eb 100644
--- a/client/src/components/Chat/Messages/Content/EditMessage.tsx
+++ b/client/src/components/Chat/Messages/Content/EditMessage.tsx
@@ -1,10 +1,11 @@
-import { useRecoilState } from 'recoil';
-import TextareaAutosize from 'react-textarea-autosize';
+import { useRecoilState, useRecoilValue } from 'recoil';
 import { EModelEndpoint } from 'librechat-data-provider';
-import { useState, useRef, useEffect, useCallback } from 'react';
+import { useRef, useEffect, useCallback } from 'react';
+import { useForm } from 'react-hook-form';
 import { useUpdateMessageMutation } from 'librechat-data-provider/react-query';
 import type { TEditProps } from '~/common';
 import { useChatContext, useAddedChatContext } from '~/Providers';
+import { TextareaAutosize } from '~/components/ui';
 import { cn, removeFocusRings } from '~/utils';
 import { useLocalize } from '~/hooks';
 import Container from './Container';
@@ -25,7 +26,6 @@ const EditMessage = ({
     store.latestMessageFamily(addedIndex),
   );
 
-  const [editedText, setEditedText] = useState<string>(text ?? '');
   const textAreaRef = useRef<HTMLTextAreaElement | null>(null);
 
   const { conversationId, parentMessageId, messageId } = message;
@@ -34,6 +34,15 @@ const EditMessage = ({
   const updateMessageMutation = useUpdateMessageMutation(conversationId ?? '');
   const localize = useLocalize();
 
+  const chatDirection = useRecoilValue(store.chatDirection).toLowerCase();
+  const isRTL = chatDirection === 'rtl';
+
+  const { register, handleSubmit, setValue } = useForm({
+    defaultValues: {
+      text: text ?? '',
+    },
+  });
+
   useEffect(() => {
     const textArea = textAreaRef.current;
     if (textArea) {
@@ -43,11 +52,11 @@ const EditMessage = ({
     }
   }, []);
 
-  const resubmitMessage = () => {
+  const resubmitMessage = (data: { text: string }) => {
     if (message.isCreatedByUser) {
       ask(
         {
-          text: editedText,
+          text: data.text,
           parentMessageId,
           conversationId,
         },
@@ -67,7 +76,7 @@ const EditMessage = ({
       ask(
         { ...parentMessage },
         {
-          editedText,
+          editedText: data.text,
           editedMessageId: messageId,
           isRegenerate: true,
           isEdited: true,
@@ -80,7 +89,7 @@ const EditMessage = ({
     enterEdit(true);
   };
 
-  const updateMessage = () => {
+  const updateMessage = (data: { text: string }) => {
     const messages = getMessages();
     if (!messages) {
       return;
@@ -88,24 +97,24 @@ const EditMessage = ({
     updateMessageMutation.mutate({
       conversationId: conversationId ?? '',
       model: conversation?.model ?? 'gpt-3.5-turbo',
-      text: editedText,
+      text: data.text,
       messageId,
     });
 
     if (message.messageId === latestMultiMessage?.messageId) {
-      setLatestMultiMessage({ ...latestMultiMessage, text: editedText });
+      setLatestMultiMessage({ ...latestMultiMessage, text: data.text });
     }
 
-    const isInMessages = messages?.some((message) => message?.messageId === messageId);
+    const isInMessages = messages.some((message) => message.messageId === messageId);
     if (!isInMessages) {
-      message.text = editedText;
+      message.text = data.text;
     } else {
       setMessages(
         messages.map((msg) =>
           msg.messageId === messageId
             ? {
               ...msg,
-              text: editedText,
+              text: data.text,
               isEdited: true,
             }
             : msg,
@@ -126,43 +135,33 @@ const EditMessage = ({
     [enterEdit],
   );
 
+  const { ref, ...registerProps } = register('text', {
+    required: true,
+    onChange: (e) => {
+      setValue('text', e.target.value, { shouldValidate: true });
+    },
+  });
+
   return (
     <Container message={message}>
-      <div className="bg-token-main-surface-primary relative flex w-full flex-grow flex-col overflow-hidden rounded-2xl border dark:border-gray-600 dark:text-white [&:has(textarea:focus)]:border-gray-300 [&:has(textarea:focus)]:shadow-[0_2px_6px_rgba(0,0,0,.05)] dark:[&:has(textarea:focus)]:border-gray-500">
+      <div className="bg-token-main-surface-primary relative flex w-full flex-grow flex-col overflow-hidden rounded-2xl border border-border-medium text-text-primary [&:has(textarea:focus)]:border-border-heavy [&:has(textarea:focus)]:shadow-[0_2px_6px_rgba(0,0,0,.05)]">
         <TextareaAutosize
-          ref={textAreaRef}
-          onChange={(e) => {
-            setEditedText(e.target.value);
+          {...registerProps}
+          ref={(e) => {
+            ref(e);
+            textAreaRef.current = e;
           }}
           onKeyDown={handleKeyDown}
           data-testid="message-text-editor"
           className={cn(
-            'markdown prose dark:prose-invert light whitespace-pre-wrap break-words',
-            'pl-3 md:pl-4',
+            'markdown prose dark:prose-invert light whitespace-pre-wrap break-words pl-3 md:pl-4',
             'm-0 w-full resize-none border-0 bg-transparent py-[10px]',
-            'placeholder-black/50 focus:ring-0 focus-visible:ring-0 dark:bg-transparent dark:placeholder-white/50 md:py-3.5  ',
-            'pr-3 md:pr-4',
-            'max-h-[65vh] md:max-h-[75vh]',
+            'placeholder-text-secondary focus:ring-0 focus-visible:ring-0 md:py-3.5',
+            isRTL ? 'text-right' : 'text-left',
+            'max-h-[65vh] pr-3 md:max-h-[75vh] md:pr-4',
             removeFocusRings,
           )}
-          onPaste={(e) => {
-            e.preventDefault();
-
-            const pastedData = e.clipboardData.getData('text/plain');
-            const textArea = textAreaRef.current;
-            if (!textArea) {
-              return;
-            }
-            const start = textArea.selectionStart;
-            const end = textArea.selectionEnd;
-            const newValue =
-              textArea.value.substring(0, start) + pastedData + textArea.value.substring(end);
-            setEditedText(newValue);
-          }}
-          contentEditable={true}
-          value={editedText}
-          suppressContentEditableWarning={true}
-          dir="auto"
+          dir={isRTL ? 'rtl' : 'ltr'}
         />
       </div>
       <div className="mt-2 flex w-full justify-center text-center">
@@ -171,14 +170,14 @@ const EditMessage = ({
           disabled={
             isSubmitting || (endpoint === EModelEndpoint.google && !message.isCreatedByUser)
           }
-          onClick={resubmitMessage}
+          onClick={handleSubmit(resubmitMessage)}
         >
           {localize('com_ui_save_submit')}
         </button>
         <button
           className="btn btn-secondary relative mr-2"
           disabled={isSubmitting}
-          onClick={updateMessage}
+          onClick={handleSubmit(updateMessage)}
         >
           {localize('com_ui_save')}
         </button>
diff --git a/client/src/components/Chat/Messages/Content/Files.tsx b/client/src/components/Chat/Messages/Content/Files.tsx
index beff81b58b7..09801d92c18 100644
--- a/client/src/components/Chat/Messages/Content/Files.tsx
+++ b/client/src/components/Chat/Messages/Content/Files.tsx
@@ -3,7 +3,7 @@ import type { TFile, TMessage } from 'librechat-data-provider';
 import FileContainer from '~/components/Chat/Input/Files/FileContainer';
 import Image from './Image';
 
-const Files = ({ message }: { message: TMessage }) => {
+const Files = ({ message }: { message?: TMessage }) => {
   const imageFiles = useMemo(() => {
     return message?.files?.filter((file) => file.type?.startsWith('image/')) || [];
   }, [message?.files]);
@@ -20,7 +20,7 @@ const Files = ({ message }: { message: TMessage }) => {
         imageFiles.map((file) => (
           <Image
             key={file.file_id}
-            imagePath={file?.preview ?? file.filepath ?? ''}
+            imagePath={file.preview ?? file.filepath ?? ''}
             height={file.height ?? 1920}
             width={file.width ?? 1080}
             altText={file.filename ?? 'Uploaded Image'}
diff --git a/client/src/components/Chat/Messages/Content/MessageContent.tsx b/client/src/components/Chat/Messages/Content/MessageContent.tsx
index f22576d1ebc..d391e4d08d5 100644
--- a/client/src/components/Chat/Messages/Content/MessageContent.tsx
+++ b/client/src/components/Chat/Messages/Content/MessageContent.tsx
@@ -1,21 +1,26 @@
 import { Fragment, Suspense, useMemo } from 'react';
+import { useRecoilValue } from 'recoil';
 import type { TMessage, TResPlugin } from 'librechat-data-provider';
 import type { TMessageContentProps, TDisplayProps } from '~/common';
 import Plugin from '~/components/Messages/Content/Plugin';
 import Error from '~/components/Messages/Content/Error';
 import { DelayedRender } from '~/components/ui';
 import { useChatContext } from '~/Providers';
+import MarkdownLite from './MarkdownLite';
 import EditMessage from './EditMessage';
 import { useLocalize } from '~/hooks';
 import Container from './Container';
 import Markdown from './Markdown';
 import { cn } from '~/utils';
+import store from '~/store';
 
 export const ErrorMessage = ({
   text,
   message,
   className = '',
-}: Pick<TDisplayProps, 'text' | 'className' | 'message'>) => {
+}: Pick<TDisplayProps, 'text' | 'className'> & {
+  message?: TMessage;
+}) => {
   const localize = useLocalize();
   if (text === 'Error connecting to server, try refreshing the page.') {
     console.log('error message', message);
@@ -52,7 +57,7 @@ export const ErrorMessage = ({
     <Container message={message}>
       <div
         className={cn(
-          'rounded-md border border-red-500 bg-red-500/10 px-3 py-2 text-sm text-gray-600 dark:text-gray-200',
+          'rounded-xl border border-red-500/20 bg-red-500/5 px-3 py-2 text-sm text-gray-600 dark:text-gray-200',
           className,
         )}
       >
@@ -62,9 +67,9 @@ export const ErrorMessage = ({
   );
 };
 
-// Display Message Component
 const DisplayMessage = ({ text, isCreatedByUser, message, showCursor }: TDisplayProps) => {
   const { isSubmitting, latestMessage } = useChatContext();
+  const enableUserMsgMarkdown = useRecoilValue(store.enableUserMsgMarkdown);
   const showCursorState = useMemo(
     () => showCursor === true && isSubmitting,
     [showCursor, isSubmitting],
@@ -73,6 +78,18 @@ const DisplayMessage = ({ text, isCreatedByUser, message, showCursor }: TDisplay
     () => message.messageId === latestMessage?.messageId,
     [message.messageId, latestMessage?.messageId],
   );
+
+  let content: React.ReactElement;
+  if (!isCreatedByUser) {
+    content = (
+      <Markdown content={text} showCursor={showCursorState} isLatestMessage={isLatestMessage} />
+    );
+  } else if (enableUserMsgMarkdown) {
+    content = <MarkdownLite content={text} />;
+  } else {
+    content = <>{text}</>;
+  }
+
   return (
     <Container message={message}>
       <div
@@ -83,11 +100,7 @@ const DisplayMessage = ({ text, isCreatedByUser, message, showCursor }: TDisplay
           isCreatedByUser ? 'whitespace-pre-wrap dark:text-gray-20' : 'dark:text-gray-100',
         )}
       >
-        {!isCreatedByUser ? (
-          <Markdown content={text} showCursor={showCursorState} isLatestMessage={isLatestMessage} />
-        ) : (
-          <>{text}</>
-        )}
+        {content}
       </div>
     </Container>
   );
diff --git a/client/src/components/Chat/Messages/Content/Part.tsx b/client/src/components/Chat/Messages/Content/Part.tsx
index 7fcc9dbe4a5..ca0469cbfd7 100644
--- a/client/src/components/Chat/Messages/Content/Part.tsx
+++ b/client/src/components/Chat/Messages/Content/Part.tsx
@@ -4,81 +4,47 @@ import {
   imageGenTools,
   isImageVisionTool,
 } from 'librechat-data-provider';
-import { useMemo } from 'react';
-import type { TMessageContentParts, TMessage } from 'librechat-data-provider';
-import type { TDisplayProps } from '~/common';
+import { memo } from 'react';
+import type { TMessageContentParts } from 'librechat-data-provider';
 import { ErrorMessage } from './MessageContent';
-import { useChatContext } from '~/Providers';
 import RetrievalCall from './RetrievalCall';
 import CodeAnalyze from './CodeAnalyze';
 import Container from './Container';
 import ToolCall from './ToolCall';
-import Markdown from './Markdown';
 import ImageGen from './ImageGen';
-import { cn } from '~/utils';
+import Text from './Parts/Text';
 import Image from './Image';
 
-// Display Message Component
-const DisplayMessage = ({ text, isCreatedByUser = false, message, showCursor }: TDisplayProps) => {
-  const { isSubmitting, latestMessage } = useChatContext();
-  const showCursorState = useMemo(
-    () => showCursor === true && isSubmitting,
-    [showCursor, isSubmitting],
-  );
-  const isLatestMessage = useMemo(
-    () => message.messageId === latestMessage?.messageId,
-    [message.messageId, latestMessage?.messageId],
-  );
-
-  // Note: for testing purposes
-  // isSubmitting && isLatestMessage && logger.log('message_stream', { text, isCreatedByUser, isSubmitting, showCursorState });
-
-  return (
-    <div
-      className={cn(
-        isSubmitting ? 'submitting' : '',
-        showCursorState && !!text.length ? 'result-streaming' : '',
-        'markdown prose message-content dark:prose-invert light w-full break-words',
-        isCreatedByUser ? 'whitespace-pre-wrap dark:text-gray-20' : 'dark:text-gray-70',
-      )}
-    >
-      {!isCreatedByUser ? (
-        <Markdown content={text} showCursor={showCursorState} isLatestMessage={isLatestMessage} />
-      ) : (
-        <>{text}</>
-      )}
-    </div>
-  );
-};
-
-export default function Part({
-  part,
-  showCursor,
-  isSubmitting,
-  message,
-}: {
-  part: TMessageContentParts | undefined;
+type PartProps = {
+  part?: TMessageContentParts;
   isSubmitting: boolean;
   showCursor: boolean;
-  message: TMessage;
-}) {
+  messageId: string;
+  isCreatedByUser: boolean;
+};
+
+const Part = memo(({ part, isSubmitting, showCursor, messageId, isCreatedByUser }: PartProps) => {
   if (!part) {
     return null;
   }
 
   if (part.type === ContentTypes.ERROR) {
-    return <ErrorMessage message={message} text={part[ContentTypes.TEXT].value} className="my-2" />;
+    return <ErrorMessage text={part[ContentTypes.TEXT].value} className="my-2" />;
   } else if (part.type === ContentTypes.TEXT) {
     const text = typeof part.text === 'string' ? part.text : part.text.value;
+
     if (typeof text !== 'string') {
       return null;
     }
+    if (part.tool_call_ids != null && !text) {
+      return null;
+    }
     return (
-      <Container message={message}>
-        <DisplayMessage
+      <Container>
+        <Text
           text={text}
-          isCreatedByUser={message.isCreatedByUser}
-          message={message}
+          isCreatedByUser={isCreatedByUser}
+          messageId={messageId}
           showCursor={showCursor}
         />
       </Container>
@@ -93,7 +59,7 @@ export default function Part({
     if ('args' in toolCall && (!toolCall.type || toolCall.type === ToolCallTypes.TOOL_CALL)) {
       return (
         <ToolCall
-          args={toolCall.args}
+          args={toolCall.args ?? ''}
           name={toolCall.name ?? ''}
           output={toolCall.output ?? ''}
           initialProgress={toolCall.progress ?? 0.1}
@@ -132,11 +98,11 @@ export default function Part({
       if (isImageVisionTool(toolCall)) {
         if (isSubmitting && showCursor) {
           return (
-            <Container message={message}>
-              <DisplayMessage
+            <Container>
+              <Text
                 text={''}
-                isCreatedByUser={message.isCreatedByUser}
-                message={message}
+                isCreatedByUser={isCreatedByUser}
+                messageId={messageId}
                 showCursor={showCursor}
               />
             </Container>
@@ -174,4 +140,6 @@ export default function Part({
   }
 
   return null;
-}
+});
+
+export default Part;
diff --git a/client/src/components/Chat/Messages/Content/Parts/EditTextPart.tsx b/client/src/components/Chat/Messages/Content/Parts/EditTextPart.tsx
new file mode 100644
index 00000000000..d4ce5dff4d6
--- /dev/null
+++ b/client/src/components/Chat/Messages/Content/Parts/EditTextPart.tsx
@@ -0,0 +1,193 @@
+import { useForm } from 'react-hook-form';
+import { ContentTypes } from 'librechat-data-provider';
+import { useRecoilState, useRecoilValue } from 'recoil';
+import { useRef, useEffect, useCallback, useMemo } from 'react';
+import { useUpdateMessageContentMutation } from 'librechat-data-provider/react-query';
+import type { TEditProps } from '~/common';
+import Container from '~/components/Chat/Messages/Content/Container';
+import { useChatContext, useAddedChatContext } from '~/Providers';
+import { TextareaAutosize } from '~/components/ui';
+import { cn, removeFocusRings } from '~/utils';
+import { useLocalize } from '~/hooks';
+import store from '~/store';
+
+const EditTextPart = ({
+  text,
+  index,
+  messageId,
+  isSubmitting,
+  enterEdit,
+}: Omit<TEditProps, 'message' | 'ask'> & {
+  index: number;
+  messageId: string;
+}) => {
+  const localize = useLocalize();
+  const { addedIndex } = useAddedChatContext();
+  const { getMessages, setMessages, conversation } = useChatContext();
+  const [latestMultiMessage, setLatestMultiMessage] = useRecoilState(
+    store.latestMessageFamily(addedIndex),
+  );
+
+  const { conversationId = '' } = conversation ?? {};
+  const message = useMemo(
+    () => getMessages()?.find((msg) => msg.messageId === messageId),
+    [getMessages, messageId],
+  );
+
+  const textAreaRef = useRef<HTMLTextAreaElement | null>(null);
+  const updateMessageContentMutation = useUpdateMessageContentMutation(conversationId ?? '');
+
+  const chatDirection = useRecoilValue(store.chatDirection).toLowerCase();
+  const isRTL = chatDirection === 'rtl';
+
+  const { register, handleSubmit, setValue } = useForm({
+    defaultValues: {
+      text: text ?? '',
+    },
+  });
+
+  useEffect(() => {
+    const textArea = textAreaRef.current;
+    if (textArea) {
+      const length = textArea.value.length;
+      textArea.focus();
+      textArea.setSelectionRange(length, length);
+    }
+  }, []);
+
+  /*
+  const resubmitMessage = () => {
+    showToast({
+      status: 'warning',
+      message: localize('com_warning_resubmit_unsupported'),
+    });
+
+    // const resubmitMessage = (data: { text: string }) => {
+    // Not supported by AWS Bedrock
+    const messages = getMessages();
+    const parentMessage = messages?.find((msg) => msg.messageId === message?.parentMessageId);
+
+    if (!parentMessage) {
+      return;
+    }
+    ask(
+      { ...parentMessage },
+      {
+        editedText: data.text,
+        editedMessageId: messageId,
+        isRegenerate: true,
+        isEdited: true,
+      },
+    );
+
+    setSiblingIdx((siblingIdx ?? 0) - 1);
+    enterEdit(true);
+  };
+  */
+
+  const updateMessage = (data: { text: string }) => {
+    const messages = getMessages();
+    if (!messages) {
+      return;
+    }
+    updateMessageContentMutation.mutate({
+      index,
+      conversationId: conversationId ?? '',
+      text: data.text,
+      messageId,
+    });
+
+    if (messageId === latestMultiMessage?.messageId) {
+      setLatestMultiMessage({ ...latestMultiMessage, text: data.text });
+    }
+
+    const isInMessages = messages.some((msg) => msg.messageId === messageId);
+    if (!isInMessages) {
+      return enterEdit(true);
+    }
+
+    const updatedContent = message?.content?.map((part, idx) => {
+      if (part.type === ContentTypes.TEXT && idx === index) {
+        return { ...part, text: data.text };
+      }
+      return part;
+    });
+
+    setMessages(
+      messages.map((msg) =>
+        msg.messageId === messageId
+          ? {
+            ...msg,
+            content: updatedContent,
+            isEdited: true,
+          }
+          : msg,
+      ),
+    );
+
+    enterEdit(true);
+  };
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+      if (e.key === 'Escape') {
+        e.preventDefault();
+        enterEdit(true);
+      }
+    },
+    [enterEdit],
+  );
+
+  const { ref, ...registerProps } = register('text', {
+    required: true,
+    onChange: (e) => {
+      setValue('text', e.target.value, { shouldValidate: true });
+    },
+  });
+
+  return (
+    <Container message={message}>
+      <div className="bg-token-main-surface-primary relative flex w-full flex-grow flex-col overflow-hidden rounded-2xl border border-border-medium text-text-primary [&:has(textarea:focus)]:border-border-heavy [&:has(textarea:focus)]:shadow-[0_2px_6px_rgba(0,0,0,.05)]">
+        <TextareaAutosize
+          {...registerProps}
+          ref={(e) => {
+            ref(e);
+            textAreaRef.current = e;
+          }}
+          onKeyDown={handleKeyDown}
+          data-testid="message-text-editor"
+          className={cn(
+            'markdown prose dark:prose-invert light whitespace-pre-wrap break-words pl-3 md:pl-4',
+            'm-0 w-full resize-none border-0 bg-transparent py-[10px]',
+            'placeholder-text-secondary focus:ring-0 focus-visible:ring-0 md:py-3.5',
+            isRTL ? 'text-right' : 'text-left',
+            'max-h-[65vh] pr-3 md:max-h-[75vh] md:pr-4',
+            removeFocusRings,
+          )}
+          dir={isRTL ? 'rtl' : 'ltr'}
+        />
+      </div>
+      <div className="mt-2 flex w-full justify-center text-center">
+        {/* <button
+          className="btn btn-primary relative mr-2"
+          disabled={isSubmitting}
+          onClick={handleSubmit(resubmitMessage)}
+        >
+          {localize('com_ui_save_submit')}
+        </button> */}
+        <button
+          className="btn btn-secondary relative mr-2"
+          disabled={isSubmitting}
+          onClick={handleSubmit(updateMessage)}
+        >
+          {localize('com_ui_save')}
+        </button>
+        <button className="btn btn-neutral relative" onClick={() => enterEdit(true)}>
+          {localize('com_ui_cancel')}
+        </button>
+      </div>
+    </Container>
+  );
+};
+
+export default EditTextPart;
diff --git a/client/src/components/Chat/Messages/Content/Parts/Text.tsx b/client/src/components/Chat/Messages/Content/Parts/Text.tsx
new file mode 100644
index 00000000000..59e8b321646
--- /dev/null
+++ b/client/src/components/Chat/Messages/Content/Parts/Text.tsx
@@ -0,0 +1,56 @@
+import { memo, useMemo, ReactElement } from 'react';
+import { useRecoilValue } from 'recoil';
+import MarkdownLite from '~/components/Chat/Messages/Content/MarkdownLite';
+import Markdown from '~/components/Chat/Messages/Content/Markdown';
+import { useChatContext } from '~/Providers';
+import { cn } from '~/utils';
+import store from '~/store';
+
+type TextPartProps = {
+  text: string;
+  isCreatedByUser: boolean;
+  messageId: string;
+  showCursor: boolean;
+};
+
+type ContentType =
+  | ReactElement<React.ComponentProps<typeof Markdown>>
+  | ReactElement<React.ComponentProps<typeof MarkdownLite>>
+  | ReactElement;
+
+const TextPart = memo(({ text, isCreatedByUser, messageId, showCursor }: TextPartProps) => {
+  const { isSubmitting, latestMessage } = useChatContext();
+  const enableUserMsgMarkdown = useRecoilValue(store.enableUserMsgMarkdown);
+  const showCursorState = useMemo(() => showCursor && isSubmitting, [showCursor, isSubmitting]);
+  const isLatestMessage = useMemo(
+    () => messageId === latestMessage?.messageId,
+    [messageId, latestMessage?.messageId],
+  );
+
+  const content: ContentType = useMemo(() => {
+    if (!isCreatedByUser) {
+      return (
+        <Markdown content={text} showCursor={showCursorState} isLatestMessage={isLatestMessage} />
+      );
+    } else if (enableUserMsgMarkdown) {
+      return <MarkdownLite content={text} />;
+    } else {
+      return <>{text}</>;
+    }
+  }, [isCreatedByUser, enableUserMsgMarkdown, text, showCursorState, isLatestMessage]);
+
+  return (
+    <div
+      className={cn(
+        isSubmitting ? 'submitting' : '',
+        showCursorState && !!text.length ? 'result-streaming' : '',
+        'markdown prose message-content dark:prose-invert light w-full break-words',
+        isCreatedByUser ? 'whitespace-pre-wrap dark:text-gray-20' : 'dark:text-gray-70',
+      )}
+    >
+      {content}
+    </div>
+  );
+});
+
+export default TextPart;
diff --git a/client/src/components/Chat/Messages/Content/SearchContent.tsx b/client/src/components/Chat/Messages/Content/SearchContent.tsx
index a76d3fcf591..3f19c3e03cb 100644
--- a/client/src/components/Chat/Messages/Content/SearchContent.tsx
+++ b/client/src/components/Chat/Messages/Content/SearchContent.tsx
@@ -22,12 +22,13 @@ const SearchContent = ({ message }: { message: TMessage }) => {
                 key={`display-${messageId}-${idx}`}
                 showCursor={false}
                 isSubmitting={false}
+                isCreatedByUser={message.isCreatedByUser}
+                messageId={message.messageId}
                 part={part}
-                message={message}
               />
             );
           })}
-        {message.unfinished && (
+        {message.unfinished === true && (
           <Suspense>
             <DelayedRender delay={250}>
               <UnfinishedMessage message={message} key={`unfinished-${messageId}`} />
diff --git a/client/src/components/Chat/Messages/MessageParts.tsx b/client/src/components/Chat/Messages/MessageParts.tsx
index 37794c44f50..52a2dbe2dd4 100644
--- a/client/src/components/Chat/Messages/MessageParts.tsx
+++ b/client/src/components/Chat/Messages/MessageParts.tsx
@@ -1,4 +1,5 @@
 import { useRecoilValue } from 'recoil';
+import type { TMessageContentParts } from 'librechat-data-provider';
 import type { TMessageProps } from '~/common';
 import Icon from '~/components/Chat/Messages/MessageIcon';
 import { useMessageHelpers, useLocalize } from '~/hooks';
@@ -17,7 +18,6 @@ export default function Message(props: TMessageProps) {
     props;
 
   const {
-    ask,
     edit,
     index,
     agent,
@@ -33,7 +33,7 @@ export default function Message(props: TMessageProps) {
     regenerateMessage,
   } = useMessageHelpers(props);
   const fontSize = useRecoilValue(store.fontSize);
-  const { content, children, messageId = null, isCreatedByUser, error, unfinished } = message ?? {};
+  const { children, messageId = null, isCreatedByUser } = message ?? {};
 
   if (!message) {
     return null;
@@ -82,24 +82,11 @@ export default function Message(props: TMessageProps) {
               <div className="flex-col gap-1 md:gap-3">
                 <div className="flex max-w-full flex-grow flex-col gap-0">
                   <ContentParts
-                    ask={ask}
-                    edit={edit}
+                    content={message.content as Array<TMessageContentParts | undefined>}
+                    messageId={message.messageId}
+                    isCreatedByUser={message.isCreatedByUser}
                     isLast={isLast}
-                    content={content ?? []}
-                    message={message}
-                    messageId={messageId}
-                    enterEdit={enterEdit}
-                    error={!!(error ?? false)}
                     isSubmitting={isSubmitting}
-                    unfinished={unfinished ?? false}
-                    isCreatedByUser={isCreatedByUser ?? true}
-                    siblingIdx={siblingIdx ?? 0}
-                    setSiblingIdx={
-                      setSiblingIdx ??
-                      (() => {
-                        return;
-                      })
-                    }
                   />
                 </div>
               </div>
diff --git a/client/src/components/Chat/Messages/MultiMessage.tsx b/client/src/components/Chat/Messages/MultiMessage.tsx
index 0e3204f3925..eb2d2e92579 100644
--- a/client/src/components/Chat/Messages/MultiMessage.tsx
+++ b/client/src/components/Chat/Messages/MultiMessage.tsx
@@ -1,10 +1,14 @@
 import { useRecoilState } from 'recoil';
 import { useEffect, useCallback } from 'react';
+import { isAssistantsEndpoint } from 'librechat-data-provider';
+import type { TMessage } from 'librechat-data-provider';
 import type { TMessageProps } from '~/common';
 // eslint-disable-next-line import/no-cycle
-import Message from './Message';
+import MessageContent from '~/components/Messages/MessageContent';
 // eslint-disable-next-line import/no-cycle
 import MessageParts from './MessageParts';
+// eslint-disable-next-line import/no-cycle
+import Message from './Message';
 import store from '~/store';
 
 export default function MultiMessage({
@@ -30,22 +34,22 @@ export default function MultiMessage({
   }, [messagesTree?.length]);
 
   useEffect(() => {
-    if (messagesTree?.length && siblingIdx >= messagesTree?.length) {
+    if (messagesTree?.length && siblingIdx >= messagesTree.length) {
       setSiblingIdx(0);
     }
   }, [siblingIdx, messagesTree?.length, setSiblingIdx]);
 
-  if (!(messagesTree && messagesTree?.length)) {
+  if (!(messagesTree && messagesTree.length)) {
     return null;
   }
 
-  const message = messagesTree[messagesTree.length - siblingIdx - 1];
+  const message = messagesTree[messagesTree.length - siblingIdx - 1] as TMessage | undefined;
 
   if (!message) {
     return null;
   }
 
-  if (message.content) {
+  if (isAssistantsEndpoint(message.endpoint) && message.content) {
     return (
       <MessageParts
         key={message.messageId}
@@ -57,6 +61,18 @@ export default function MultiMessage({
         setSiblingIdx={setSiblingIdxRev}
       />
     );
+  } else if (message.content) {
+    return (
+      <MessageContent
+        key={message.messageId}
+        message={message}
+        currentEditId={currentEditId}
+        setCurrentEditId={setCurrentEditId}
+        siblingIdx={messagesTree.length - siblingIdx - 1}
+        siblingCount={messagesTree.length}
+        setSiblingIdx={setSiblingIdxRev}
+      />
+    );
   }
 
   return (
diff --git a/client/src/components/Conversations/Conversations.tsx b/client/src/components/Conversations/Conversations.tsx
index 99ca08b7991..941dd848d2f 100644
--- a/client/src/components/Conversations/Conversations.tsx
+++ b/client/src/components/Conversations/Conversations.tsx
@@ -41,7 +41,8 @@ const Conversations = ({
                   paddingLeft: '10px',
                 }}
               >
-                {localize(groupName) ?? groupName}
+                {/* eslint-disable-next-line @typescript-eslint/strict-boolean-expressions */}
+                {localize(groupName) || groupName}
               </div>
               {convos.map((convo, i) => (
                 <Convo
diff --git a/client/src/components/Conversations/Convo.tsx b/client/src/components/Conversations/Convo.tsx
index 2dd608bc92a..9b6f504b5e9 100644
--- a/client/src/components/Conversations/Convo.tsx
+++ b/client/src/components/Conversations/Convo.tsx
@@ -14,6 +14,7 @@ import { useToastContext } from '~/Providers';
 import { ConvoOptions } from './ConvoOptions';
 import { cn } from '~/utils';
 import store from '~/store';
+import { useLocalize } from '~/hooks'
 
 type KeyEvent = KeyboardEvent<HTMLInputElement>;
 
@@ -44,6 +45,7 @@ export default function Conversation({
   const [renaming, setRenaming] = useState(false);
   const [isPopoverActive, setIsPopoverActive] = useState(false);
   const isSmallScreen = useMediaQuery('(max-width: 768px)');
+  const localize = useLocalize();
 
   const clickHandler = async (event: MouseEvent<HTMLAnchorElement>) => {
     if (event.button === 0 && (event.ctrlKey || event.metaKey)) {
@@ -146,13 +148,14 @@ export default function Conversation({
             value={titleInput ?? ''}
             onChange={(e) => setTitleInput(e.target.value)}
             onKeyDown={handleKeyDown}
+            aria-label={`${localize('com_ui_rename')} ${localize('com_ui_chat')}`}
           />
           <div className="flex gap-1">
-            <button onClick={cancelRename}>
-              <X className="transition-colors h-4 w-4 duration-200 ease-in-out hover:opacity-70" />
+            <button onClick={cancelRename} aria-label={`${localize('com_ui_cancel')} ${localize('com_ui_rename')}`}>
+              <X aria-hidden={true} className="transition-colors h-4 w-4 duration-200 ease-in-out hover:opacity-70" />
             </button>
-            <button onClick={onRename}>
-              <Check className="transition-colors h-4 w-4 duration-200 ease-in-out hover:opacity-70" />
+            <button onClick={onRename} aria-label={`${localize('com_ui_submit')} ${localize('com_ui_rename')}`}>
+              <Check aria-hidden={true} className="transition-colors h-4 w-4 duration-200 ease-in-out hover:opacity-70" />
             </button>
           </div>
         </div>
diff --git a/client/src/components/Conversations/ConvoOptions/ConvoOptions.tsx b/client/src/components/Conversations/ConvoOptions/ConvoOptions.tsx
index d3bfc276632..59c63f896ac 100644
--- a/client/src/components/Conversations/ConvoOptions/ConvoOptions.tsx
+++ b/client/src/components/Conversations/ConvoOptions/ConvoOptions.tsx
@@ -2,11 +2,10 @@ import { useState, useId } from 'react';
 import * as Ariakit from '@ariakit/react';
 import { Ellipsis, Share2, Archive, Pen, Trash } from 'lucide-react';
 import { useGetStartupConfig } from 'librechat-data-provider/react-query';
-import { useArchiveHandler } from './ArchiveButton';
+import { useLocalize, useArchiveHandler } from '~/hooks';
 import { DropdownPopup } from '~/components/ui';
 import DeleteButton from './DeleteButton';
 import ShareButton from './ShareButton';
-import { useLocalize } from '~/hooks';
 import { cn } from '~/utils';
 
 export default function ConvoOptions({
@@ -70,13 +69,13 @@ export default function ConvoOptions({
             id="conversation-menu-button"
             aria-label={localize('com_nav_convo_menu_options')}
             className={cn(
-              'z-30 inline-flex h-7 w-7 items-center justify-center gap-2 rounded-md border-none p-0 text-sm font-medium transition-all duration-200 ease-in-out focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
+              'z-30 inline-flex h-7 w-7 items-center justify-center gap-2 rounded-md border-none p-0 text-sm font-medium ring-ring-primary transition-all duration-200 ease-in-out focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
               isActiveConvo === true
                 ? 'opacity-100'
                 : 'opacity-0 focus:opacity-100 group-focus-within:opacity-100 group-hover:opacity-100 data-[open]:opacity-100',
             )}
           >
-            <Ellipsis className="icon-md text-text-secondary" />
+            <Ellipsis className="icon-md text-text-secondary" aria-hidden={true} />
           </Ariakit.MenuButton>
         }
         items={dropdownItems}
diff --git a/client/src/components/Conversations/ConvoOptions/DeleteButton.tsx b/client/src/components/Conversations/ConvoOptions/DeleteButton.tsx
index 55e8cd659e2..589bd4ff30e 100644
--- a/client/src/components/Conversations/ConvoOptions/DeleteButton.tsx
+++ b/client/src/components/Conversations/ConvoOptions/DeleteButton.tsx
@@ -1,45 +1,36 @@
-import React, { useCallback, useState } from 'react';
+import React, { useCallback } from 'react';
 import { QueryKeys } from 'librechat-data-provider';
 import { useQueryClient } from '@tanstack/react-query';
 import { useParams, useNavigate } from 'react-router-dom';
 import type { TMessage } from 'librechat-data-provider';
 import { useDeleteConversationMutation } from '~/data-provider';
-import {
-  OGDialog,
-  OGDialogTrigger,
-  Label,
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from '~/components/ui';
 import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
-import { TrashIcon } from '~/components/svg';
 import { useLocalize, useNewConvo } from '~/hooks';
+import { OGDialog, Label } from '~/components';
 
 type DeleteButtonProps = {
   conversationId: string;
   retainView: () => void;
   title: string;
-  className?: string;
   showDeleteDialog?: boolean;
   setShowDeleteDialog?: (value: boolean) => void;
 };
 
-export default function DeleteButton({
+export function DeleteConversationDialog({
   conversationId,
   retainView,
   title,
-  className = '',
-  showDeleteDialog,
-  setShowDeleteDialog,
-}: DeleteButtonProps) {
+}: {
+  conversationId: string;
+  retainView: () => void;
+  title: string;
+}) {
   const localize = useLocalize();
   const navigate = useNavigate();
   const queryClient = useQueryClient();
   const { newConversation } = useNewConvo();
   const { conversationId: currentConvoId } = useParams();
-  const [open, setOpen] = useState(false);
+
   const deleteConvoMutation = useDeleteConversationMutation({
     onSuccess: () => {
       if (currentConvoId === conversationId || currentConvoId === 'new') {
@@ -57,7 +48,7 @@ export default function DeleteButton({
     deleteConvoMutation.mutate({ conversationId, thread_id, source: 'button' });
   }, [conversationId, deleteConvoMutation, queryClient]);
 
-  const dialogContent = (
+  return (
     <OGDialogTemplate
       showCloseButton={false}
       title={localize('com_ui_delete_conversation')}
@@ -81,32 +72,26 @@ export default function DeleteButton({
       }}
     />
   );
+}
 
-  if (showDeleteDialog !== undefined && setShowDeleteDialog !== undefined) {
-    return (
-      <OGDialog open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
-        {dialogContent}
-      </OGDialog>
-    );
+export default function DeleteButton({
+  conversationId,
+  retainView,
+  title,
+  showDeleteDialog,
+  setShowDeleteDialog,
+}: DeleteButtonProps) {
+  if (showDeleteDialog === undefined && setShowDeleteDialog === undefined) {
+    return null;
   }
 
   return (
-    <OGDialog open={open} onOpenChange={setOpen}>
-      <TooltipProvider delayDuration={250}>
-        <Tooltip>
-          <OGDialogTrigger asChild>
-            <TooltipTrigger asChild>
-              <button>
-                <TrashIcon className="h-5 w-5" />
-              </button>
-            </TooltipTrigger>
-          </OGDialogTrigger>
-          <TooltipContent side="top" sideOffset={0} className={className}>
-            {localize('com_ui_delete')}
-          </TooltipContent>
-        </Tooltip>
-      </TooltipProvider>
-      {dialogContent}
+    <OGDialog open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
+      <DeleteConversationDialog
+        conversationId={conversationId}
+        retainView={retainView}
+        title={title}
+      />
     </OGDialog>
   );
 }
diff --git a/client/src/components/Conversations/ConvoOptions/index.ts b/client/src/components/Conversations/ConvoOptions/index.ts
index 6f8794d063a..c294bb45ce6 100644
--- a/client/src/components/Conversations/ConvoOptions/index.ts
+++ b/client/src/components/Conversations/ConvoOptions/index.ts
@@ -1,5 +1,4 @@
-export { default as ArchiveButton } from './ArchiveButton';
-export { default as DeleteButton } from './DeleteButton';
+export * from './DeleteButton';
 export { default as ShareButton } from './ShareButton';
 export { default as SharedLinkButton } from './SharedLinkButton';
 export { default as ConvoOptions } from './ConvoOptions';
diff --git a/client/src/components/Conversations/DropDownMenu.tsx b/client/src/components/Conversations/DropDownMenu.tsx
deleted file mode 100644
index 1cc18ae8b4c..00000000000
--- a/client/src/components/Conversations/DropDownMenu.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { cloneElement, type FC } from 'react';
-import { DotsIcon } from '~/components/svg';
-import { Content, Portal, Root, Trigger } from '@radix-ui/react-popover';
-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from '~/components/ui';
-import { useToggle } from './ToggleContext';
-import { useLocalize } from '~/hooks';
-import { cn } from '~/utils';
-
-type DropDownMenuProps = {
-  children: React.ReactNode;
-  icon?: React.ReactElement;
-  tooltip?: string;
-  className?: string;
-};
-const DropDownMenu: FC<DropDownMenuProps> = ({
-  children,
-  icon = <DotsIcon />,
-  tooltip = 'More',
-  className,
-}: DropDownMenuProps) => {
-  const localize = useLocalize();
-  const { isPopoverActive, setPopoverActive } = useToggle();
-
-  return (
-    <Root open={isPopoverActive} onOpenChange={(open) => setPopoverActive(open)}>
-      <Trigger asChild>
-        <div
-          className={cn(
-            'pointer-cursor relative flex flex-col text-left focus:outline-none focus:ring-0 focus:ring-offset-0 sm:text-sm',
-            'hover:text-gray-400 radix-state-open:text-gray-400 dark:hover:text-gray-400 dark:radix-state-open:text-gray-400',
-            'z-50 flex h-[40px] min-w-4 flex-none items-center justify-center focus:ring-0 focus:ring-offset-0',
-          )}
-          id="edit-menu-button"
-          data-testid="edit-menu-button"
-          title={localize('com_ui_more_options')}
-        >
-          <TooltipProvider delayDuration={500}>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <button type="button" className={className}>
-                  {cloneElement(icon, {
-                    className:
-                      'h-[18px] w-[18px] flex-shrink-0 text-gray-500 hover:text-gray-400 dark:text-gray-300 dark:hover:text-gray-400',
-                  })}
-                </button>
-              </TooltipTrigger>
-              <TooltipContent side="top" sideOffset={0}>
-                {tooltip}
-              </TooltipContent>
-            </Tooltip>
-          </TooltipProvider>
-        </div>
-      </Trigger>
-      <Portal>
-        <Content
-          side="bottom"
-          align="start"
-          className={cn(
-            'popover radix-side-bottom:animate-slideUpAndFade radix-side-left:animate-slideRightAndFade radix-side-right:animate-slideLeftAndFade radix-side-top:animate-slideDownAndFade overflow-hidden rounded-lg shadow-lg',
-            'border border-gray-200 bg-white dark:border-gray-600 dark:bg-gray-700 dark:text-white',
-            'flex min-w-[200px] max-w-xs flex-wrap',
-          )}
-        >
-          {children}
-        </Content>
-      </Portal>
-    </Root>
-  );
-};
-
-export default DropDownMenu;
diff --git a/client/src/components/Conversations/Fork.tsx b/client/src/components/Conversations/Fork.tsx
index 6f109dd987f..7eb47d66f8f 100644
--- a/client/src/components/Conversations/Fork.tsx
+++ b/client/src/components/Conversations/Fork.tsx
@@ -116,7 +116,7 @@ export default function Fork({
   const [forkSetting, setForkSetting] = useRecoilState(store.forkSetting);
   const [activeSetting, setActiveSetting] = useState(optionLabels.default);
   const [splitAtTarget, setSplitAtTarget] = useRecoilState(store.splitAtTarget);
-  const [rememberGlobal, setRememberGlobal] = useRecoilState(store.rememberForkOption);
+  const [rememberGlobal, setRememberGlobal] = useRecoilState(store.rememberDefaultFork);
   const forkConvo = useForkConvoMutation({
     onSuccess: (data) => {
       if (data) {
diff --git a/client/src/components/Endpoints/MessageEndpointIcon.tsx b/client/src/components/Endpoints/MessageEndpointIcon.tsx
index fc084bbb55b..04c091e7d58 100644
--- a/client/src/components/Endpoints/MessageEndpointIcon.tsx
+++ b/client/src/components/Endpoints/MessageEndpointIcon.tsx
@@ -1,4 +1,4 @@
-import { EModelEndpoint, isAssistantsEndpoint } from 'librechat-data-provider';
+import { EModelEndpoint, isAssistantsEndpoint, alternateName } from 'librechat-data-provider';
 import UnknownIcon from '~/components/Chat/Menus/Endpoints/UnknownIcon';
 import { BrainCircuit } from 'lucide-react';
 import {
@@ -7,6 +7,7 @@ import {
   PaLMIcon,
   CodeyIcon,
   GeminiIcon,
+  BedrockIcon,
   AssistantIcon,
   AnthropicIcon,
   AzureMinimalIcon,
@@ -16,11 +17,39 @@ import {
 import { IconProps } from '~/common';
 import { cn } from '~/utils';
 
+function getOpenAIColor(_model: string | null | undefined) {
+  const model = _model?.toLowerCase() ?? '';
+  if (model && /\bo1\b/i.test(model)) {
+    return '#000000';
+  }
+  return model.includes('gpt-4') ? '#AB68FF' : '#19C37D';
+}
+
+function getGoogleIcon(model: string | null | undefined, size: number) {
+  if (model?.toLowerCase().includes('code') === true) {
+    return <CodeyIcon size={size * 0.75} />;
+  } else if (model?.toLowerCase().includes('gemini') === true) {
+    return <GeminiIcon size={size * 0.7} />;
+  } else {
+    return <PaLMIcon size={size * 0.7} />;
+  }
+}
+
+function getGoogleModelName(model: string | null | undefined) {
+  if (model?.toLowerCase().includes('code') === true) {
+    return 'Codey';
+  } else if (model?.toLowerCase().includes('gemini') === true) {
+    return 'Gemini';
+  } else {
+    return 'PaLM2';
+  }
+}
+
 const MessageEndpointIcon: React.FC<IconProps> = (props) => {
   const {
     error,
     button,
-    iconURL,
+    iconURL = '',
     endpoint,
     jailbreak,
     size = 30,
@@ -30,7 +59,7 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {
   } = props;
 
   const assistantsIcon = {
-    icon: props.iconURL ? (
+    icon: iconURL ? (
       <div className="relative flex h-6 w-6 items-center justify-center">
         <div
           title={assistantName}
@@ -42,7 +71,7 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {
         >
           <img
             className="shadow-stroke h-full w-full object-cover"
-            src={props.iconURL}
+            src={iconURL}
             alt={assistantName}
             style={{ height: '80', width: '80' }}
           />
@@ -59,7 +88,7 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {
   };
 
   const agentsIcon = {
-    icon: props.iconURL ? (
+    icon: iconURL ? (
       <div className="relative flex h-6 w-6 items-center justify-center">
         <div
           title={agentName}
@@ -71,7 +100,7 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {
         >
           <img
             className="shadow-stroke h-full w-full object-cover"
-            src={props.iconURL}
+            src={iconURL}
             alt={agentName}
             style={{ height: '80', width: '80' }}
           />
@@ -98,48 +127,43 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {
     },
     [EModelEndpoint.openAI]: {
       icon: <GPTIcon size={size * 0.5555555555555556} />,
-      bg:
-        typeof model === 'string' && model.toLowerCase().includes('gpt-4') ? '#AB68FF' : '#19C37D',
+      bg: getOpenAIColor(model),
       name: 'ChatGPT',
     },
     [EModelEndpoint.gptPlugins]: {
       icon: <Plugin size={size * 0.7} />,
-      bg: `rgba(69, 89, 164, ${button ? 0.75 : 1})`,
+      bg: `rgba(69, 89, 164, ${button === true ? 0.75 : 1})`,
       name: 'Plugins',
     },
     [EModelEndpoint.google]: {
-      icon: model?.toLowerCase()?.includes('code') ? (
-        <CodeyIcon size={size * 0.75} />
-      ) : model?.toLowerCase()?.includes('gemini') ? (
-        <GeminiIcon size={size * 0.7} />
-      ) : (
-        <PaLMIcon size={size * 0.7} />
-      ),
-      name: model?.toLowerCase()?.includes('code')
-        ? 'Codey'
-        : model?.toLowerCase()?.includes('gemini')
-          ? 'Gemini'
-          : 'PaLM2',
+      icon: getGoogleIcon(model, size),
+      name: getGoogleModelName(model),
     },
     [EModelEndpoint.anthropic]: {
       icon: <AnthropicIcon size={size * 0.5555555555555556} />,
       bg: '#d09a74',
       name: 'Claude',
     },
+    [EModelEndpoint.bedrock]: {
+      icon: <BedrockIcon className="icon-xl text-white" />,
+      bg: '#268672',
+      name: alternateName[EModelEndpoint.bedrock],
+    },
     [EModelEndpoint.bingAI]: {
-      icon: jailbreak ? (
-        <img src="/assets/bingai-jb.png" alt="Bing Icon" />
-      ) : (
-        <img src="/assets/bingai.png" alt="Sydney Icon" />
-      ),
-      name: jailbreak ? 'Sydney' : 'BingAI',
+      icon:
+        jailbreak === true ? (
+          <img src="/assets/bingai-jb.png" alt="Bing Icon" />
+        ) : (
+          <img src="/assets/bingai.png" alt="Sydney Icon" />
+        ),
+      name: jailbreak === true ? 'Sydney' : 'BingAI',
     },
     [EModelEndpoint.chatGPTBrowser]: {
       icon: <GPTIcon size={size * 0.5555555555555556} />,
       bg:
         typeof model === 'string' && model.toLowerCase().includes('gpt-4')
           ? '#AB68FF'
-          : `rgba(0, 163, 255, ${button ? 0.75 : 1})`,
+          : `rgba(0, 163, 255, ${button === true ? 0.75 : 1})`,
       name: 'ChatGPT',
     },
     [EModelEndpoint.custom]: {
@@ -152,7 +176,7 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {
         <div className="h-6 w-6">
           <div className="overflow-hidden rounded-full">
             <UnknownIcon
-              iconURL={props.iconURL}
+              iconURL={iconURL}
               endpoint={endpoint ?? ''}
               className="h-full w-full object-contain"
               context="message"
@@ -185,11 +209,11 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {
       }}
       className={cn(
         'relative flex h-9 w-9 items-center justify-center rounded-sm p-1 text-white',
-        props.className || '',
+        props.className ?? '',
       )}
     >
       {icon}
-      {error && (
+      {error === true && (
         <span className="absolute right-0 top-[20px] -mr-2 flex h-3 w-3 items-center justify-center rounded-full border border-white bg-red-500 text-[10px] text-white">
           !
         </span>
diff --git a/client/src/components/Endpoints/MinimalIcon.tsx b/client/src/components/Endpoints/MinimalIcon.tsx
index 80ab657a83a..4e9a3b28d6c 100644
--- a/client/src/components/Endpoints/MinimalIcon.tsx
+++ b/client/src/components/Endpoints/MinimalIcon.tsx
@@ -1,4 +1,4 @@
-import { EModelEndpoint } from 'librechat-data-provider';
+import { EModelEndpoint, alternateName } from 'librechat-data-provider';
 import { BrainCircuit } from 'lucide-react';
 import UnknownIcon from '~/components/Chat/Menus/Endpoints/UnknownIcon';
 import {
@@ -10,6 +10,7 @@ import {
   GoogleMinimalIcon,
   CustomMinimalIcon,
   AnthropicIcon,
+  BedrockIcon,
   Sparkles,
 } from '~/components/svg';
 import { cn } from '~/utils';
@@ -27,17 +28,17 @@ const MinimalIcon: React.FC<IconProps> = (props) => {
   const endpointIcons = {
     [EModelEndpoint.azureOpenAI]: {
       icon: <AzureMinimalIcon className={iconClassName} />,
-      name: props.chatGptLabel || 'ChatGPT',
+      name: props.chatGptLabel ?? 'ChatGPT',
     },
     [EModelEndpoint.openAI]: {
       icon: <OpenAIMinimalIcon className={iconClassName} />,
-      name: props.chatGptLabel || 'ChatGPT',
+      name: props.chatGptLabel ?? 'ChatGPT',
     },
     [EModelEndpoint.gptPlugins]: { icon: <MinimalPlugin />, name: 'Plugins' },
-    [EModelEndpoint.google]: { icon: <GoogleMinimalIcon />, name: props.modelLabel || 'Google' },
+    [EModelEndpoint.google]: { icon: <GoogleMinimalIcon />, name: props.modelLabel ?? 'Google' },
     [EModelEndpoint.anthropic]: {
       icon: <AnthropicIcon className="icon-md shrink-0 dark:text-white" />,
-      name: props.modelLabel || 'Claude',
+      name: props.modelLabel ?? 'Claude',
     },
     [EModelEndpoint.custom]: {
       icon: <CustomMinimalIcon />,
@@ -47,7 +48,14 @@ const MinimalIcon: React.FC<IconProps> = (props) => {
     [EModelEndpoint.chatGPTBrowser]: { icon: <LightningIcon />, name: 'ChatGPT' },
     [EModelEndpoint.assistants]: { icon: <Sparkles className="icon-sm" />, name: 'Assistant' },
     [EModelEndpoint.azureAssistants]: { icon: <Sparkles className="icon-sm" />, name: 'Assistant' },
-    [EModelEndpoint.agents]: { icon: <BrainCircuit className="icon-sm" />, name: 'Agent' },
+    [EModelEndpoint.agents]: {
+      icon: <BrainCircuit className="icon-sm" />,
+      name: props.modelLabel ?? alternateName[EModelEndpoint.agents],
+    },
+    [EModelEndpoint.bedrock]: {
+      icon: <BedrockIcon className="icon-xl text-text-primary" />,
+      name: props.modelLabel ?? alternateName[EModelEndpoint.bedrock],
+    },
     default: {
       icon: (
         <UnknownIcon
@@ -75,13 +83,13 @@ const MinimalIcon: React.FC<IconProps> = (props) => {
         height: size,
       }}
       className={cn(
-        'relative flex items-center justify-center rounded-sm text-black dark:text-white',
-        props.className || '',
+        'relative flex items-center justify-center rounded-sm text-text-secondary',
+        props.className ?? '',
       )}
     >
       {icon}
-      {error && (
-        <span className="absolute right-0 top-[20px] -mr-2 flex h-4 w-4 items-center justify-center rounded-full border border-white bg-red-500 text-[10px] text-black dark:text-white">
+      {error === true && (
+        <span className="absolute right-0 top-[20px] -mr-2 flex h-4 w-4 items-center justify-center rounded-full border border-white bg-red-500 text-[10px] text-text-secondary">
           !
         </span>
       )}
diff --git a/client/src/components/Endpoints/SaveAsPresetDialog.tsx b/client/src/components/Endpoints/SaveAsPresetDialog.tsx
index a0ff45f18ff..3c4f4df2253 100644
--- a/client/src/components/Endpoints/SaveAsPresetDialog.tsx
+++ b/client/src/components/Endpoints/SaveAsPresetDialog.tsx
@@ -2,14 +2,14 @@ import React, { useEffect, useState } from 'react';
 import { useCreatePresetMutation } from 'librechat-data-provider/react-query';
 import type { TEditPresetProps } from '~/common';
 import { cn, removeFocusOutlines, cleanupPreset, defaultTextProps } from '~/utils/';
-import DialogTemplate from '~/components/ui/DialogTemplate';
-import { Dialog, Input, Label } from '~/components/ui/';
+import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
+import { OGDialog, Input, Label } from '~/components/ui/';
 import { NotificationSeverity } from '~/common';
 import { useToastContext } from '~/Providers';
 import { useLocalize } from '~/hooks';
 
 const SaveAsPresetDialog = ({ open, onOpenChange, preset }: TEditPresetProps) => {
-  const [title, setTitle] = useState<string>(preset.title || 'My Preset');
+  const [title, setTitle] = useState<string>(preset.title ?? 'My Preset');
   const createPresetMutation = useCreatePresetMutation();
   const { showToast } = useToastContext();
   const localize = useLocalize();
@@ -22,15 +22,15 @@ const SaveAsPresetDialog = ({ open, onOpenChange, preset }: TEditPresetProps) =>
       },
     });
 
-    const toastTitle = _preset.title
-      ? `\`${_preset.title}\``
-      : localize('com_endpoint_preset_title');
+    const toastTitle =
+      _preset.title ?? '' ? `\`${_preset.title}\`` : localize('com_endpoint_preset_title');
 
     createPresetMutation.mutate(_preset, {
       onSuccess: () => {
         showToast({
           message: `${toastTitle} ${localize('com_endpoint_preset_saved')}`,
         });
+        onOpenChange(false); // Close the dialog on success
       },
       onError: () => {
         showToast({
@@ -42,30 +42,41 @@ const SaveAsPresetDialog = ({ open, onOpenChange, preset }: TEditPresetProps) =>
   };
 
   useEffect(() => {
-    setTitle(preset.title || localize('com_endpoint_my_preset'));
+    setTitle(preset.title ?? localize('com_endpoint_my_preset'));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [open]);
 
+  // Handle Enter key press
+  const handleKeyDown = (event: React.KeyboardEvent) => {
+    if (event.key === 'Enter') {
+      event.preventDefault();
+      submitPreset();
+    }
+  };
+
   return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogTemplate
+    <OGDialog open={open} onOpenChange={onOpenChange}>
+      <OGDialogTemplate
         title={localize('com_endpoint_save_as_preset')}
-        className="w-11/12 sm:w-1/4"
+        className="z-[90] w-11/12 sm:w-1/4"
+        overlayClassName="z-[80]"
         showCloseButton={false}
         main={
           <div className="flex w-full flex-col items-center gap-2">
             <div className="grid w-full items-center gap-2">
-              <Label htmlFor="dialog-preset-name" className="text-left text-sm font-medium">
+              <Label htmlFor="preset-custom-name" className="text-left text-sm font-medium">
                 {localize('com_endpoint_preset_name')}
               </Label>
               <Input
                 id="preset-custom-name"
                 value={title || ''}
                 onChange={(e) => setTitle(e.target.value || '')}
-                placeholder="Set a custom name for this preset"
+                onKeyDown={handleKeyDown}
+                placeholder={localize('com_endpoint_preset_custom_name_placeholder')}
+                aria-label={localize('com_endpoint_preset_name')}
                 className={cn(
                   defaultTextProps,
-                  'flex h-10 max-h-10 w-full resize-none border-gray-100 px-3 py-2 dark:border-gray-600',
+                  'flex h-10 max-h-10 w-full resize-none border-border-medium px-3 py-2 ',
                   removeFocusOutlines,
                 )}
               />
@@ -78,7 +89,7 @@ const SaveAsPresetDialog = ({ open, onOpenChange, preset }: TEditPresetProps) =>
           selectText: localize('com_ui_save'),
         }}
       />
-    </Dialog>
+    </OGDialog>
   );
 };
 
diff --git a/client/src/components/Endpoints/Settings/Anthropic.tsx b/client/src/components/Endpoints/Settings/Anthropic.tsx
index 6873efe69fc..5d44f1a1a05 100644
--- a/client/src/components/Endpoints/Settings/Anthropic.tsx
+++ b/client/src/components/Endpoints/Settings/Anthropic.tsx
@@ -1,364 +1,64 @@
-import TextareaAutosize from 'react-textarea-autosize';
-import { anthropicSettings } from 'librechat-data-provider';
-import type { TModelSelectProps, OnInputNumberChange } from '~/common';
-import {
-  Input,
-  Label,
-  Slider,
-  Switch,
-  HoverCard,
-  InputNumber,
-  SelectDropDown,
-  HoverCardTrigger,
-} from '~/components/ui';
-import { cn, defaultTextProps, optionText, removeFocusOutlines, removeFocusRings } from '~/utils';
-import OptionHoverAlt from '~/components/SidePanel/Parameters/OptionHover';
-import { useLocalize, useDebouncedInput } from '~/hooks';
-import OptionHover from './OptionHover';
-import { ESide } from '~/common';
+import { useMemo } from 'react';
+import { getSettingsKeys } from 'librechat-data-provider';
+import type { SettingDefinition } from 'librechat-data-provider';
+import type { TModelSelectProps } from '~/common';
+import { componentMapping } from '~/components/SidePanel/Parameters/components';
+import { presetSettings } from '~/components/SidePanel/Parameters/settings';
 
-export default function Settings({ conversation, setOption, models, readonly }: TModelSelectProps) {
-  const localize = useLocalize();
-  const {
-    model,
-    modelLabel,
-    promptPrefix,
-    temperature,
-    topP,
-    topK,
-    maxOutputTokens,
-    maxContextTokens,
-    resendFiles,
-    promptCache,
-  } = conversation ?? {};
-  const [setMaxContextTokens, maxContextTokensValue] = useDebouncedInput<number | null | undefined>(
-    {
-      setOption,
-      optionKey: 'maxContextTokens',
-      initialValue: maxContextTokens,
-    },
-  );
-  if (!conversation) {
+export default function AnthropicSettings({
+  conversation,
+  setOption,
+  models,
+  readonly,
+}: TModelSelectProps) {
+  const parameters = useMemo(() => {
+    const [combinedKey, endpointKey] = getSettingsKeys(
+      conversation?.endpointType ?? conversation?.endpoint ?? '',
+      conversation?.model ?? '',
+    );
+    return presetSettings[combinedKey] ?? presetSettings[endpointKey];
+  }, [conversation]);
+
+  if (!parameters) {
     return null;
   }
 
-  const setModelLabel = setOption('modelLabel');
-  const setPromptPrefix = setOption('promptPrefix');
-  const setTemperature = setOption('temperature');
-  const setTopP = setOption('topP');
-  const setTopK = setOption('topK');
-  const setResendFiles = setOption('resendFiles');
-  const setPromptCache = setOption('promptCache');
-
-  const setModel = (newModel: string) => {
-    const modelSetter = setOption('model');
-    const maxOutputSetter = setOption('maxOutputTokens');
-    if (maxOutputTokens) {
-      maxOutputSetter(anthropicSettings.maxOutputTokens.set(maxOutputTokens, newModel));
+  const renderComponent = (setting: SettingDefinition | undefined) => {
+    if (!setting) {
+      return null;
     }
-    modelSetter(newModel);
-  };
+    const Component = componentMapping[setting.component];
+    if (!Component) {
+      return null;
+    }
+    const { key, default: defaultValue, ...rest } = setting;
 
-  const setMaxOutputTokens = (value: number) => {
-    const setter = setOption('maxOutputTokens');
-    if (model) {
-      setter(anthropicSettings.maxOutputTokens.set(value, model));
-    } else {
-      setter(value);
+    const props = {
+      key,
+      settingKey: key,
+      defaultValue,
+      ...rest,
+      readonly,
+      setOption,
+      conversation,
+    };
+
+    if (key === 'model') {
+      return <Component {...props} options={models} />;
     }
+
+    return <Component {...props} />;
   };
 
   return (
-    <div className="grid grid-cols-5 gap-6">
-      <div className="col-span-5 flex flex-col items-center justify-start gap-6 sm:col-span-3">
-        <div className="grid w-full items-center gap-2">
-          <SelectDropDown
-            value={model ?? ''}
-            setValue={setModel}
-            availableValues={models}
-            disabled={readonly}
-            className={cn(defaultTextProps, 'flex w-full resize-none', removeFocusRings)}
-            containerClassName="flex w-full resize-none"
-          />
+    <div className="h-auto max-w-full overflow-x-hidden p-3">
+      <div className="grid grid-cols-1 gap-6 md:grid-cols-5">
+        <div className="flex flex-col gap-6 md:col-span-3">
+          {parameters.col1.map(renderComponent)}
         </div>
-        <div className="grid w-full items-center gap-2">
-          <Label htmlFor="modelLabel" className="text-left text-sm font-medium">
-            {localize('com_endpoint_custom_name')}{' '}
-            <small className="opacity-40">({localize('com_endpoint_default_blank')})</small>
-          </Label>
-          <Input
-            id="modelLabel"
-            disabled={readonly}
-            value={modelLabel || ''}
-            onChange={(e) => setModelLabel(e.target.value ?? null)}
-            placeholder={localize('com_endpoint_anthropic_custom_name_placeholder')}
-            className={cn(
-              defaultTextProps,
-              'flex h-10 max-h-10 w-full resize-none px-3 py-2',
-              removeFocusOutlines,
-            )}
-          />
+        <div className="flex flex-col gap-6 md:col-span-2">
+          {parameters.col2.map(renderComponent)}
         </div>
-        <div className="grid w-full items-center gap-2">
-          <Label htmlFor="promptPrefix" className="text-left text-sm font-medium">
-            {localize('com_endpoint_prompt_prefix')}{' '}
-            <small className="opacity-40">({localize('com_endpoint_default_blank')})</small>
-          </Label>
-          <TextareaAutosize
-            id="promptPrefix"
-            disabled={readonly}
-            value={promptPrefix || ''}
-            onChange={(e) => setPromptPrefix(e.target.value ?? null)}
-            placeholder={localize('com_endpoint_prompt_prefix_placeholder')}
-            className={cn(
-              defaultTextProps,
-              'flex max-h-[138px] min-h-[100px] w-full resize-none px-3 py-2 ',
-            )}
-          />
-        </div>
-      </div>
-      <div className="col-span-5 flex flex-col items-center justify-start gap-6 px-3 sm:col-span-2">
-        <HoverCard openDelay={300}>
-          <HoverCardTrigger className="grid w-full items-center gap-2">
-            <div className="mt-1 flex w-full justify-between">
-              <Label htmlFor="max-context-tokens" className="text-left text-sm font-medium">
-                {localize('com_endpoint_context_tokens')}{' '}
-              </Label>
-              <InputNumber
-                id="max-context-tokens"
-                stringMode={false}
-                disabled={readonly}
-                value={maxContextTokensValue as number}
-                onChange={setMaxContextTokens as OnInputNumberChange}
-                placeholder={localize('com_nav_theme_system')}
-                min={10}
-                max={2000000}
-                step={1000}
-                controls={false}
-                className={cn(
-                  defaultTextProps,
-                  cn(
-                    optionText,
-                    'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
-                    'w-1/3',
-                  ),
-                )}
-              />
-            </div>
-          </HoverCardTrigger>
-          <OptionHoverAlt
-            description="com_endpoint_context_info"
-            langCode={true}
-            side={ESide.Left}
-          />
-        </HoverCard>
-        <HoverCard openDelay={300}>
-          <HoverCardTrigger className="grid w-full items-center gap-2">
-            <div className="flex justify-between">
-              <Label htmlFor="temp-int" className="text-left text-sm font-medium">
-                {localize('com_endpoint_temperature')}{' '}
-                <small className="opacity-40">
-                  ({localize('com_endpoint_default')}: {anthropicSettings.temperature.default})
-                </small>
-              </Label>
-              <InputNumber
-                id="temp-int"
-                disabled={readonly}
-                value={temperature}
-                onChange={(value) => setTemperature(Number(value))}
-                max={anthropicSettings.temperature.max}
-                min={0}
-                step={0.01}
-                controls={false}
-                className={cn(
-                  defaultTextProps,
-                  cn(
-                    optionText,
-                    'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
-                  ),
-                )}
-              />
-            </div>
-            <Slider
-              disabled={readonly}
-              value={[temperature ?? anthropicSettings.temperature.default]}
-              onValueChange={(value) => setTemperature(value[0])}
-              doubleClickHandler={() => setTemperature(anthropicSettings.temperature.default)}
-              max={anthropicSettings.temperature.max}
-              min={0}
-              step={0.01}
-              className="flex h-4 w-full"
-            />
-          </HoverCardTrigger>
-          <OptionHover endpoint={conversation.endpoint ?? ''} type="temp" side={ESide.Left} />
-        </HoverCard>
-        <HoverCard openDelay={300}>
-          <HoverCardTrigger className="grid w-full items-center gap-2">
-            <div className="flex justify-between">
-              <Label htmlFor="top-p-int" className="text-left text-sm font-medium">
-                {localize('com_endpoint_top_p')}{' '}
-                <small className="opacity-40">
-                  ({localize('com_endpoint_default_with_num', anthropicSettings.topP.default + '')})
-                </small>
-              </Label>
-              <InputNumber
-                id="top-p-int"
-                disabled={readonly}
-                value={topP}
-                onChange={(value) => setTopP(Number(value))}
-                max={anthropicSettings.topP.max}
-                min={0}
-                step={0.01}
-                controls={false}
-                className={cn(
-                  defaultTextProps,
-                  cn(
-                    optionText,
-                    'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
-                  ),
-                )}
-              />
-            </div>
-            <Slider
-              disabled={readonly}
-              value={[topP ?? 0.7]}
-              onValueChange={(value) => setTopP(value[0])}
-              doubleClickHandler={() => setTopP(anthropicSettings.topP.default)}
-              max={anthropicSettings.topP.max}
-              min={0}
-              step={0.01}
-              className="flex h-4 w-full"
-            />
-          </HoverCardTrigger>
-          <OptionHover endpoint={conversation.endpoint ?? ''} type="topp" side={ESide.Left} />
-        </HoverCard>
-
-        <HoverCard openDelay={300}>
-          <HoverCardTrigger className="grid w-full items-center gap-2">
-            <div className="flex justify-between">
-              <Label htmlFor="top-k-int" className="text-left text-sm font-medium">
-                {localize('com_endpoint_top_k')}{' '}
-                <small className="opacity-40">
-                  ({localize('com_endpoint_default_with_num', anthropicSettings.topK.default + '')})
-                </small>
-              </Label>
-              <InputNumber
-                id="top-k-int"
-                disabled={readonly}
-                value={topK}
-                onChange={(value) => setTopK(Number(value))}
-                max={anthropicSettings.topK.max}
-                min={1}
-                step={0.01}
-                controls={false}
-                className={cn(
-                  defaultTextProps,
-                  cn(
-                    optionText,
-                    'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
-                  ),
-                )}
-              />
-            </div>
-            <Slider
-              disabled={readonly}
-              value={[topK ?? 5]}
-              onValueChange={(value) => setTopK(value[0])}
-              doubleClickHandler={() => setTopK(anthropicSettings.topK.default)}
-              max={anthropicSettings.topK.max}
-              min={1}
-              step={0.01}
-              className="flex h-4 w-full"
-            />
-          </HoverCardTrigger>
-          <OptionHover endpoint={conversation.endpoint ?? ''} type="topk" side={ESide.Left} />
-        </HoverCard>
-        <HoverCard openDelay={300}>
-          <HoverCardTrigger className="grid w-full items-center gap-2">
-            <div className="flex justify-between">
-              <Label htmlFor="max-tokens-int" className="text-left text-sm font-medium">
-                {localize('com_endpoint_max_output_tokens')}{' '}
-                <small className="opacity-40">({anthropicSettings.maxOutputTokens.default})</small>
-              </Label>
-              <InputNumber
-                id="max-tokens-int"
-                disabled={readonly}
-                value={maxOutputTokens}
-                onChange={(value) => setMaxOutputTokens(Number(value))}
-                max={anthropicSettings.maxOutputTokens.max}
-                min={1}
-                step={1}
-                controls={false}
-                className={cn(
-                  defaultTextProps,
-                  cn(
-                    optionText,
-                    'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
-                  ),
-                )}
-              />
-            </div>
-            <Slider
-              disabled={readonly}
-              value={[maxOutputTokens ?? anthropicSettings.maxOutputTokens.default]}
-              onValueChange={(value) => setMaxOutputTokens(value[0])}
-              doubleClickHandler={() =>
-                setMaxOutputTokens(anthropicSettings.maxOutputTokens.default)
-              }
-              max={anthropicSettings.maxOutputTokens.max}
-              min={1}
-              step={1}
-              className="flex h-4 w-full"
-            />
-          </HoverCardTrigger>
-          <OptionHover
-            endpoint={conversation.endpoint ?? ''}
-            type="maxoutputtokens"
-            side={ESide.Left}
-          />
-        </HoverCard>
-        <HoverCard openDelay={500}>
-          <HoverCardTrigger className="grid w-full">
-            <div className="flex justify-between">
-              <Label htmlFor="resend-files" className="text-left text-sm font-medium">
-                {localize('com_endpoint_plug_resend_files')}{' '}
-              </Label>
-              <Switch
-                id="resend-files"
-                checked={resendFiles ?? true}
-                onCheckedChange={(checked: boolean) => setResendFiles(checked)}
-                disabled={readonly}
-                className="flex"
-              />
-              <OptionHover
-                endpoint={conversation.endpoint ?? ''}
-                type="resend"
-                side={ESide.Bottom}
-              />
-            </div>
-          </HoverCardTrigger>
-        </HoverCard>
-        <HoverCard openDelay={500}>
-          <HoverCardTrigger className="grid w-full">
-            <div className="flex justify-between">
-              <Label htmlFor="prompt-cache" className="text-left text-sm font-medium">
-                {localize('com_endpoint_prompt_cache')}{' '}
-              </Label>
-              <Switch
-                id="prompt-cache"
-                checked={promptCache ?? true}
-                onCheckedChange={(checked: boolean) => setPromptCache(checked)}
-                disabled={readonly}
-                className="flex"
-              />
-              <OptionHover
-                endpoint={conversation.endpoint ?? ''}
-                type="promptcache"
-                side={ESide.Bottom}
-              />
-            </div>
-          </HoverCardTrigger>
-        </HoverCard>
       </div>
     </div>
   );
diff --git a/client/src/components/Endpoints/Settings/Bedrock.tsx b/client/src/components/Endpoints/Settings/Bedrock.tsx
new file mode 100644
index 00000000000..1f1634ea61e
--- /dev/null
+++ b/client/src/components/Endpoints/Settings/Bedrock.tsx
@@ -0,0 +1,65 @@
+import { useMemo } from 'react';
+import { getSettingsKeys } from 'librechat-data-provider';
+import type { SettingDefinition } from 'librechat-data-provider';
+import type { TModelSelectProps } from '~/common';
+import { componentMapping } from '~/components/SidePanel/Parameters/components';
+import { presetSettings } from '~/components/SidePanel/Parameters/settings';
+
+export default function BedrockSettings({
+  conversation,
+  setOption,
+  models,
+  readonly,
+}: TModelSelectProps) {
+  const parameters = useMemo(() => {
+    const [combinedKey, endpointKey] = getSettingsKeys(
+      conversation?.endpointType ?? conversation?.endpoint ?? '',
+      conversation?.model ?? '',
+    );
+    return presetSettings[combinedKey] ?? presetSettings[endpointKey];
+  }, [conversation]);
+
+  if (!parameters) {
+    return null;
+  }
+
+  const renderComponent = (setting: SettingDefinition | undefined) => {
+    if (!setting) {
+      return null;
+    }
+    const Component = componentMapping[setting.component];
+    if (!Component) {
+      return null;
+    }
+    const { key, default: defaultValue, ...rest } = setting;
+
+    const props = {
+      key,
+      settingKey: key,
+      defaultValue,
+      ...rest,
+      readonly,
+      setOption,
+      conversation,
+    };
+
+    if (key === 'model') {
+      return <Component {...props} options={models} />;
+    }
+
+    return <Component {...props} />;
+  };
+
+  return (
+    <div className="h-auto max-w-full overflow-x-hidden p-3">
+      <div className="grid grid-cols-1 gap-6 md:grid-cols-5">
+        <div className="flex flex-col gap-6 md:col-span-3">
+          {parameters.col1.map(renderComponent)}
+        </div>
+        <div className="flex flex-col gap-6 md:col-span-2">
+          {parameters.col2.map(renderComponent)}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/client/src/components/Endpoints/Settings/OpenAI.tsx b/client/src/components/Endpoints/Settings/OpenAI.tsx
index a95e7823c67..eaa269e703d 100644
--- a/client/src/components/Endpoints/Settings/OpenAI.tsx
+++ b/client/src/components/Endpoints/Settings/OpenAI.tsx
@@ -1,475 +1,63 @@
 import { useMemo } from 'react';
-import TextareaAutosize from 'react-textarea-autosize';
-import {
-  openAISettings,
-  EModelEndpoint,
-  imageDetailValue,
-  imageDetailNumeric,
-} from 'librechat-data-provider';
-import type { TModelSelectProps, OnInputNumberChange } from '~/common';
-import {
-  Input,
-  Label,
-  Switch,
-  Slider,
-  HoverCard,
-  InputNumber,
-  SelectDropDown,
-  HoverCardTrigger,
-} from '~/components/ui';
-import { cn, defaultTextProps, optionText, removeFocusOutlines, removeFocusRings } from '~/utils';
-import OptionHoverAlt from '~/components/SidePanel/Parameters/OptionHover';
-import { DynamicTags } from '~/components/SidePanel/Parameters';
-import { useLocalize, useDebouncedInput } from '~/hooks';
-import OptionHover from './OptionHover';
-import { ESide } from '~/common';
+import { getSettingsKeys } from 'librechat-data-provider';
+import type { SettingDefinition, DynamicSettingProps } from 'librechat-data-provider';
+import type { TModelSelectProps } from '~/common';
+import { componentMapping } from '~/components/SidePanel/Parameters/components';
+import { presetSettings } from '~/components/SidePanel/Parameters/settings';
 
-export default function Settings({ conversation, setOption, models, readonly }: TModelSelectProps) {
-  const localize = useLocalize();
-  const {
-    endpoint,
-    endpointType,
-    model,
-    modelLabel,
-    chatGptLabel,
-    promptPrefix,
-    temperature,
-    top_p: topP,
-    frequency_penalty: freqP,
-    presence_penalty: presP,
-    resendFiles,
-    imageDetail,
-    maxContextTokens,
-    max_tokens,
-  } = conversation ?? {};
+export default function OpenAISettings({
+  conversation,
+  setOption,
+  models,
+  readonly,
+}: TModelSelectProps) {
+  const parameters = useMemo(() => {
+    const [combinedKey, endpointKey] = getSettingsKeys(
+      conversation?.endpointType ?? conversation?.endpoint ?? '',
+      conversation?.model ?? '',
+    );
+    return presetSettings[combinedKey] ?? presetSettings[endpointKey];
+  }, [conversation]);
 
-  const [setChatGptLabel, chatGptLabelValue] = useDebouncedInput<string | null | undefined>({
-    setOption,
-    optionKey: 'chatGptLabel',
-    initialValue: modelLabel ?? chatGptLabel,
-  });
-  const [setPromptPrefix, promptPrefixValue] = useDebouncedInput<string | null | undefined>({
-    setOption,
-    optionKey: 'promptPrefix',
-    initialValue: promptPrefix,
-  });
-  const [setTemperature, temperatureValue] = useDebouncedInput<number | null | undefined>({
-    setOption,
-    optionKey: 'temperature',
-    initialValue: temperature,
-  });
-  const [setTopP, topPValue] = useDebouncedInput<number | null | undefined>({
-    setOption,
-    optionKey: 'top_p',
-    initialValue: topP,
-  });
-  const [setFreqP, freqPValue] = useDebouncedInput<number | null | undefined>({
-    setOption,
-    optionKey: 'frequency_penalty',
-    initialValue: freqP,
-  });
-  const [setPresP, presPValue] = useDebouncedInput<number | null | undefined>({
-    setOption,
-    optionKey: 'presence_penalty',
-    initialValue: presP,
-  });
-  const [setMaxContextTokens, maxContextTokensValue] = useDebouncedInput<number | null | undefined>(
-    {
-      setOption,
-      optionKey: 'maxContextTokens',
-      initialValue: maxContextTokens,
-    },
-  );
-  const [setMaxOutputTokens, maxOutputTokensValue] = useDebouncedInput<number | null | undefined>({
-    setOption,
-    optionKey: 'max_tokens',
-    initialValue: max_tokens,
-  });
-
-  const optionEndpoint = useMemo(() => endpointType ?? endpoint, [endpoint, endpointType]);
-  const isOpenAI = useMemo(
-    () => optionEndpoint === EModelEndpoint.openAI || optionEndpoint === EModelEndpoint.azureOpenAI,
-    [optionEndpoint],
-  );
-
-  if (!conversation) {
+  if (!parameters) {
     return null;
   }
 
-  const setModel = setOption('model');
-  const setResendFiles = setOption('resendFiles');
-  const setImageDetail = setOption('imageDetail');
+  const renderComponent = (setting: SettingDefinition | undefined) => {
+    if (!setting) {
+      return null;
+    }
+    const Component = componentMapping[setting.component];
+    if (!Component) {
+      return null;
+    }
+    const { key, default: defaultValue, ...rest } = setting;
 
-  return (
-    <div className="grid grid-cols-5 gap-6">
-      <div className="col-span-5 flex flex-col items-center justify-start gap-6 sm:col-span-3">
-        <div className="grid w-full items-center gap-2">
-          <SelectDropDown
-            value={model ?? ''}
-            setValue={setModel}
-            availableValues={models}
-            disabled={readonly}
-            className={cn(defaultTextProps, 'flex w-full resize-none', removeFocusRings)}
-            containerClassName="flex w-full resize-none"
-          />
-        </div>
-        <div className="grid w-full items-center gap-2">
-          <Label htmlFor="chatGptLabel" className="text-left text-sm font-medium">
-            {localize('com_endpoint_custom_name')}{' '}
-            <small className="opacity-40">({localize('com_endpoint_default_blank')})</small>
-          </Label>
-          <Input
-            id="chatGptLabel"
-            disabled={readonly}
-            value={(chatGptLabelValue as string) || ''}
-            onChange={setChatGptLabel}
-            placeholder={localize('com_endpoint_openai_custom_name_placeholder')}
-            className={cn(
-              defaultTextProps,
-              'flex h-10 max-h-10 w-full resize-none px-3 py-2',
-              removeFocusOutlines,
-            )}
-          />
-        </div>
-        <div className="grid w-full items-center gap-2">
-          <Label htmlFor="promptPrefix" className="text-left text-sm font-medium">
-            {localize('com_endpoint_prompt_prefix')}{' '}
-            <small className="opacity-40">({localize('com_endpoint_default_blank')})</small>
-          </Label>
-          <TextareaAutosize
-            id="promptPrefix"
-            disabled={readonly}
-            value={(promptPrefixValue as string) || ''}
-            onChange={setPromptPrefix}
-            placeholder={localize('com_endpoint_openai_prompt_prefix_placeholder')}
-            className={cn(
-              defaultTextProps,
-              'flex max-h-[138px] min-h-[100px] w-full resize-none px-3 py-2 transition-colors focus:outline-none',
-            )}
-          />
-        </div>
-        <div className="grid w-full items-start gap-2">
-          <DynamicTags
-            settingKey="stop"
-            setOption={setOption}
-            label="com_endpoint_stop"
-            labelCode={true}
-            description="com_endpoint_openai_stop"
-            descriptionCode={true}
-            placeholder="com_endpoint_stop_placeholder"
-            placeholderCode={true}
-            descriptionSide="right"
-            maxTags={isOpenAI ? 4 : undefined}
-            conversation={conversation}
-            readonly={readonly}
-          />
-        </div>
-      </div>
-      <div className="col-span-5 flex flex-col items-center justify-start gap-6 px-3 sm:col-span-2">
-        <HoverCard openDelay={300}>
-          <HoverCardTrigger className="grid w-full items-center gap-2">
-            <div className="mt-1 flex w-full justify-between">
-              <Label htmlFor="max-context-tokens" className="text-left text-sm font-medium">
-                {localize('com_endpoint_context_tokens')}{' '}
-              </Label>
-              <InputNumber
-                id="max-context-tokens"
-                stringMode={false}
-                disabled={readonly}
-                value={maxContextTokensValue as number}
-                onChange={setMaxContextTokens as OnInputNumberChange}
-                placeholder={localize('com_nav_theme_system')}
-                min={10}
-                max={2000000}
-                step={1000}
-                controls={false}
-                className={cn(
-                  defaultTextProps,
-                  cn(
-                    optionText,
-                    'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
-                    'w-1/3',
-                  ),
-                )}
-              />
-            </div>
-          </HoverCardTrigger>
-          <OptionHoverAlt
-            description="com_endpoint_context_info"
-            langCode={true}
-            side={ESide.Left}
-          />
-        </HoverCard>
-        <HoverCard openDelay={300}>
-          <HoverCardTrigger className="grid w-full items-center gap-2">
-            <div className="mt-1 flex w-full justify-between">
-              <Label htmlFor="max-output-tokens" className="text-left text-sm font-medium">
-                {localize('com_endpoint_max_output_tokens')}{' '}
-              </Label>
-              <InputNumber
-                id="max-output-tokens"
-                stringMode={false}
-                disabled={readonly}
-                value={maxOutputTokensValue as number}
-                onChange={setMaxOutputTokens as OnInputNumberChange}
-                placeholder={localize('com_nav_theme_system')}
-                min={10}
-                max={2000000}
-                step={1000}
-                controls={false}
-                className={cn(
-                  defaultTextProps,
-                  cn(
-                    optionText,
-                    'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
-                    'w-1/3',
-                  ),
-                )}
-              />
-            </div>
-          </HoverCardTrigger>
-          <OptionHoverAlt
-            description="com_endpoint_openai_max_tokens"
-            langCode={true}
-            side={ESide.Left}
-          />
-        </HoverCard>
-        <HoverCard openDelay={300}>
-          <HoverCardTrigger className="grid w-full items-center gap-2">
-            <div className="flex justify-between">
-              <Label htmlFor="temp-int" className="text-left text-sm font-medium">
-                {localize('com_endpoint_temperature')}{' '}
-                <small className="opacity-40">
-                  (
-                  {localize(
-                    'com_endpoint_default_with_num',
-                    openAISettings.temperature.default + '',
-                  )}
-                  )
-                </small>
-              </Label>
-              <InputNumber
-                id="temp-int"
-                stringMode={false}
-                disabled={readonly}
-                value={temperatureValue as number}
-                onChange={setTemperature as OnInputNumberChange}
-                max={openAISettings.temperature.max}
-                min={openAISettings.temperature.min}
-                step={openAISettings.temperature.step}
-                controls={false}
-                className={cn(
-                  defaultTextProps,
-                  cn(
-                    optionText,
-                    'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
-                  ),
-                )}
-              />
-            </div>
-            <Slider
-              disabled={readonly}
-              value={[temperatureValue ?? openAISettings.temperature.default]}
-              onValueChange={(value) => setTemperature(value[0])}
-              doubleClickHandler={() => setTemperature(openAISettings.temperature.default)}
-              max={openAISettings.temperature.max}
-              min={openAISettings.temperature.min}
-              step={openAISettings.temperature.step}
-              className="flex h-4 w-full"
-            />
-          </HoverCardTrigger>
-          <OptionHover endpoint={optionEndpoint ?? ''} type="temp" side={ESide.Left} />
-        </HoverCard>
-        <HoverCard openDelay={300}>
-          <HoverCardTrigger className="grid w-full items-center gap-2">
-            <div className="flex justify-between">
-              <Label htmlFor="top-p-int" className="text-left text-sm font-medium">
-                {localize('com_endpoint_top_p')}{' '}
-                <small className="opacity-40">
-                  ({localize('com_endpoint_default_with_num', openAISettings.top_p.default + '')})
-                </small>
-              </Label>
-              <InputNumber
-                id="top-p-int"
-                disabled={readonly}
-                value={topPValue as number}
-                onChange={(value) => setTopP(Number(value))}
-                max={openAISettings.top_p.max}
-                min={openAISettings.top_p.min}
-                step={openAISettings.top_p.step}
-                controls={false}
-                className={cn(
-                  defaultTextProps,
-                  cn(
-                    optionText,
-                    'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
-                  ),
-                )}
-              />
-            </div>
-            <Slider
-              disabled={readonly}
-              value={[topPValue ?? openAISettings.top_p.default]}
-              onValueChange={(value) => setTopP(value[0])}
-              doubleClickHandler={() => setTopP(openAISettings.top_p.default)}
-              max={openAISettings.top_p.max}
-              min={openAISettings.top_p.min}
-              step={openAISettings.top_p.step}
-              className="flex h-4 w-full"
-            />
-          </HoverCardTrigger>
-          <OptionHover endpoint={optionEndpoint ?? ''} type="topp" side={ESide.Left} />
-        </HoverCard>
+    const props = {
+      key,
+      settingKey: key,
+      defaultValue,
+      ...rest,
+      readonly,
+      setOption,
+      conversation,
+    };
 
-        <HoverCard openDelay={300}>
-          <HoverCardTrigger className="grid w-full items-center gap-2">
-            <div className="flex justify-between">
-              <Label htmlFor="freq-penalty-int" className="text-left text-sm font-medium">
-                {localize('com_endpoint_frequency_penalty')}{' '}
-                <small className="opacity-40">
-                  (
-                  {localize(
-                    'com_endpoint_default_with_num',
-                    openAISettings.frequency_penalty.default + '',
-                  )}
-                  )
-                </small>
-              </Label>
-              <InputNumber
-                id="freq-penalty-int"
-                disabled={readonly}
-                value={freqPValue as number}
-                onChange={(value) => setFreqP(Number(value))}
-                max={openAISettings.frequency_penalty.max}
-                min={openAISettings.frequency_penalty.min}
-                step={openAISettings.frequency_penalty.step}
-                controls={false}
-                className={cn(
-                  defaultTextProps,
-                  cn(
-                    optionText,
-                    'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
-                  ),
-                )}
-              />
-            </div>
-            <Slider
-              disabled={readonly}
-              value={[freqPValue ?? openAISettings.frequency_penalty.default]}
-              onValueChange={(value) => setFreqP(value[0])}
-              doubleClickHandler={() => setFreqP(openAISettings.frequency_penalty.default)}
-              max={openAISettings.frequency_penalty.max}
-              min={openAISettings.frequency_penalty.min}
-              step={openAISettings.frequency_penalty.step}
-              className="flex h-4 w-full"
-            />
-          </HoverCardTrigger>
-          <OptionHover endpoint={optionEndpoint ?? ''} type="freq" side={ESide.Left} />
-        </HoverCard>
+    if (key === 'model') {
+      return <Component {...props} options={models} />;
+    }
 
-        <HoverCard openDelay={300}>
-          <HoverCardTrigger className="grid w-full items-center gap-2">
-            <div className="flex justify-between">
-              <Label htmlFor="pres-penalty-int" className="text-left text-sm font-medium">
-                {localize('com_endpoint_presence_penalty')}{' '}
-                <small className="opacity-40">
-                  (
-                  {localize(
-                    'com_endpoint_default_with_num',
-                    openAISettings.presence_penalty.default + '',
-                  )}
-                  )
-                </small>
-              </Label>
-              <InputNumber
-                id="pres-penalty-int"
-                disabled={readonly}
-                value={presPValue as number}
-                onChange={(value) => setPresP(Number(value))}
-                max={openAISettings.presence_penalty.max}
-                min={openAISettings.presence_penalty.min}
-                step={openAISettings.presence_penalty.step}
-                controls={false}
-                className={cn(
-                  defaultTextProps,
-                  cn(
-                    optionText,
-                    'reset-rc-number-input reset-rc-number-input-text-right h-auto w-12 border-0 group-hover/temp:border-gray-200',
-                  ),
-                )}
-              />
-            </div>
-            <Slider
-              disabled={readonly}
-              value={[presPValue ?? openAISettings.presence_penalty.default]}
-              onValueChange={(value) => setPresP(value[0])}
-              doubleClickHandler={() => setPresP(openAISettings.presence_penalty.default)}
-              max={openAISettings.presence_penalty.max}
-              min={openAISettings.presence_penalty.min}
-              step={openAISettings.presence_penalty.step}
-              className="flex h-4 w-full"
-            />
-          </HoverCardTrigger>
-          <OptionHover endpoint={optionEndpoint ?? ''} type="pres" side={ESide.Left} />
-        </HoverCard>
-        <div className="w-full">
-          <div className="mb-2 flex w-full justify-between gap-2">
-            <label
-              htmlFor="resend-files"
-              className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 dark:text-gray-50"
-            >
-              <small>{localize('com_endpoint_plug_resend_files')}</small>
-            </label>
-            <label
-              htmlFor="image-detail-value"
-              className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 dark:text-gray-50"
-            >
-              <small>{localize('com_endpoint_plug_image_detail')}</small>
-            </label>
-            <Input
-              id="image-detail-value"
-              disabled={true}
-              value={imageDetail ?? openAISettings.imageDetail.default}
-              className={cn(
-                defaultTextProps,
-                optionText,
-                'flex rounded-md bg-transparent py-2 text-xs focus:outline-none focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 dark:border-gray-700',
-                'pointer-events-none max-h-5 w-12 border-0 group-hover/temp:border-gray-200',
-              )}
-            />
-          </div>
-          <div className="flex w-full justify-between gap-2">
-            <HoverCard openDelay={500}>
-              <HoverCardTrigger>
-                <Switch
-                  id="resend-files"
-                  checked={resendFiles ?? openAISettings.resendFiles.default}
-                  onCheckedChange={(checked: boolean) => setResendFiles(checked)}
-                  disabled={readonly}
-                  className="flex"
-                />
-                <OptionHover endpoint={optionEndpoint ?? ''} type="resend" side={ESide.Bottom} />
-              </HoverCardTrigger>
-            </HoverCard>
-            <HoverCard openDelay={500}>
-              <HoverCardTrigger className="flex w-[52%] md:w-[125px]">
-                <Slider
-                  id="image-detail-slider"
-                  disabled={readonly}
-                  value={[
-                    imageDetailNumeric[imageDetail ?? ''] ??
-                      imageDetailNumeric[openAISettings.imageDetail.default],
-                  ]}
-                  onValueChange={(value) => setImageDetail(imageDetailValue[value[0]])}
-                  doubleClickHandler={() => setImageDetail(openAISettings.imageDetail.default)}
-                  max={openAISettings.imageDetail.max}
-                  min={openAISettings.imageDetail.min}
-                  step={openAISettings.imageDetail.step}
-                />
-                <OptionHover endpoint={optionEndpoint ?? ''} type="detail" side={ESide.Bottom} />
-              </HoverCardTrigger>
-            </HoverCard>
-          </div>
+    return <Component {...props} />;
+  };
+
+  return (
+    <div className="h-auto max-w-full overflow-x-hidden p-3">
+      <div className="grid grid-cols-1 gap-6 md:grid-cols-5">
+        <div className="flex flex-col gap-6 md:col-span-3">
+          {parameters.col1.map(renderComponent)}
+        </div>
+        <div className="flex flex-col gap-6 md:col-span-2">
+          {parameters.col2.map(renderComponent)}
         </div>
       </div>
     </div>
diff --git a/client/src/components/Endpoints/Settings/index.ts b/client/src/components/Endpoints/Settings/index.ts
index 7d525d8a576..92af1a60b96 100644
--- a/client/src/components/Endpoints/Settings/index.ts
+++ b/client/src/components/Endpoints/Settings/index.ts
@@ -1,5 +1,6 @@
 export { default as Advanced } from './Advanced';
 export { default as AssistantsSettings } from './Assistants';
+export { default as BedrockSettings } from './Bedrock';
 export { default as OpenAISettings } from './OpenAI';
 export { default as BingAISettings } from './BingAI';
 export { default as GoogleSettings } from './Google';
diff --git a/client/src/components/Endpoints/Settings/settings.ts b/client/src/components/Endpoints/Settings/settings.ts
index bcbaab8e8ad..d58917df83d 100644
--- a/client/src/components/Endpoints/Settings/settings.ts
+++ b/client/src/components/Endpoints/Settings/settings.ts
@@ -4,6 +4,7 @@ import type { TModelSelectProps } from '~/common';
 import { GoogleSettings, PluginSettings } from './MultiView';
 import AssistantsSettings from './Assistants';
 import AnthropicSettings from './Anthropic';
+import BedrockSettings from './Bedrock';
 import BingAISettings from './BingAI';
 import OpenAISettings from './OpenAI';
 
@@ -16,6 +17,7 @@ const settings: { [key: string]: FC<TModelSelectProps> } = {
   [EModelEndpoint.azureOpenAI]: OpenAISettings,
   [EModelEndpoint.bingAI]: BingAISettings,
   [EModelEndpoint.anthropic]: AnthropicSettings,
+  [EModelEndpoint.bedrock]: BedrockSettings,
 };
 
 export const getSettings = () => {
diff --git a/client/src/components/Files/VectorStore/VectorStoreListItem.tsx b/client/src/components/Files/VectorStore/VectorStoreListItem.tsx
index 4b132e92a36..720ebd0afea 100644
--- a/client/src/components/Files/VectorStore/VectorStoreListItem.tsx
+++ b/client/src/components/Files/VectorStore/VectorStoreListItem.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useNavigate } from 'react-router-dom';
 import { TVectorStore } from '~/common';
-import { DotsIcon, TrashIcon, TrashIcon } from '~/components/svg';
+import { DotsIcon, TrashIcon } from '~/components/svg';
 import { Button } from '~/components/ui';
 
 type VectorStoreListItemProps = {
diff --git a/client/src/components/Input/ModelSelect/options.ts b/client/src/components/Input/ModelSelect/options.ts
index 0159f0782f7..24c820485ed 100644
--- a/client/src/components/Input/ModelSelect/options.ts
+++ b/client/src/components/Input/ModelSelect/options.ts
@@ -12,6 +12,7 @@ import PluginsByIndex from './PluginsByIndex';
 export const options: { [key: string]: FC<TModelSelectProps> } = {
   [EModelEndpoint.openAI]: OpenAI,
   [EModelEndpoint.custom]: OpenAI,
+  [EModelEndpoint.bedrock]: OpenAI,
   [EModelEndpoint.azureOpenAI]: OpenAI,
   [EModelEndpoint.bingAI]: BingAI,
   [EModelEndpoint.google]: Google,
diff --git a/client/src/components/Messages/Content/EditMessage.tsx b/client/src/components/Messages/Content/EditMessage.tsx
deleted file mode 100644
index dabe9fe6482..00000000000
--- a/client/src/components/Messages/Content/EditMessage.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import { useRef } from 'react';
-import { useRecoilState, useRecoilValue } from 'recoil';
-import { useUpdateMessageMutation } from 'librechat-data-provider/react-query';
-import type { TEditProps } from '~/common';
-import store from '~/store';
-import Container from './Container';
-import { useLocalize } from '~/hooks';
-
-const EditMessage = ({
-  text,
-  message,
-  isSubmitting,
-  ask,
-  enterEdit,
-  siblingIdx,
-  setSiblingIdx,
-}: TEditProps) => {
-  const [messages, setMessages] = useRecoilState(store.messages);
-  const conversation = useRecoilValue(store.conversation);
-  const textEditor = useRef<HTMLDivElement | null>(null);
-  const { conversationId, parentMessageId, messageId } = message;
-  const updateMessageMutation = useUpdateMessageMutation(conversationId ?? '');
-  const localize = useLocalize();
-
-  const resubmitMessage = () => {
-    const text = textEditor?.current?.innerText ?? '';
-    if (message.isCreatedByUser) {
-      ask({
-        text,
-        parentMessageId,
-        conversationId,
-      });
-
-      setSiblingIdx((siblingIdx ?? 0) - 1);
-    } else {
-      const parentMessage = messages?.find((msg) => msg.messageId === parentMessageId);
-
-      if (!parentMessage) {
-        return;
-      }
-      ask(
-        { ...parentMessage },
-        {
-          editedText: text,
-          editedMessageId: messageId,
-          isRegenerate: true,
-          isEdited: true,
-        },
-      );
-
-      setSiblingIdx((siblingIdx ?? 0) - 1);
-    }
-
-    enterEdit(true);
-  };
-
-  const updateMessage = () => {
-    if (!messages) {
-      return;
-    }
-    const text = textEditor?.current?.innerText ?? '';
-    updateMessageMutation.mutate({
-      conversationId: conversationId ?? '',
-      model: conversation?.model ?? 'gpt-3.5-turbo',
-      messageId,
-      text,
-    });
-    setMessages(() =>
-      messages.map((msg) =>
-        msg.messageId === messageId
-          ? {
-            ...msg,
-            text,
-            isEdited: true,
-          }
-          : msg,
-      ),
-    );
-    enterEdit(true);
-  };
-
-  return (
-    <Container>
-      <div
-        data-testid="message-text-editor"
-        className="markdown prose dark:prose-invert light w-full whitespace-pre-wrap break-words border-none focus:outline-none"
-        contentEditable={true}
-        ref={textEditor}
-        suppressContentEditableWarning={true}
-        dir="auto"
-      >
-        {text}
-      </div>
-      <div className="mt-2 flex w-full justify-center text-center">
-        <button
-          className="btn btn-primary relative mr-2"
-          disabled={isSubmitting}
-          onClick={resubmitMessage}
-        >
-          {localize('com_ui_save_submit')}
-        </button>
-        <button
-          className="btn btn-secondary relative mr-2"
-          disabled={isSubmitting}
-          onClick={updateMessage}
-        >
-          {localize('com_ui_save')}
-        </button>
-        <button className="btn btn-neutral relative" onClick={() => enterEdit(true)}>
-          {localize('com_ui_cancel')}
-        </button>
-      </div>
-    </Container>
-  );
-};
-
-export default EditMessage;
diff --git a/client/src/components/Messages/Content/Error.tsx b/client/src/components/Messages/Content/Error.tsx
index 476360080fc..b1ab7980404 100644
--- a/client/src/components/Messages/Content/Error.tsx
+++ b/client/src/components/Messages/Content/Error.tsx
@@ -42,6 +42,8 @@ const errorMessages = {
   [ErrorTypes.NO_USER_KEY]: 'com_error_no_user_key',
   [ErrorTypes.INVALID_USER_KEY]: 'com_error_invalid_user_key',
   [ErrorTypes.NO_BASE_URL]: 'com_error_no_base_url',
+  [ErrorTypes.INVALID_REQUEST]: `com_error_${ErrorTypes.INVALID_REQUEST}`,
+  [ErrorTypes.NO_SYSTEM_MESSAGES]: `com_error_${ErrorTypes.NO_SYSTEM_MESSAGES}`,
   [ErrorTypes.EXPIRED_USER_KEY]: (json: TExpiredKey, localize: LocalizeFunction) => {
     const { expiredAt, endpoint } = json;
     return localize('com_error_expired_user_key', endpoint, expiredAt);
diff --git a/client/src/components/Messages/ContentRender.tsx b/client/src/components/Messages/ContentRender.tsx
new file mode 100644
index 00000000000..4cdba914e8b
--- /dev/null
+++ b/client/src/components/Messages/ContentRender.tsx
@@ -0,0 +1,174 @@
+import { useRecoilValue } from 'recoil';
+import { useCallback, useMemo, memo } from 'react';
+import type { TMessage, TMessageContentParts } from 'librechat-data-provider';
+import type { TMessageProps } from '~/common';
+import ContentParts from '~/components/Chat/Messages/Content/ContentParts';
+import PlaceholderRow from '~/components/Chat/Messages/ui/PlaceholderRow';
+import SiblingSwitch from '~/components/Chat/Messages/SiblingSwitch';
+import HoverButtons from '~/components/Chat/Messages/HoverButtons';
+import Icon from '~/components/Chat/Messages/MessageIcon';
+import SubRow from '~/components/Chat/Messages/SubRow';
+import { useMessageActions } from '~/hooks';
+import { cn, logger } from '~/utils';
+import store from '~/store';
+
+type ContentRenderProps = {
+  message?: TMessage;
+  isCard?: boolean;
+  isMultiMessage?: boolean;
+  isSubmittingFamily?: boolean;
+} & Pick<
+  TMessageProps,
+  'currentEditId' | 'setCurrentEditId' | 'siblingIdx' | 'setSiblingIdx' | 'siblingCount'
+>;
+
+const ContentRender = memo(
+  ({
+    isCard,
+    siblingIdx,
+    siblingCount,
+    message: msg,
+    setSiblingIdx,
+    currentEditId,
+    isMultiMessage,
+    setCurrentEditId,
+    isSubmittingFamily,
+  }: ContentRenderProps) => {
+    const {
+      // ask,
+      edit,
+      index,
+      agent,
+      assistant,
+      enterEdit,
+      conversation,
+      messageLabel,
+      isSubmitting,
+      latestMessage,
+      handleContinue,
+      copyToClipboard,
+      setLatestMessage,
+      regenerateMessage,
+    } = useMessageActions({
+      message: msg,
+      currentEditId,
+      isMultiMessage,
+      setCurrentEditId,
+    });
+
+    const fontSize = useRecoilValue(store.fontSize);
+    const handleRegenerateMessage = useCallback(() => regenerateMessage(), [regenerateMessage]);
+    // const { isCreatedByUser, error, unfinished } = msg ?? {};
+    const isLast = useMemo(
+      () =>
+        !(msg?.children?.length ?? 0) && (msg?.depth === latestMessage?.depth || msg?.depth === -1),
+      [msg?.children, msg?.depth, latestMessage?.depth],
+    );
+
+    if (!msg) {
+      return null;
+    }
+
+    const isLatestMessage = msg.messageId === latestMessage?.messageId;
+    const showCardRender = isLast && !(isSubmittingFamily === true) && isCard === true;
+    const isLatestCard = isCard === true && !(isSubmittingFamily === true) && isLatestMessage;
+    const clickHandler =
+      showCardRender && !isLatestMessage
+        ? () => {
+          logger.log(`Message Card click: Setting ${msg.messageId} as latest message`);
+          logger.dir(msg);
+          setLatestMessage(msg);
+        }
+        : undefined;
+
+    return (
+      <div
+        aria-label={`message-${msg.depth}-${msg.messageId}`}
+        className={cn(
+          'final-completion group mx-auto flex flex-1 gap-3',
+          isCard === true
+            ? 'relative w-full gap-1 rounded-lg border border-border-medium bg-surface-primary-alt p-2 md:w-1/2 md:gap-3 md:p-4'
+            : 'md:max-w-3xl md:px-5 lg:max-w-[40rem] lg:px-1 xl:max-w-[48rem] xl:px-5',
+          isLatestCard === true ? 'bg-surface-secondary' : '',
+          showCardRender ? 'cursor-pointer transition-colors duration-300' : '',
+          'focus:outline-none focus:ring-2 focus:ring-border-xheavy',
+        )}
+        onClick={clickHandler}
+        onKeyDown={(e) => {
+          if ((e.key === 'Enter' || e.key === ' ') && clickHandler) {
+            clickHandler();
+          }
+        }}
+        role={showCardRender ? 'button' : undefined}
+        tabIndex={showCardRender ? 0 : undefined}
+      >
+        {isLatestCard === true && (
+          <div className="absolute right-0 top-0 m-2 h-3 w-3 rounded-full bg-text-primary" />
+        )}
+        <div className="relative flex flex-shrink-0 flex-col items-end">
+          <div>
+            <div className="pt-0.5">
+              <div className="flex h-6 w-6 items-center justify-center overflow-hidden rounded-full">
+                <Icon
+                  message={msg}
+                  conversation={conversation}
+                  assistant={assistant}
+                  agent={agent}
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          className={cn(
+            'relative flex w-11/12 flex-col',
+            msg.isCreatedByUser === true ? '' : 'agent-turn',
+          )}
+        >
+          <h2 className={cn('select-none font-semibold', fontSize)}>{messageLabel}</h2>
+          <div className="flex-col gap-1 md:gap-3">
+            <div className="flex max-w-full flex-grow flex-col gap-0">
+              <ContentParts
+                content={msg.content as Array<TMessageContentParts | undefined>}
+                messageId={msg.messageId}
+                isCreatedByUser={msg.isCreatedByUser}
+                isLast={isLast}
+                isSubmitting={isSubmitting}
+                edit={edit}
+                enterEdit={enterEdit}
+                siblingIdx={siblingIdx}
+                setSiblingIdx={setSiblingIdx}
+              />
+            </div>
+          </div>
+          {!(msg.children?.length ?? 0) && (isSubmittingFamily === true || isSubmitting) ? (
+            <PlaceholderRow isCard={isCard} />
+          ) : (
+            <SubRow classes="text-xs">
+              <SiblingSwitch
+                siblingIdx={siblingIdx}
+                siblingCount={siblingCount}
+                setSiblingIdx={setSiblingIdx}
+              />
+              <HoverButtons
+                index={index}
+                isEditing={edit}
+                message={msg}
+                enterEdit={enterEdit}
+                isSubmitting={isSubmitting}
+                conversation={conversation ?? null}
+                regenerate={handleRegenerateMessage}
+                copyToClipboard={copyToClipboard}
+                handleContinue={handleContinue}
+                latestMessage={latestMessage}
+                isLast={isLast}
+              />
+            </SubRow>
+          )}
+        </div>
+      </div>
+    );
+  },
+);
+
+export default ContentRender;
diff --git a/client/src/components/Messages/MessageContent.tsx b/client/src/components/Messages/MessageContent.tsx
new file mode 100644
index 00000000000..e472b1e8ddc
--- /dev/null
+++ b/client/src/components/Messages/MessageContent.tsx
@@ -0,0 +1,82 @@
+import React from 'react';
+import { useMessageProcess } from '~/hooks';
+import type { TMessageProps } from '~/common';
+// eslint-disable-next-line import/no-cycle
+import MultiMessage from '~/components/Chat/Messages/MultiMessage';
+import ContentRender from './ContentRender';
+
+const MessageContainer = React.memo(
+  ({
+    handleScroll,
+    children,
+  }: {
+    handleScroll: (event?: unknown) => void;
+    children: React.ReactNode;
+  }) => {
+    return (
+      <div
+        className="text-token-text-primary w-full border-0 bg-transparent dark:border-0 dark:bg-transparent"
+        onWheel={handleScroll}
+        onTouchMove={handleScroll}
+      >
+        {children}
+      </div>
+    );
+  },
+);
+
+export default function MessageContent(props: TMessageProps) {
+  const {
+    showSibling,
+    conversation,
+    handleScroll,
+    siblingMessage,
+    latestMultiMessage,
+    isSubmittingFamily,
+  } = useMessageProcess({ message: props.message });
+  const { message, currentEditId, setCurrentEditId } = props;
+
+  if (!message || typeof message !== 'object') {
+    return null;
+  }
+
+  const { children, messageId = null } = message;
+
+  return (
+    <>
+      <MessageContainer handleScroll={handleScroll}>
+        {showSibling ? (
+          <div className="m-auto my-2 flex justify-center p-4 py-2 md:gap-6">
+            <div className="flex w-full flex-row flex-wrap justify-between gap-1 md:max-w-5xl md:flex-nowrap md:gap-2 lg:max-w-5xl xl:max-w-6xl">
+              <ContentRender
+                {...props}
+                message={message}
+                isSubmittingFamily={isSubmittingFamily}
+                isCard
+              />
+              <ContentRender
+                {...props}
+                isMultiMessage
+                isCard
+                message={siblingMessage ?? latestMultiMessage ?? undefined}
+                isSubmittingFamily={isSubmittingFamily}
+              />
+            </div>
+          </div>
+        ) : (
+          <div className="m-auto justify-center p-4 py-2 md:gap-6 ">
+            <ContentRender {...props} />
+          </div>
+        )}
+      </MessageContainer>
+      <MultiMessage
+        key={messageId}
+        messageId={messageId}
+        conversation={conversation}
+        messagesTree={children ?? []}
+        currentEditId={currentEditId}
+        setCurrentEditId={setCurrentEditId}
+      />
+    </>
+  );
+}
diff --git a/client/src/components/Nav/AccountSettings.tsx b/client/src/components/Nav/AccountSettings.tsx
index f1fd026f9b0..1b227d36638 100644
--- a/client/src/components/Nav/AccountSettings.tsx
+++ b/client/src/components/Nav/AccountSettings.tsx
@@ -1,23 +1,20 @@
-import { FileText } from 'lucide-react';
 import { useRecoilState } from 'recoil';
+import * as Select from '@ariakit/react/select';
 import { Fragment, useState, memo } from 'react';
-import { Menu, MenuItem, MenuButton, MenuItems, Transition } from '@headlessui/react';
+import { FileText, LogOut } from 'lucide-react';
 import { useGetUserBalance, useGetStartupConfig } from 'librechat-data-provider/react-query';
+import { LinkIcon, GearIcon, DropdownMenuSeparator } from '~/components';
 import FilesView from '~/components/Chat/Input/Files/FilesView';
 import { useAuthContext } from '~/hooks/AuthContext';
 import useAvatar from '~/hooks/Messages/useAvatar';
-import { LinkIcon, GearIcon } from '~/components';
 import { UserIcon } from '~/components/svg';
 import { useLocalize } from '~/hooks';
 import Settings from './Settings';
-import NavLink from './NavLink';
-import Logout from './Logout';
-import { cn } from '~/utils/';
 import store from '~/store';
 
 function AccountSettings() {
   const localize = useLocalize();
-  const { user, isAuthenticated } = useAuthContext();
+  const { user, isAuthenticated, logout } = useAuthContext();
   const { data: startupConfig } = useGetStartupConfig();
   const balanceQuery = useGetUserBalance({
     enabled: !!isAuthenticated && startupConfig?.checkBalance,
@@ -29,113 +26,105 @@ function AccountSettings() {
   const name = user?.avatar ?? user?.username ?? '';
 
   return (
-    <>
-      <Menu as="div" className="group relative">
-        {({ open }) => (
-          <>
-            <MenuButton
-              aria-label={localize('com_nav_account_settings')}
-              className={cn(
-                'group-ui-open:bg-surface-tertiary duration-350 mt-text-sm flex h-auto w-full items-center gap-2 rounded-lg p-2 text-sm transition-colors hover:bg-surface-secondary',
-                open ? 'bg-surface-secondary' : '',
-              )}
-              data-testid="nav-user"
-            >
-              <div className="-ml-0.9 -mt-0.8 h-8 w-8 flex-shrink-0">
-                <div className="relative flex">
-                  {name.length === 0 ? (
-                    <div
-                      style={{
-                        backgroundColor: 'rgb(121, 137, 255)',
-                        width: '32px',
-                        height: '32px',
-                        boxShadow: 'rgba(240, 246, 252, 0.1) 0px 0px 0px 1px',
-                      }}
-                      className="relative flex items-center justify-center rounded-full p-1 text-text-primary"
-                    >
-                      <UserIcon />
-                    </div>
-                  ) : (
-                    <img className="rounded-full" src={user?.avatar ?? avatarSrc} alt="avatar" />
-                  )}
-                </div>
-              </div>
+    <Select.SelectProvider>
+      <Select.Select
+        aria-label={localize('com_nav_account_settings')}
+        data-testid="nav-user"
+        className="duration-350 mt-text-sm flex h-auto w-full items-center gap-2 rounded-xl p-2 text-sm transition-all duration-200 ease-in-out hover:bg-accent"
+      >
+        <div className="-ml-0.9 -mt-0.8 h-8 w-8 flex-shrink-0">
+          <div className="relative flex">
+            {name.length === 0 ? (
               <div
-                className="mt-2 grow overflow-hidden text-ellipsis whitespace-nowrap text-left text-text-primary"
-                style={{ marginTop: '0', marginLeft: '0' }}
+                style={{
+                  backgroundColor: 'rgb(121, 137, 255)',
+                  width: '32px',
+                  height: '32px',
+                  boxShadow: 'rgba(240, 246, 252, 0.1) 0px 0px 0px 1px',
+                }}
+                className="relative flex items-center justify-center rounded-full p-1 text-text-primary"
+                aria-hidden="true"
               >
-                {user?.name ?? user?.username ?? localize('com_nav_user')}
+                <UserIcon />
               </div>
-            </MenuButton>
-
-            <Transition
-              as={Fragment}
-              enter="transition ease-out duration-100 transform"
-              enterFrom="translate-y-2 opacity-0"
-              enterTo="translate-y-0 opacity-100"
-              leave="transition ease-in duration-100 transform"
-              leaveFrom="translate-y-0 opacity-100"
-              leaveTo="translate-y-2 opacity-0"
-            >
-              <MenuItems className="absolute bottom-full left-0 z-[100] mb-1 mt-1 w-full translate-y-0 overflow-hidden rounded-lg border border-border-medium bg-header-primary p-1.5 opacity-100 shadow-lg outline-none">
-                <div className="text-token-text-secondary ml-3 mr-2 py-2 text-sm" role="none">
-                  {user?.email ?? localize('com_nav_user')}
-                </div>
-                <div className="my-1.5 h-px border-b border-border-medium" role="none" />
-                {startupConfig?.checkBalance === true &&
-                  balanceQuery.data != null &&
-                  !isNaN(parseFloat(balanceQuery.data)) && (
-                  <>
-                    <div className="text-token-text-secondary ml-3 mr-2 py-2 text-sm">
-                      {`Balance: ${parseFloat(balanceQuery.data).toFixed(2)}`}
-                    </div>
-                    <div className="my-1.5 h-px border-b border-border-medium" role="none" />
-                  </>
-                )}
-                <MenuItem>
-                  {({ focus }) => (
-                    <NavLink
-                      className={focus ? 'bg-surface-hover' : ''}
-                      svg={() => <FileText className="icon-md" />}
-                      text={localize('com_nav_my_files')}
-                      clickHandler={() => setShowFiles(true)}
-                    />
-                  )}
-                </MenuItem>
-                {startupConfig?.helpAndFaqURL !== '/' && (
-                  <MenuItem>
-                    {({ focus }) => (
-                      <NavLink
-                        className={focus ? 'bg-surface-hover' : ''}
-                        svg={() => <LinkIcon />}
-                        text={localize('com_nav_help_faq')}
-                        clickHandler={() => window.open(startupConfig?.helpAndFaqURL, '_blank')}
-                      />
-                    )}
-                  </MenuItem>
-                )}
-                <MenuItem>
-                  {({ focus }) => (
-                    <NavLink
-                      className={focus ? 'bg-surface-hover' : ''}
-                      svg={() => <GearIcon className="icon-md" />}
-                      text={localize('com_nav_settings')}
-                      clickHandler={() => setShowSettings(true)}
-                    />
-                  )}
-                </MenuItem>
-                <div className="my-1.5 h-px border-b border-border-medium" role="none" />
-                <MenuItem>
-                  {({ focus }) => <Logout className={focus ? 'bg-surface-hover' : ''} />}
-                </MenuItem>
-              </MenuItems>
-            </Transition>
+            ) : (
+              <img
+                className="rounded-full"
+                src={user?.avatar ?? avatarSrc}
+                alt={`${name}'s avatar`}
+              />
+            )}
+          </div>
+        </div>
+        <div
+          className="mt-2 grow overflow-hidden text-ellipsis whitespace-nowrap text-left text-text-primary"
+          style={{ marginTop: '0', marginLeft: '0' }}
+        >
+          {user?.name ?? user?.username ?? localize('com_nav_user')}
+        </div>
+      </Select.Select>
+      <Select.SelectPopover
+        className="popover-ui w-[235px]"
+        style={{
+          transformOrigin: 'bottom',
+          marginRight: '0px',
+          translate: '0px',
+        }}
+      >
+        <div className="text-token-text-secondary ml-3 mr-2 py-2 text-sm" role="note">
+          {user?.email ?? localize('com_nav_user')}
+        </div>
+        <DropdownMenuSeparator />
+        {startupConfig?.checkBalance === true &&
+          balanceQuery.data != null &&
+          !isNaN(parseFloat(balanceQuery.data)) && (
+          <>
+            <div className="text-token-text-secondary ml-3 mr-2 py-2 text-sm" role="note">
+              {`Balance: ${parseFloat(balanceQuery.data).toFixed(2)}`}
+            </div>
+            <DropdownMenuSeparator />
           </>
         )}
-      </Menu>
+        <Select.SelectItem
+          value=""
+          onClick={() => setShowFiles(true)}
+          className="select-item text-sm"
+        >
+          <FileText className="icon-md" aria-hidden="true" />
+          {localize('com_nav_my_files')}
+        </Select.SelectItem>
+        {startupConfig?.helpAndFaqURL !== '/' && (
+          <Select.SelectItem
+            value=""
+            onClick={() => window.open(startupConfig?.helpAndFaqURL, '_blank')}
+            className="select-item text-sm"
+          >
+            <LinkIcon aria-hidden="true" />
+            {localize('com_nav_help_faq')}
+          </Select.SelectItem>
+        )}
+        <Select.SelectItem
+          value=""
+          onClick={() => setShowSettings(true)}
+          className="select-item text-sm"
+        >
+          <GearIcon className="icon-md" aria-hidden="true" />
+          {localize('com_nav_settings')}
+        </Select.SelectItem>
+        <DropdownMenuSeparator />
+        <Select.SelectItem
+          aria-selected={true}
+          onClick={() => logout()}
+          value="logout"
+          className="select-item text-sm"
+        >
+          <LogOut className="icon-md" />
+          {localize('com_nav_log_out')}
+        </Select.SelectItem>
+      </Select.SelectPopover>
       {showFiles && <FilesView open={showFiles} onOpenChange={setShowFiles} />}
       {showSettings && <Settings open={showSettings} onOpenChange={setShowSettings} />}
-    </>
+    </Select.SelectProvider>
   );
 }
 
diff --git a/client/src/components/Nav/Bookmarks/BookmarkNav.tsx b/client/src/components/Nav/Bookmarks/BookmarkNav.tsx
index fc3ffbe8fd2..d0fae61c469 100644
--- a/client/src/components/Nav/Bookmarks/BookmarkNav.tsx
+++ b/client/src/components/Nav/Bookmarks/BookmarkNav.tsx
@@ -14,9 +14,10 @@ import store from '~/store';
 type BookmarkNavProps = {
   tags: string[];
   setTags: (tags: string[]) => void;
+  isSmallScreen: boolean;
 };
 
-const BookmarkNav: FC<BookmarkNavProps> = ({ tags, setTags }: BookmarkNavProps) => {
+const BookmarkNav: FC<BookmarkNavProps> = ({ tags, setTags, isSmallScreen }: BookmarkNavProps) => {
   const localize = useLocalize();
   const location = useLocation();
 
@@ -40,6 +41,7 @@ const BookmarkNav: FC<BookmarkNavProps> = ({ tags, setTags }: BookmarkNavProps)
             className={cn(
               'mt-text-sm flex h-10 w-full items-center gap-2 rounded-lg p-2 text-sm transition-colors duration-200 hover:bg-surface-hover',
               open ? 'bg-surface-hover' : '',
+              isSmallScreen ? 'h-14 rounded-2xl' : '',
             )}
             data-testid="bookmark-menu"
           >
diff --git a/client/src/components/Nav/ExportConversation/ExportModal.tsx b/client/src/components/Nav/ExportConversation/ExportModal.tsx
index 27c4db2a6ef..4bdfbe09931 100644
--- a/client/src/components/Nav/ExportConversation/ExportModal.tsx
+++ b/client/src/components/Nav/ExportConversation/ExportModal.tsx
@@ -33,7 +33,7 @@ export default function ExportModal({
   ];
 
   useEffect(() => {
-    setFileName(filenamify(String(conversation?.title || 'file')));
+    setFileName(filenamify(String(conversation?.title ?? 'file')));
     setType('screenshot');
     setIncludeOptions(true);
     setExportBranches(false);
diff --git a/client/src/components/Nav/Logout.tsx b/client/src/components/Nav/Logout.tsx
deleted file mode 100644
index 6b7d476d47e..00000000000
--- a/client/src/components/Nav/Logout.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { forwardRef } from 'react';
-import { useAuthContext } from '~/hooks/AuthContext';
-import { LogOutIcon } from '~/components/svg';
-import { useLocalize } from '~/hooks';
-import { cn } from '~/utils';
-
-const Logout = forwardRef<HTMLButtonElement, { className?: string }>((props, ref) => {
-  const { logout } = useAuthContext();
-  const localize = useLocalize();
-
-  return (
-    <button
-      ref={ref}
-      className={cn(
-        'group group flex w-full cursor-pointer items-center gap-2 rounded p-2.5 text-sm text-text-primary transition-colors duration-200 hover:bg-surface-hover data-[focus]:bg-surface-hover',
-        props.className ?? '',
-      )}
-      onClick={() => logout()}
-    >
-      <LogOutIcon />
-      {localize('com_nav_log_out')}
-    </button>
-  );
-});
-
-export default Logout;
diff --git a/client/src/components/Nav/MobileNav.tsx b/client/src/components/Nav/MobileNav.tsx
index 35defea5081..d325842487d 100644
--- a/client/src/components/Nav/MobileNav.tsx
+++ b/client/src/components/Nav/MobileNav.tsx
@@ -15,11 +15,12 @@ export default function MobileNav({
   const { title = 'New Chat' } = conversation || {};
 
   return (
-    <div className="border-token-border-medium bg-token-main-surface-primary sticky top-0 z-10 flex min-h-[40px] items-center justify-center border-b bg-white pl-1 dark:bg-gray-800 dark:text-white md:hidden md:hidden">
+    <div className="bg-token-main-surface-primary sticky top-0 z-10 flex min-h-[40px] items-center justify-center bg-white pl-1 dark:bg-gray-800 dark:text-white md:hidden">
       <button
         type="button"
         data-testid="mobile-header-new-chat-button"
-        className="inline-flex h-10 w-10 items-center justify-center rounded-md hover:text-gray-800 focus:outline-none focus:ring-2 focus:ring-inset focus:ring-white active:opacity-50 dark:hover:text-white"
+        aria-label={localize('com_nav_open_sidebar')}
+        className="m-1 inline-flex size-10 items-center justify-center rounded-full hover:bg-surface-hover"
         onClick={() =>
           setNavVisible((prev) => {
             localStorage.setItem('navVisible', JSON.stringify(!prev));
@@ -49,7 +50,8 @@ export default function MobileNav({
       </h1>
       <button
         type="button"
-        className="inline-flex h-10 w-10 items-center justify-center rounded-md hover:text-gray-800 focus:outline-none focus:ring-2 focus:ring-inset focus:ring-white active:opacity-50 dark:hover:text-white"
+        aria-label={localize('com_ui_new_chat')}
+        className="m-1 inline-flex size-10 items-center justify-center rounded-full hover:bg-surface-hover"
         onClick={() => newConversation()}
       >
         <svg
diff --git a/client/src/components/Nav/Nav.tsx b/client/src/components/Nav/Nav.tsx
index 3beab9e91eb..acf2284b39c 100644
--- a/client/src/components/Nav/Nav.tsx
+++ b/client/src/components/Nav/Nav.tsx
@@ -14,7 +14,6 @@ import {
   useConversations,
 } from '~/hooks';
 import { useConversationsInfiniteQuery } from '~/data-provider';
-import { TooltipProvider, Tooltip } from '~/components/ui';
 import { Conversations } from '~/components/Conversations';
 import BookmarkNav from './Bookmarks/BookmarkNav';
 import AccountSettings from './AccountSettings';
@@ -130,111 +129,112 @@ const Nav = ({
   };
 
   return (
-    <TooltipProvider delayDuration={250}>
-      <Tooltip>
-        <div
-          data-testid="nav"
-          className={
-            'nav active max-w-[320px] flex-shrink-0 overflow-x-hidden bg-surface-primary-alt md:max-w-[260px]'
-          }
-          style={{
-            width: navVisible ? navWidth : '0px',
-            visibility: navVisible ? 'visible' : 'hidden',
-            transition: 'width 0.2s, visibility 0.2s',
-          }}
-        >
-          <div className="h-full w-[320px] md:w-[260px]">
-            <div className="flex h-full min-h-0 flex-col">
+    <>
+      <div
+        data-testid="nav"
+        className={
+          'nav active max-w-[320px] flex-shrink-0 overflow-x-hidden bg-surface-primary-alt md:max-w-[260px]'
+        }
+        style={{
+          width: navVisible ? navWidth : '0px',
+          visibility: navVisible ? 'visible' : 'hidden',
+          transition: 'width 0.2s, visibility 0.2s',
+        }}
+      >
+        <div className="h-full w-[320px] md:w-[260px]">
+          <div className="flex h-full min-h-0 flex-col">
+            <div
+              className={cn(
+                'flex h-full min-h-0 flex-col transition-opacity',
+                isToggleHovering && !isSmallScreen ? 'opacity-50' : 'opacity-100',
+              )}
+            >
               <div
                 className={cn(
-                  'flex h-full min-h-0 flex-col transition-opacity',
-                  isToggleHovering && !isSmallScreen ? 'opacity-50' : 'opacity-100',
+                  'scrollbar-trigger relative h-full w-full flex-1 items-start border-white/20',
                 )}
               >
-                <div
-                  className={cn(
-                    'scrollbar-trigger relative h-full w-full flex-1 items-start border-white/20',
-                  )}
+                <nav
+                  id="chat-history-nav"
+                  aria-label={localize('com_ui_chat_history')}
+                  className="flex h-full w-full flex-col px-3 pb-3.5"
                 >
-                  <nav
-                    id="chat-history-nav"
-                    aria-label={localize('com_ui_chat_history')}
-                    className="flex h-full w-full flex-col px-3 pb-3.5"
+                  <div
+                    className={cn(
+                      '-mr-2 flex-1 flex-col overflow-y-auto pr-2 transition-opacity duration-500',
+                      isHovering ? '' : 'scrollbar-transparent',
+                    )}
+                    onMouseEnter={handleMouseEnter}
+                    onMouseLeave={handleMouseLeave}
+                    ref={containerRef}
                   >
-                    <div
-                      className={cn(
-                        '-mr-2 flex-1 flex-col overflow-y-auto pr-2 transition-opacity duration-500',
-                        isHovering ? '' : 'scrollbar-transparent',
-                      )}
-                      onMouseEnter={handleMouseEnter}
-                      onMouseLeave={handleMouseLeave}
-                      ref={containerRef}
-                    >
-                      {isSmallScreen == true ? (
-                        <div className="pt-3.5">
-                          {isSearchEnabled === true && (
-                            <SearchBar clearSearch={clearSearch} isSmallScreen={isSmallScreen} />
-                          )}
-                          {hasAccessToBookmarks === true && (
-                            <BookmarkNav tags={tags} setTags={setTags} />
-                          )}
-                        </div>
-                      ) : (
-                        <NewChat
-                          toggleNav={itemToggleNav}
-                          subHeaders={
-                            <>
-                              {isSearchEnabled === true && (
-                                <SearchBar
-                                  clearSearch={clearSearch}
-                                  isSmallScreen={isSmallScreen}
-                                />
-                              )}
-                              {hasAccessToBookmarks === true && (
-                                <BookmarkNav tags={tags} setTags={setTags} />
-                              )}
-                            </>
-                          }
-                        />
-                      )}
-
-                      <Conversations
-                        conversations={conversations}
-                        moveToTop={moveToTop}
+                    {isSmallScreen == true ? (
+                      <div className="pt-3.5">
+                        {isSearchEnabled === true && (
+                          <SearchBar clearSearch={clearSearch} isSmallScreen={isSmallScreen} />
+                        )}
+                        {hasAccessToBookmarks === true && (
+                          <BookmarkNav
+                            tags={tags}
+                            setTags={setTags}
+                            isSmallScreen={isSmallScreen}
+                          />
+                        )}
+                      </div>
+                    ) : (
+                      <NewChat
                         toggleNav={itemToggleNav}
+                        subHeaders={
+                          <>
+                            {isSearchEnabled === true && (
+                              <SearchBar clearSearch={clearSearch} isSmallScreen={isSmallScreen} />
+                            )}
+                            <BookmarkNav
+                              tags={tags}
+                              setTags={setTags}
+                              isSmallScreen={isSmallScreen}
+                            />
+                          </>
+                        }
                       />
-                      {(isFetchingNextPage || showLoading) && (
-                        <Spinner className={cn('m-1 mx-auto mb-4 h-4 w-4 text-text-primary')} />
-                      )}
-                    </div>
-                    <AccountSettings />
-                  </nav>
-                </div>
+                    )}
+
+                    <Conversations
+                      conversations={conversations}
+                      moveToTop={moveToTop}
+                      toggleNav={itemToggleNav}
+                    />
+                    {(isFetchingNextPage || showLoading) && (
+                      <Spinner className={cn('m-1 mx-auto mb-4 h-4 w-4 text-text-primary')} />
+                    )}
+                  </div>
+                  <AccountSettings />
+                </nav>
               </div>
             </div>
           </div>
         </div>
-        <NavToggle
-          isHovering={isToggleHovering}
-          setIsHovering={setIsToggleHovering}
-          onToggle={toggleNavVisible}
-          navVisible={navVisible}
-          className="fixed left-0 top-1/2 z-40 hidden md:flex"
-        />
-        <div
-          role="button"
-          tabIndex={0}
-          className={`nav-mask ${navVisible ? 'active' : ''}`}
-          onClick={toggleNavVisible}
-          onKeyDown={(e) => {
-            if (e.key === 'Enter' || e.key === ' ') {
-              toggleNavVisible();
-            }
-          }}
-          aria-label="Toggle navigation"
-        />
-      </Tooltip>
-    </TooltipProvider>
+      </div>
+      <NavToggle
+        isHovering={isToggleHovering}
+        setIsHovering={setIsToggleHovering}
+        onToggle={toggleNavVisible}
+        navVisible={navVisible}
+        className="fixed left-0 top-1/2 z-40 hidden md:flex"
+      />
+      <div
+        role="button"
+        tabIndex={0}
+        className={`nav-mask ${navVisible ? 'active' : ''}`}
+        onClick={toggleNavVisible}
+        onKeyDown={(e) => {
+          if (e.key === 'Enter' || e.key === ' ') {
+            toggleNavVisible();
+          }
+        }}
+        aria-label="Toggle navigation"
+      />
+    </>
   );
 };
 
diff --git a/client/src/components/Nav/NavLink.tsx b/client/src/components/Nav/NavLink.tsx
index 598f2df4299..e30cb699035 100644
--- a/client/src/components/Nav/NavLink.tsx
+++ b/client/src/components/Nav/NavLink.tsx
@@ -1,10 +1,10 @@
-import { FC, forwardRef } from 'react';
+import React, { FC, forwardRef } from 'react';
 import { cn } from '~/utils/';
 
 interface Props {
   svg: () => JSX.Element;
   text: string;
-  clickHandler?: () => void;
+  clickHandler?: React.MouseEventHandler<HTMLButtonElement>;
   className?: string;
   disabled?: boolean;
 }
@@ -13,10 +13,10 @@ const NavLink: FC<Props> = forwardRef<HTMLButtonElement, Props>((props, ref) =>
   const { svg, text, clickHandler, disabled, className = '' } = props;
   const defaultProps: {
     className: string;
-    onClick?: () => void;
+    onClick?: React.MouseEventHandler<HTMLButtonElement>;
   } = {
     className: cn(
-      'w-full flex gap-2 rounded p-2.5 text-sm cursor-pointer group items-center transition-colors duration-200 text-text-primary hover:bg-surface-hover',
+      'w-full flex gap-2 rounded p-2.5 text-sm cursor-pointer group items-center transition-colors duration-200 text-text-primary',
       className,
       {
         'opacity-50 pointer-events-none': disabled,
diff --git a/client/src/components/Nav/NavToggle.tsx b/client/src/components/Nav/NavToggle.tsx
index b2367a80d64..1c4333b0909 100644
--- a/client/src/components/Nav/NavToggle.tsx
+++ b/client/src/components/Nav/NavToggle.tsx
@@ -1,5 +1,5 @@
-import { TooltipTrigger, TooltipContent } from '~/components/ui';
 import { useLocalize, useLocalStorage } from '~/hooks';
+import { TooltipAnchor } from '~/components/ui';
 import { cn } from '~/utils';
 
 export default function NavToggle({
@@ -15,7 +15,6 @@ export default function NavToggle({
   const transition = {
     transition: 'transform 0.3s ease, opacity 0.2s ease',
   };
-  const [newUser] = useLocalStorage('newUser', true);
 
   const rotationDegree = 15;
   const rotation = isHovering || !navVisible ? `${rotationDegree}deg` : '0deg';
@@ -33,46 +32,44 @@ export default function NavToggle({
       onMouseEnter={() => setIsHovering(true)}
       onMouseLeave={() => setIsHovering(false)}
     >
-      <TooltipTrigger asChild>
-        <button
-          onClick={onToggle}
-          id={`toggle-${side}-nav`}
-          aria-label={`toggle-${side === 'left' ? 'chat-history' : 'controls'}-nav`}
-        >
-          <span className="" data-state="closed">
-            <div
-              className="flex h-[72px] w-8 items-center justify-center"
-              style={{ ...transition, opacity: isHovering ? 1 : 0.25 }}
-            >
-              <div className="flex h-6 w-6 flex-col items-center">
-                {/* Top bar */}
-                <div
-                  className="h-3 w-1 rounded-full bg-black dark:bg-white"
-                  style={{
-                    ...transition,
-                    transform: `translateY(0.15rem) rotate(${topBarRotation}) translateZ(0px)`,
-                  }}
-                />
-                {/* Bottom bar */}
-                <div
-                  className="h-3 w-1 rounded-full bg-black dark:bg-white"
-                  style={{
-                    ...transition,
-                    transform: `translateY(-0.15rem) rotate(${bottomBarRotation}) translateZ(0px)`,
-                  }}
-                />
-              </div>
+      <TooltipAnchor
+        side={side === 'right' ? 'left' : 'right'}
+        aria-label={`toggle-${side === 'left' ? 'chat-history' : 'controls'}-nav`}
+        id={`toggle-${side}-nav`}
+        onClick={onToggle}
+        role="button"
+        description={
+          navVisible ? localize('com_nav_close_sidebar') : localize('com_nav_open_sidebar')
+        }
+        className="flex items-center justify-center"
+        tabIndex={0}
+      >
+        <span className="" data-state="closed">
+          <div
+            className="flex h-[72px] w-8 items-center justify-center"
+            style={{ ...transition, opacity: isHovering ? 1 : 0.25 }}
+          >
+            <div className="flex h-6 w-6 flex-col items-center">
+              {/* Top bar */}
+              <div
+                className="h-3 w-1 rounded-full bg-black dark:bg-white"
+                style={{
+                  ...transition,
+                  transform: `translateY(0.15rem) rotate(${topBarRotation}) translateZ(0px)`,
+                }}
+              />
+              {/* Bottom bar */}
+              <div
+                className="h-3 w-1 rounded-full bg-black dark:bg-white"
+                style={{
+                  ...transition,
+                  transform: `translateY(-0.15rem) rotate(${bottomBarRotation}) translateZ(0px)`,
+                }}
+              />
             </div>
-            <TooltipContent
-              forceMount={newUser ? true : undefined}
-              side={side === 'right' ? 'left' : 'right'}
-              sideOffset={4}
-            >
-              {navVisible ? localize('com_nav_close_sidebar') : localize('com_nav_open_sidebar')}
-            </TooltipContent>
-          </span>
-        </button>
-      </TooltipTrigger>
+          </div>
+        </span>
+      </TooltipAnchor>
     </div>
   );
 }
diff --git a/client/src/components/Nav/NewChat.tsx b/client/src/components/Nav/NewChat.tsx
index 5646706d502..35b8bb6050f 100644
--- a/client/src/components/Nav/NewChat.tsx
+++ b/client/src/components/Nav/NewChat.tsx
@@ -2,14 +2,13 @@ import { Search } from 'lucide-react';
 import { useRecoilValue } from 'recoil';
 import { useNavigate } from 'react-router-dom';
 import { useGetEndpointsQuery } from 'librechat-data-provider/react-query';
-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from '~/components/ui';
+import type { TConversation } from 'librechat-data-provider';
 import { getEndpointField, getIconEndpoint, getIconKey } from '~/utils';
 import { icons } from '~/components/Chat/Menus/Endpoints/Icons';
 import ConvoIconURL from '~/components/Endpoints/ConvoIconURL';
 import { useLocalize, useNewConvo } from '~/hooks';
 import { NewChatIcon } from '~/components/svg';
 import store from '~/store';
-import type { TConversation } from 'librechat-data-provider';
 
 const NewChatButtonIcon = ({ conversation }: { conversation: TConversation | null }) => {
   const searchQuery = useRecoilValue(store.searchQuery);
@@ -80,43 +79,28 @@ export default function NewChat({
   };
 
   return (
-    <TooltipProvider delayDuration={250}>
-      <Tooltip>
-        <div className="sticky left-0 right-0 top-0 z-50 bg-surface-primary-alt pt-3.5">
-          <div className="pb-0.5 last:pb-0" style={{ transform: 'none' }}>
-            <a
-              href="/"
-              tabIndex={0}
-              data-testid="nav-new-chat"
-              onClick={clickHandler}
-              className="group flex h-10 items-center gap-2 rounded-lg px-2 font-medium transition-colors duration-200 hover:bg-surface-hover"
-              aria-label={localize('com_ui_new_chat')}
-            >
-              <NewChatButtonIcon conversation={conversation} />
-              <div className="grow overflow-hidden text-ellipsis whitespace-nowrap text-sm text-text-primary">
-                {localize('com_ui_new_chat')}
-              </div>
-              <div className="flex gap-3">
-                <span className="flex items-center" data-state="closed">
-                  <TooltipTrigger asChild>
-                    <button
-                      id="nav-new-chat-btn"
-                      aria-label="nav-new-chat-btn"
-                      className="text-text-primary"
-                    >
-                      <NewChatIcon className="size-5" />
-                    </button>
-                  </TooltipTrigger>
-                  <TooltipContent side="right" sideOffset={20}>
-                    {localize('com_ui_new_chat')}
-                  </TooltipContent>
-                </span>
-              </div>
-            </a>
+    <div className="sticky left-0 right-0 top-0 z-50 bg-surface-primary-alt pt-3.5">
+      <div className="pb-0.5 last:pb-0" style={{ transform: 'none' }}>
+        <a
+          href="/"
+          tabIndex={0}
+          data-testid="nav-new-chat"
+          onClick={clickHandler}
+          className="group flex h-10 items-center gap-2 rounded-lg px-2 font-medium transition-colors duration-200 hover:bg-surface-hover"
+          aria-label={localize('com_ui_new_chat')}
+        >
+          <NewChatButtonIcon conversation={conversation} />
+          <div className="grow overflow-hidden text-ellipsis whitespace-nowrap text-sm text-text-primary">
+            {localize('com_ui_new_chat')}
           </div>
-          {subHeaders != null ? subHeaders : null}
-        </div>
-      </Tooltip>
-    </TooltipProvider>
+          <div className="flex gap-3">
+            <span className="flex items-center" data-state="closed">
+              <NewChatIcon className="size-5" />
+            </span>
+          </div>
+        </a>
+      </div>
+      {subHeaders != null ? subHeaders : null}
+    </div>
   );
 }
diff --git a/client/src/components/Nav/SearchBar.tsx b/client/src/components/Nav/SearchBar.tsx
index 6efebf419e7..1eef13722c9 100644
--- a/client/src/components/Nav/SearchBar.tsx
+++ b/client/src/components/Nav/SearchBar.tsx
@@ -20,6 +20,7 @@ const SearchBar = forwardRef((props: SearchBarProps, ref: Ref<HTMLDivElement>) =
   const setSearchQuery = useSetRecoilState(store.searchQuery);
   const [showClearIcon, setShowClearIcon] = useState(false);
   const [text, setText] = useState('');
+  const setIsSearching = useSetRecoilState(store.isSearching);
   const localize = useLocalize();
 
   const clearText = useCallback(() => {
@@ -47,6 +48,8 @@ const SearchBar = forwardRef((props: SearchBarProps, ref: Ref<HTMLDivElement>) =
     },
     [queryClient, clearConvoState, setSearchQuery],
   );
+
+  // TODO: make the debounce time configurable via yaml
   const debouncedSendRequest = useMemo(() => debounce(sendRequest, 350), [sendRequest]);
 
   const onChange = (e: React.FormEvent<HTMLInputElement>) => {
@@ -54,6 +57,7 @@ const SearchBar = forwardRef((props: SearchBarProps, ref: Ref<HTMLDivElement>) =
     setShowClearIcon(value.length > 0);
     setText(value);
     debouncedSendRequest(value);
+    setIsSearching(true);
   };
 
   return (
@@ -61,7 +65,7 @@ const SearchBar = forwardRef((props: SearchBarProps, ref: Ref<HTMLDivElement>) =
       ref={ref}
       className={cn(
         'group relative mt-1 flex h-10 cursor-pointer items-center gap-3 rounded-lg border-border-medium px-3 py-2 text-text-primary transition-colors duration-200 focus-within:bg-surface-hover hover:bg-surface-hover',
-        isSmallScreen === true ? 'h-16 rounded-2xl' : '',
+        isSmallScreen === true ? 'mb-2 h-14 rounded-2xl' : '',
       )}
     >
       {
@@ -78,6 +82,8 @@ const SearchBar = forwardRef((props: SearchBarProps, ref: Ref<HTMLDivElement>) =
         aria-label={localize('com_nav_search_placeholder')}
         placeholder={localize('com_nav_search_placeholder')}
         onKeyUp={handleKeyUp}
+        onFocus={() => setIsSearching(true)}
+        onBlur={() => setIsSearching(true)}
         autoComplete="off"
         dir="auto"
       />
diff --git a/client/src/components/Nav/Settings.tsx b/client/src/components/Nav/Settings.tsx
index fc3f27ed02f..4adfc8be5a1 100644
--- a/client/src/components/Nav/Settings.tsx
+++ b/client/src/components/Nav/Settings.tsx
@@ -1,3 +1,4 @@
+import { useState, useRef } from 'react';
 import * as Tabs from '@radix-ui/react-tabs';
 import { MessageSquare, Command } from 'lucide-react';
 import { SettingsTabValues } from 'librechat-data-provider';
@@ -11,15 +12,53 @@ import { cn } from '~/utils';
 export default function Settings({ open, onOpenChange }: TDialogProps) {
   const isSmallScreen = useMediaQuery('(max-width: 767px)');
   const localize = useLocalize();
+  const [activeTab, setActiveTab] = useState(SettingsTabValues.GENERAL);
+  const tabRefs = useRef({});
+
+  const handleKeyDown = (event: React.KeyboardEvent) => {
+    const tabs = [
+      SettingsTabValues.GENERAL,
+      SettingsTabValues.CHAT,
+      SettingsTabValues.BETA,
+      SettingsTabValues.COMMANDS,
+      SettingsTabValues.SPEECH,
+      SettingsTabValues.DATA,
+      SettingsTabValues.ACCOUNT,
+    ];
+    const currentIndex = tabs.indexOf(activeTab);
+
+    switch (event.key) {
+      case 'ArrowDown':
+        event.preventDefault();
+        setActiveTab(tabs[(currentIndex + 1) % tabs.length]);
+        break;
+      case 'ArrowUp':
+        event.preventDefault();
+        setActiveTab(tabs[(currentIndex - 1 + tabs.length) % tabs.length]);
+        break;
+      case 'Home':
+        event.preventDefault();
+        setActiveTab(tabs[0]);
+        break;
+      case 'End':
+        event.preventDefault();
+        setActiveTab(tabs[tabs.length - 1]);
+        break;
+    }
+  };
+
+  const handleTabChange = (value: string) => {
+    setActiveTab(value as SettingsTabValues);
+  };
 
   return (
     <Transition appear show={open}>
-      <Dialog as="div" className="relative z-50 focus:outline-none" onClose={onOpenChange}>
+      <Dialog as="div" className="relative z-50" onClose={onOpenChange}>
         <TransitionChild
           enter="ease-out duration-200"
           enterFrom="opacity-0"
           enterTo="opacity-100"
-          leave="ease-in duration-100"
+          leave="ease-in duration-200"
           leaveFrom="opacity-100"
           leaveTo="opacity-0"
         >
@@ -34,15 +73,10 @@ export default function Settings({ open, onOpenChange }: TDialogProps) {
           leaveFrom="opacity-100 scale-100"
           leaveTo="opacity-0 scale-95"
         >
-          <div
-            className={cn(
-              'fixed inset-0 flex w-screen items-center justify-center p-4',
-              isSmallScreen ? '' : '',
-            )}
-          >
+          <div className={cn('fixed inset-0 flex w-screen items-center justify-center p-4')}>
             <DialogPanel
               className={cn(
-                'overflow-hidden rounded-xl rounded-b-lg bg-surface-tertiary-alt pb-6 shadow-2xl backdrop-blur-2xl animate-in sm:rounded-lg md:min-h-[373px] md:w-[680px]',
+                'min-h-[600px] overflow-hidden rounded-xl rounded-b-lg bg-background pb-6 shadow-2xl backdrop-blur-2xl animate-in sm:rounded-lg md:min-h-[373px] md:w-[680px]',
               )}
             >
               <DialogTitle
@@ -75,129 +109,96 @@ export default function Settings({ open, onOpenChange }: TDialogProps) {
                   <span className="sr-only">Close</span>
                 </button>
               </DialogTitle>
-              <div className="max-h-[373px] overflow-auto px-6 md:min-h-[373px] md:w-[680px]">
+              <div className="max-h-[550px] overflow-auto px-6 md:max-h-[400px] md:min-h-[400px] md:w-[680px]">
                 <Tabs.Root
-                  defaultValue={SettingsTabValues.GENERAL}
+                  value={activeTab}
+                  onValueChange={handleTabChange}
                   className="flex flex-col gap-10 md:flex-row"
-                  orientation="horizontal"
+                  orientation="vertical"
                 >
                   <Tabs.List
                     aria-label="Settings"
-                    role="tablist"
-                    aria-orientation="horizontal"
                     className={cn(
-                      'min-w-auto max-w-auto -ml-[8px] flex flex-shrink-0 flex-col flex-nowrap overflow-auto sm:max-w-none',
-                      isSmallScreen ? 'flex-row rounded-lg bg-surface-secondary' : '',
+                      'min-w-auto max-w-auto relative -ml-[8px] flex flex-shrink-0 flex-col flex-nowrap overflow-auto sm:max-w-none',
+                      isSmallScreen ? 'flex-row rounded-xl bg-surface-secondary' : '',
                     )}
-                    style={{ outline: 'none' }}
+                    onKeyDown={handleKeyDown}
                   >
-                    <Tabs.Trigger
-                      tabIndex={0}
-                      className={cn(
-                        'group m-1 flex items-center justify-start gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary transition-all duration-200 ease-in-out radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary dark:radix-state-active:bg-surface-active',
-                        isSmallScreen
-                          ? 'flex-1 items-center justify-center text-nowrap p-1 px-3 text-sm text-text-secondary'
-                          : 'bg-surface-tertiary-alt',
-                      )}
-                      value={SettingsTabValues.GENERAL}
-                      style={{ userSelect: 'none' }}
-                    >
-                      <GearIcon />
-                      {localize('com_nav_setting_general')}
-                    </Tabs.Trigger>
-                    <Tabs.Trigger
-                      tabIndex={0}
-                      className={cn(
-                        'group m-1 flex items-center justify-start gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary transition-all duration-200 ease-in-out radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary dark:radix-state-active:bg-surface-active',
-                        isSmallScreen
-                          ? 'flex-1 items-center justify-center text-nowrap p-1 px-3 text-sm text-text-secondary'
-                          : 'bg-surface-tertiary-alt',
-                      )}
-                      value={SettingsTabValues.CHAT}
-                      style={{ userSelect: 'none' }}
-                    >
-                      <MessageSquare className="icon-sm" />
-                      {localize('com_nav_setting_chat')}
-                    </Tabs.Trigger>
-                    <Tabs.Trigger
-                      tabIndex={0}
-                      className={cn(
-                        'group m-1 flex items-center justify-start gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary transition-all duration-200 ease-in-out radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary dark:radix-state-active:bg-surface-active',
-                        isSmallScreen
-                          ? 'flex-1 items-center justify-center text-nowrap p-1 px-3 text-sm text-text-secondary'
-                          : 'bg-surface-tertiary-alt',
-                      )}
-                      value={SettingsTabValues.BETA}
-                      style={{ userSelect: 'none' }}
-                    >
-                      <ExperimentIcon />
-                      {localize('com_nav_setting_beta')}
-                    </Tabs.Trigger>
-                    <Tabs.Trigger
-                      tabIndex={0}
-                      className={cn(
-                        'group m-1 flex items-center justify-start gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary transition-all duration-200 ease-in-out radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary dark:radix-state-active:bg-surface-active',
-                        isSmallScreen
-                          ? 'flex-1 items-center justify-center text-nowrap text-sm text-text-secondary'
-                          : 'bg-surface-tertiary-alt',
-                      )}
-                      value={SettingsTabValues.COMMANDS}
-                      style={{ userSelect: 'none' }}
-                    >
-                      <Command className="icon-sm" />
-                      {localize('com_nav_commands')}
-                    </Tabs.Trigger>
-                    <Tabs.Trigger
-                      tabIndex={0}
-                      className={cn(
-                        'group m-1 flex items-center justify-start gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary transition-all duration-200 ease-in-out radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary dark:radix-state-active:bg-surface-active',
-                        isSmallScreen
-                          ? 'flex-1 items-center justify-center text-nowrap p-1 px-3 text-sm text-text-secondary'
-                          : 'bg-surface-tertiary-alt',
-                      )}
-                      value={SettingsTabValues.SPEECH}
-                      style={{ userSelect: 'none' }}
-                    >
-                      <SpeechIcon className="icon-sm" />
-                      {localize('com_nav_setting_speech')}
-                    </Tabs.Trigger>
-                    <Tabs.Trigger
-                      tabIndex={0}
-                      className={cn(
-                        'group m-1 flex items-center justify-start gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary transition-all duration-200 ease-in-out radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary dark:radix-state-active:bg-surface-active',
-                        isSmallScreen
-                          ? 'flex-1 items-center justify-center text-nowrap p-1 px-3 text-sm text-text-secondary'
-                          : 'bg-surface-tertiary-alt',
-                      )}
-                      value={SettingsTabValues.DATA}
-                      style={{ userSelect: 'none' }}
-                    >
-                      <DataIcon />
-                      {localize('com_nav_setting_data')}
-                    </Tabs.Trigger>
-                    <Tabs.Trigger
-                      tabIndex={0}
-                      className={cn(
-                        'group m-1 flex items-center justify-start gap-2 rounded-md px-2 py-1.5 text-sm text-text-primary transition-all duration-200 ease-in-out radix-state-active:bg-surface-tertiary radix-state-active:text-text-primary dark:radix-state-active:bg-surface-active',
-                        isSmallScreen
-                          ? 'flex-1 items-center justify-center text-nowrap p-1 px-3 text-sm text-text-secondary'
-                          : 'bg-surface-tertiary-alt',
-                      )}
-                      value={SettingsTabValues.ACCOUNT}
-                      style={{ userSelect: 'none' }}
-                    >
-                      <UserIcon />
-                      {localize('com_nav_setting_account')}
-                    </Tabs.Trigger>
+                    {[
+                      {
+                        value: SettingsTabValues.GENERAL,
+                        icon: <GearIcon />,
+                        label: 'com_nav_setting_general',
+                      },
+                      {
+                        value: SettingsTabValues.CHAT,
+                        icon: <MessageSquare className="icon-sm" />,
+                        label: 'com_nav_setting_chat',
+                      },
+                      {
+                        value: SettingsTabValues.BETA,
+                        icon: <ExperimentIcon />,
+                        label: 'com_nav_setting_beta',
+                      },
+                      {
+                        value: SettingsTabValues.COMMANDS,
+                        icon: <Command className="icon-sm" />,
+                        label: 'com_nav_commands',
+                      },
+                      {
+                        value: SettingsTabValues.SPEECH,
+                        icon: <SpeechIcon className="icon-sm" />,
+                        label: 'com_nav_setting_speech',
+                      },
+                      {
+                        value: SettingsTabValues.DATA,
+                        icon: <DataIcon />,
+                        label: 'com_nav_setting_data',
+                      },
+                      {
+                        value: SettingsTabValues.ACCOUNT,
+                        icon: <UserIcon />,
+                        label: 'com_nav_setting_account',
+                      },
+                    ].map(({ value, icon, label }) => (
+                      <Tabs.Trigger
+                        key={value}
+                        className={cn(
+                          'group relative z-10 m-1 flex items-center justify-start gap-2 px-2 py-1.5 transition-all duration-200 ease-in-out',
+                          isSmallScreen
+                            ? 'flex-1 justify-center text-nowrap rounded-xl p-1 px-3 text-sm text-text-secondary radix-state-active:bg-surface-hover radix-state-active:text-text-primary'
+                            : 'rounded-md bg-transparent text-text-primary radix-state-active:bg-surface-tertiary',
+                        )}
+                        value={value}
+                        ref={(el) => (tabRefs.current[value] = el)}
+                      >
+                        {icon}
+                        {localize(label)}
+                      </Tabs.Trigger>
+                    ))}
                   </Tabs.List>
-                  <div className="max-h-[373px] overflow-auto sm:w-full sm:max-w-none md:pr-0.5 md:pt-0.5">
-                    <General />
-                    <Chat />
-                    <Beta />
-                    <Commands />
-                    <Speech />
-                    <Data />
-                    <Account />
+                  <div className="overflow-auto sm:w-full sm:max-w-none md:pr-0.5 md:pt-0.5">
+                    <Tabs.Content value={SettingsTabValues.GENERAL}>
+                      <General />
+                    </Tabs.Content>
+                    <Tabs.Content value={SettingsTabValues.CHAT}>
+                      <Chat />
+                    </Tabs.Content>
+                    <Tabs.Content value={SettingsTabValues.BETA}>
+                      <Beta />
+                    </Tabs.Content>
+                    <Tabs.Content value={SettingsTabValues.COMMANDS}>
+                      <Commands />
+                    </Tabs.Content>
+                    <Tabs.Content value={SettingsTabValues.SPEECH}>
+                      <Speech />
+                    </Tabs.Content>
+                    <Tabs.Content value={SettingsTabValues.DATA}>
+                      <Data />
+                    </Tabs.Content>
+                    <Tabs.Content value={SettingsTabValues.ACCOUNT}>
+                      <Account />
+                    </Tabs.Content>
                   </div>
                 </Tabs.Root>
               </div>
diff --git a/client/src/components/Nav/SettingsTabs/Account/Account.tsx b/client/src/components/Nav/SettingsTabs/Account/Account.tsx
index 6227f3c7a3f..a0fd53445eb 100644
--- a/client/src/components/Nav/SettingsTabs/Account/Account.tsx
+++ b/client/src/components/Nav/SettingsTabs/Account/Account.tsx
@@ -1,7 +1,5 @@
 import React from 'react';
 import { useRecoilState } from 'recoil';
-import * as Tabs from '@radix-ui/react-tabs';
-import { SettingsTabValues } from 'librechat-data-provider';
 import HoverCardSettings from '../HoverCardSettings';
 import DeleteAccount from './DeleteAccount';
 import { Switch } from '~/components/ui';
@@ -21,33 +19,27 @@ function Account({ onCheckedChange }: { onCheckedChange?: (value: boolean) => vo
   };
 
   return (
-    <Tabs.Content
-      value={SettingsTabValues.ACCOUNT}
-      role="tabpanel"
-      className="w-full md:min-h-[271px]"
-    >
-      <div className="flex flex-col gap-3 text-sm text-black dark:text-gray-50">
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <Avatar />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <DeleteAccount />
-        </div>
-        <div className="flex items-center justify-between">
-          <div className="flex items-center space-x-2">
-            <div>{localize('com_nav_user_name_display')}</div>
-            <HoverCardSettings side="bottom" text="com_nav_info_user_name_display" />
-          </div>
-          <Switch
-            id="UsernameDisplay"
-            checked={UsernameDisplay}
-            onCheckedChange={handleCheckedChange}
-            className="ml-4 mt-2"
-            data-testid="UsernameDisplay"
-          />
+    <div className="flex flex-col gap-3 p-1 text-sm text-text-primary">
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <Avatar />
+      </div>
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <DeleteAccount />
+      </div>
+      <div className="flex items-center justify-between">
+        <div className="flex items-center space-x-2">
+          <div>{localize('com_nav_user_name_display')}</div>
+          <HoverCardSettings side="bottom" text="com_nav_info_user_name_display" />
         </div>
+        <Switch
+          id="UsernameDisplay"
+          checked={UsernameDisplay}
+          onCheckedChange={handleCheckedChange}
+          className="ml-4 mt-2"
+          data-testid="UsernameDisplay"
+        />
       </div>
-    </Tabs.Content>
+    </div>
   );
 }
 
diff --git a/client/src/components/Nav/SettingsTabs/Account/Avatar.tsx b/client/src/components/Nav/SettingsTabs/Account/Avatar.tsx
index aad50ae97ba..de927d3a640 100644
--- a/client/src/components/Nav/SettingsTabs/Account/Avatar.tsx
+++ b/client/src/components/Nav/SettingsTabs/Account/Avatar.tsx
@@ -4,7 +4,14 @@ import { useSetRecoilState } from 'recoil';
 import AvatarEditor from 'react-avatar-editor';
 import { fileConfig as defaultFileConfig, mergeFileConfig } from 'librechat-data-provider';
 import type { TUser } from 'librechat-data-provider';
-import { Dialog, DialogContent, DialogHeader, DialogTitle, Slider } from '~/components/ui';
+import {
+  OGDialog,
+  OGDialogContent,
+  OGDialogHeader,
+  OGDialogTitle,
+  OGDialogTrigger,
+  Slider,
+} from '~/components/ui';
 import { useUploadAvatarMutation, useGetFileConfig } from '~/data-provider';
 import { useToastContext } from '~/Providers';
 import { Spinner } from '~/components/svg';
@@ -20,6 +27,7 @@ function Avatar() {
   const [rotation, setRotation] = useState<number>(0);
   const editorRef = useRef<AvatarEditor | null>(null);
   const fileInputRef = useRef<HTMLInputElement>(null);
+  const openButtonRef = useRef<HTMLButtonElement>(null);
 
   const { data: fileConfig = defaultFileConfig } = useGetFileConfig({
     select: (data) => mergeFileConfig(data),
@@ -31,8 +39,8 @@ function Avatar() {
   const { mutate: uploadAvatar, isLoading: isUploading } = useUploadAvatarMutation({
     onSuccess: (data) => {
       showToast({ message: localize('com_ui_upload_success') });
-      setDialogOpen(false);
       setUser((prev) => ({ ...prev, avatar: data.url } as TUser));
+      openButtonRef.current?.click();
     },
     onError: (error) => {
       console.error('Error:', error);
@@ -102,113 +110,114 @@ function Avatar() {
   }, []);
 
   return (
-    <>
+    <OGDialog
+      open={isDialogOpen}
+      onOpenChange={(open) => {
+        setDialogOpen(open);
+        if (!open) {
+          resetImage();
+          setTimeout(() => {
+            openButtonRef.current?.focus();
+          }, 0);
+        }
+      }}
+    >
       <div className="flex items-center justify-between">
         <span>{localize('com_nav_profile_picture')}</span>
-        <button onClick={() => setDialogOpen(true)} className="btn btn-neutral relative">
+        <OGDialogTrigger ref={openButtonRef} className="btn btn-neutral relative">
           <FileImage className="mr-2 flex w-[22px] items-center stroke-1" />
           <span>{localize('com_nav_change_picture')}</span>
-        </button>
+        </OGDialogTrigger>
       </div>
 
-      <Dialog
-        open={isDialogOpen}
-        onOpenChange={(open) => {
-          setDialogOpen(open);
-          if (!open) {
-            resetImage();
-          }
-        }}
+      <OGDialogContent
+        className={cn('bg-surface-tertiary text-text-primary shadow-2xl  md:h-auto md:w-[450px]')}
+        style={{ borderRadius: '12px' }}
       >
-        <DialogContent
-          className={cn('shadow-2xl dark:bg-gray-700 dark:text-white md:h-auto md:w-[450px]')}
-          style={{ borderRadius: '12px' }}
-        >
-          <DialogHeader>
-            <DialogTitle className="text-lg font-medium leading-6 text-gray-800 dark:text-gray-200">
-              {image ? localize('com_ui_preview') : localize('com_ui_upload_image')}
-            </DialogTitle>
-          </DialogHeader>
-          <div className="flex flex-col items-center justify-center">
-            {image ? (
-              <>
-                <div className="relative overflow-hidden rounded-full">
-                  <AvatarEditor
-                    ref={editorRef}
-                    image={image}
-                    width={250}
-                    height={250}
-                    border={0}
-                    borderRadius={125}
-                    color={[255, 255, 255, 0.6]}
-                    scale={scale}
-                    rotate={rotation}
+        <OGDialogHeader>
+          <OGDialogTitle className="text-lg font-medium leading-6 text-text-primary">
+            {image ? localize('com_ui_preview') : localize('com_ui_upload_image')}
+          </OGDialogTitle>
+        </OGDialogHeader>
+        <div className="flex flex-col items-center justify-center">
+          {image ? (
+            <>
+              <div className="relative overflow-hidden rounded-full">
+                <AvatarEditor
+                  ref={editorRef}
+                  image={image}
+                  width={250}
+                  height={250}
+                  border={0}
+                  borderRadius={125}
+                  color={[255, 255, 255, 0.6]}
+                  scale={scale}
+                  rotate={rotation}
+                />
+              </div>
+              <div className="mt-4 flex w-full flex-col items-center space-y-4">
+                <div className="flex w-full items-center justify-center space-x-4">
+                  <span className="text-sm">Zoom:</span>
+                  <Slider
+                    value={[scale]}
+                    min={1}
+                    max={5}
+                    step={0.001}
+                    onValueChange={handleScaleChange}
+                    className="w-2/3 max-w-xs"
                   />
                 </div>
-                <div className="mt-4 flex w-full flex-col items-center space-y-4">
-                  <div className="flex w-full items-center justify-center space-x-4">
-                    <span className="text-sm">Zoom:</span>
-                    <Slider
-                      value={[scale]}
-                      min={1}
-                      max={5}
-                      step={0.001}
-                      onValueChange={handleScaleChange}
-                      className="w-2/3 max-w-xs"
-                    />
-                  </div>
-                  <button
-                    onClick={handleRotate}
-                    className="rounded-full bg-gray-200 p-2 transition-colors hover:bg-gray-300 dark:bg-gray-600 dark:hover:bg-gray-500"
-                  >
-                    <RotateCw className="h-5 w-5" />
-                  </button>
-                </div>
                 <button
-                  className={cn(
-                    'mt-4 flex items-center rounded px-4 py-2 text-white transition-colors hover:bg-sky-600 hover:text-gray-200',
-                    isUploading ? 'cursor-not-allowed bg-sky-600' : 'bg-sky-500',
-                  )}
-                  onClick={handleUpload}
-                  disabled={isUploading}
+                  onClick={handleRotate}
+                  className="rounded-full bg-gray-200 p-2 transition-colors hover:bg-gray-300 dark:bg-gray-600 dark:hover:bg-gray-500"
                 >
-                  {isUploading ? (
-                    <Spinner className="icon-sm mr-2" />
-                  ) : (
-                    <Upload className="mr-2 h-5 w-5" />
-                  )}
-                  {localize('com_ui_upload')}
+                  <RotateCw className="h-5 w-5" />
                 </button>
-              </>
-            ) : (
-              <div
-                className="flex h-64 w-64 flex-col items-center justify-center rounded-lg border-2 border-dashed border-gray-300 bg-gray-50 dark:border-gray-600 dark:bg-gray-700"
-                onDrop={handleDrop}
-                onDragOver={handleDragOver}
-              >
-                <FileImage className="mb-4 h-12 w-12 text-gray-400" />
-                <p className="mb-2 text-center text-sm text-gray-500 dark:text-gray-400">
-                  {localize('com_ui_drag_drop')}
-                </p>
-                <button
-                  onClick={openFileDialog}
-                  className="rounded bg-gray-200 px-4 py-2 text-sm text-gray-700 transition-colors hover:bg-gray-300 dark:bg-gray-600 dark:text-gray-200 dark:hover:bg-gray-500"
-                >
-                  {localize('com_ui_select_file')}
-                </button>
-                <input
-                  ref={fileInputRef}
-                  type="file"
-                  className="hidden"
-                  accept=".png, .jpg, .jpeg"
-                  onChange={handleFileChange}
-                />
               </div>
-            )}
-          </div>
-        </DialogContent>
-      </Dialog>
-    </>
+              <button
+                className={cn(
+                  'mt-4 flex items-center rounded px-4 py-2 text-white transition-colors hover:bg-sky-600 hover:text-gray-200',
+                  isUploading ? 'cursor-not-allowed bg-sky-600' : 'bg-sky-500',
+                )}
+                onClick={handleUpload}
+                disabled={isUploading}
+              >
+                {isUploading ? (
+                  <Spinner className="icon-sm mr-2" />
+                ) : (
+                  <Upload className="mr-2 h-5 w-5" />
+                )}
+                {localize('com_ui_upload')}
+              </button>
+            </>
+          ) : (
+            <div
+              className="flex h-64 w-64 flex-col items-center justify-center rounded-lg border-2 border-dashed border-gray-300 bg-gray-50 dark:border-gray-600 dark:bg-gray-700"
+              onDrop={handleDrop}
+              onDragOver={handleDragOver}
+            >
+              <FileImage className="mb-4 h-12 w-12 text-gray-400" />
+              <p className="mb-2 text-center text-sm text-gray-500 dark:text-gray-400">
+                {localize('com_ui_drag_drop')}
+              </p>
+              <button
+                onClick={openFileDialog}
+                className="rounded bg-gray-200 px-4 py-2 text-sm text-gray-700 transition-colors hover:bg-gray-300 dark:bg-gray-600 dark:text-gray-200 dark:hover:bg-gray-500"
+              >
+                {localize('com_ui_select_file')}
+              </button>
+              <input
+                ref={fileInputRef}
+                type="file"
+                className="hidden"
+                accept=".png, .jpg, .jpeg"
+                onChange={handleFileChange}
+              />
+            </div>
+          )}
+        </div>
+      </OGDialogContent>
+    </OGDialog>
   );
 }
 
diff --git a/client/src/components/Nav/SettingsTabs/Beta/Beta.tsx b/client/src/components/Nav/SettingsTabs/Beta/Beta.tsx
index e4aae59dd6d..d687efbbd3c 100644
--- a/client/src/components/Nav/SettingsTabs/Beta/Beta.tsx
+++ b/client/src/components/Nav/SettingsTabs/Beta/Beta.tsx
@@ -1,21 +1,13 @@
 import { memo } from 'react';
-import * as Tabs from '@radix-ui/react-tabs';
-import { SettingsTabValues } from 'librechat-data-provider';
 import CodeArtifacts from './CodeArtifacts';
 
 function Beta() {
   return (
-    <Tabs.Content
-      value={SettingsTabValues.BETA}
-      role="tabpanel"
-      className="w-full md:min-h-[271px]"
-    >
-      <div className="flex flex-col gap-3 text-sm text-text-primary">
-        <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
-          <CodeArtifacts />
-        </div>
+    <div className="flex flex-col gap-3 p-1 text-sm text-text-primary">
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+        <CodeArtifacts />
       </div>
-    </Tabs.Content>
+    </div>
   );
 }
 
diff --git a/client/src/components/Nav/SettingsTabs/Beta/CodeArtifacts.tsx b/client/src/components/Nav/SettingsTabs/Beta/CodeArtifacts.tsx
index 804899ceddc..a37b96866cd 100644
--- a/client/src/components/Nav/SettingsTabs/Beta/CodeArtifacts.tsx
+++ b/client/src/components/Nav/SettingsTabs/Beta/CodeArtifacts.tsx
@@ -1,5 +1,5 @@
 import { useRecoilState } from 'recoil';
-import HoverCardSettings from '../HoverCardSettings';
+import HoverCardSettings from '~/components/Nav/SettingsTabs/HoverCardSettings';
 import { Switch } from '~/components/ui';
 import { useLocalize } from '~/hooks';
 import store from '~/store';
diff --git a/client/src/components/Nav/SettingsTabs/Chat/Chat.tsx b/client/src/components/Nav/SettingsTabs/Chat/Chat.tsx
index d7278e6c3cf..71369ce59b1 100644
--- a/client/src/components/Nav/SettingsTabs/Chat/Chat.tsx
+++ b/client/src/components/Nav/SettingsTabs/Chat/Chat.tsx
@@ -1,6 +1,4 @@
 import { memo } from 'react';
-import * as Tabs from '@radix-ui/react-tabs';
-import { SettingsTabValues } from 'librechat-data-provider';
 import FontSizeSelector from './FontSizeSelector';
 import SendMessageKeyEnter from './EnterToSend';
 import ShowCodeSwitch from './ShowCodeSwitch';
@@ -12,32 +10,30 @@ import SaveDraft from './SaveDraft';
 
 function Chat() {
   return (
-    <Tabs.Content value={SettingsTabValues.CHAT} role="tabpanel" className="md: w-full">
-      <div className="flex flex-col gap-3 text-sm text-black dark:text-gray-50">
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <FontSizeSelector />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <ChatDirection />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <SendMessageKeyEnter />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <ShowCodeSwitch />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <SaveDraft />
-        </div>
-        <ForkSettings />
-        <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
-          <ModularChat />
-        </div>
-        <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
-          <LaTeXParsing />
-        </div>
+    <div className="flex flex-col gap-3 p-1 text-sm text-text-primary">
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+        <FontSizeSelector />
       </div>
-    </Tabs.Content>
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+        <ChatDirection />
+      </div>
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+        <SendMessageKeyEnter />
+      </div>
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+        <ShowCodeSwitch />
+      </div>
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+        <SaveDraft />
+      </div>
+      <ForkSettings />
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+        <ModularChat />
+      </div>
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+        <LaTeXParsing />
+      </div>
+    </div>
   );
 }
 
diff --git a/client/src/components/Nav/SettingsTabs/Chat/ChatDirection.tsx b/client/src/components/Nav/SettingsTabs/Chat/ChatDirection.tsx
index c5fdcaa07a7..e4bb42a6277 100644
--- a/client/src/components/Nav/SettingsTabs/Chat/ChatDirection.tsx
+++ b/client/src/components/Nav/SettingsTabs/Chat/ChatDirection.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { useRecoilState } from 'recoil';
 import { useLocalize } from '~/hooks';
+import { Button } from '~/components';
 import store from '~/store';
 
 const ChatDirection = () => {
@@ -14,16 +15,21 @@ const ChatDirection = () => {
   return (
     <div className="flex items-center justify-between">
       <div className="flex items-center space-x-2">
-        <span>{localize('com_nav_chat_direction')}</span>
+        <span id="chat-direction-label">{localize('com_nav_chat_direction')}</span>
       </div>
-      <label
+      <Button
+        variant="outline"
+        aria-label="Toggle chat direction"
         onClick={toggleChatDirection}
         data-testid="chatDirection"
-        className="btn btn-neutral relative"
-        style={{ userSelect: 'none' }}
       >
-        {direction.toLowerCase()}
-      </label>
+        <span aria-hidden="true">{direction.toLowerCase()}</span>
+        <span id="chat-direction-status" className="sr-only">
+          {direction === 'LTR'
+            ? localize('chat_direction_left_to_right')
+            : localize('chat_direction_right_to_left')}
+        </span>
+      </Button>
     </div>
   );
 };
diff --git a/client/src/components/Nav/SettingsTabs/Chat/ForkSettings.tsx b/client/src/components/Nav/SettingsTabs/Chat/ForkSettings.tsx
index 26ce56fcd76..84ecc9bb506 100644
--- a/client/src/components/Nav/SettingsTabs/Chat/ForkSettings.tsx
+++ b/client/src/components/Nav/SettingsTabs/Chat/ForkSettings.tsx
@@ -9,7 +9,7 @@ export const ForkSettings = () => {
   const localize = useLocalize();
   const [forkSetting, setForkSetting] = useRecoilState(store.forkSetting);
   const [splitAtTarget, setSplitAtTarget] = useRecoilState(store.splitAtTarget);
-  const [remember, setRemember] = useRecoilState<boolean>(store.rememberForkOption);
+  const [remember, setRemember] = useRecoilState<boolean>(store.rememberDefaultFork);
 
   const forkOptions = [
     { value: ForkOptions.DIRECT_PATH, label: localize('com_ui_fork_visible') },
@@ -19,7 +19,7 @@ export const ForkSettings = () => {
 
   return (
     <>
-      <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
         <div className="flex items-center justify-between">
           <div className="flex items-center space-x-2">
             <div>{localize('com_ui_fork_change_default')}</div>
@@ -30,24 +30,23 @@ export const ForkSettings = () => {
             onChange={setForkSetting}
             options={forkOptions}
             sizeClasses="w-[200px]"
-            anchor="bottom start"
             testId="fork-setting-dropdown"
           />
         </div>
       </div>
-      <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
         <div className="flex items-center justify-between">
           <div> {localize('com_ui_fork_default')} </div>
           <Switch
-            id="rememberForkOption"
+            id="rememberDefaultFork"
             checked={remember}
             onCheckedChange={setRemember}
             className="ml-4 mt-2"
-            data-testid="rememberForkOption"
+            data-testid="rememberDefaultFork"
           />
         </div>
       </div>
-      <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
         <div className="flex items-center justify-between">
           <div className="flex items-center space-x-2">
             <div>{localize('com_ui_fork_split_target_setting')}</div>
diff --git a/client/src/components/Nav/SettingsTabs/Commands/Commands.tsx b/client/src/components/Nav/SettingsTabs/Commands/Commands.tsx
index a67cbbada1a..72894d6bc0c 100644
--- a/client/src/components/Nav/SettingsTabs/Commands/Commands.tsx
+++ b/client/src/components/Nav/SettingsTabs/Commands/Commands.tsx
@@ -1,29 +1,48 @@
 import { memo } from 'react';
-import * as Tabs from '@radix-ui/react-tabs';
-import { SettingsTabValues } from 'librechat-data-provider';
+import { PermissionTypes, Permissions } from 'librechat-data-provider';
+import HoverCardSettings from '~/components/Nav/SettingsTabs/HoverCardSettings';
+import { useLocalize, useHasAccess } from '~/hooks';
 import SlashCommandSwitch from './SlashCommandSwitch';
 import PlusCommandSwitch from './PlusCommandSwitch';
 import AtCommandSwitch from './AtCommandSwitch';
 
 function Commands() {
+  const localize = useLocalize();
+
+  const hasAccessToPrompts = useHasAccess({
+    permissionType: PermissionTypes.PROMPTS,
+    permission: Permissions.USE,
+  });
+
+  const hasAccessToMultiConvo = useHasAccess({
+    permissionType: PermissionTypes.MULTI_CONVO,
+    permission: Permissions.USE,
+  });
+
   return (
-    <Tabs.Content
-      value={SettingsTabValues.COMMANDS}
-      role="tabpanel"
-      className="w-full md:min-h-[271px]"
-    >
+    <div className="space-y-4 p-1">
+      <div className="flex items-center gap-2">
+        <h3 className="text-lg font-medium text-text-primary">
+          {localize('com_nav_chat_commands')}
+        </h3>
+        <HoverCardSettings side="bottom" text="com_nav_chat_commands_info" />
+      </div>
       <div className="flex flex-col gap-3 text-sm text-text-primary">
-        <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
           <AtCommandSwitch />
         </div>
-        <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
-          <PlusCommandSwitch />
-        </div>
-        <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
-          <SlashCommandSwitch />
-        </div>
+        {hasAccessToMultiConvo === true && (
+          <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+            <PlusCommandSwitch />
+          </div>
+        )}
+        {hasAccessToPrompts === true && (
+          <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+            <SlashCommandSwitch />
+          </div>
+        )}
       </div>
-    </Tabs.Content>
+    </div>
   );
 }
 
diff --git a/client/src/components/Nav/SettingsTabs/Data/Data.tsx b/client/src/components/Nav/SettingsTabs/Data/Data.tsx
index f7576b117f8..6897a4a0b40 100644
--- a/client/src/components/Nav/SettingsTabs/Data/Data.tsx
+++ b/client/src/components/Nav/SettingsTabs/Data/Data.tsx
@@ -1,7 +1,5 @@
 import React, { useState, useRef } from 'react';
-import * as Tabs from '@radix-ui/react-tabs';
 import { useClearConversationsMutation } from 'librechat-data-provider/react-query';
-import { SettingsTabValues } from 'librechat-data-provider';
 import { useConversation, useConversations, useOnClickOutside } from '~/hooks';
 import { RevokeKeysButton } from './RevokeKeysButton';
 import { DeleteCacheButton } from './DeleteCacheButton';
@@ -37,35 +35,28 @@ function Data() {
   };
 
   return (
-    <Tabs.Content
-      value={SettingsTabValues.DATA}
-      role="tabpanel"
-      className="w-full md:min-h-[271px]"
-      ref={dataTabRef}
-    >
-      <div className="flex flex-col gap-3 text-sm text-black dark:text-gray-50">
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <ImportConversations />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <SharedLinks />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <RevokeKeysButton all={true} />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <DeleteCacheButton />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <ClearChatsButton
-            confirmClear={confirmClearConvos}
-            onClick={clearConvos}
-            showText={true}
-            mutation={clearConvosMutation}
-          />
-        </div>
+    <div className="flex flex-col gap-3 p-1 text-sm text-text-primary">
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <ImportConversations />
       </div>
-    </Tabs.Content>
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <SharedLinks />
+      </div>
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <RevokeKeysButton all={true} />
+      </div>
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <DeleteCacheButton />
+      </div>
+      <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">
+        <ClearChatsButton
+          confirmClear={confirmClearConvos}
+          onClick={clearConvos}
+          showText={true}
+          mutation={clearConvosMutation}
+        />
+      </div>
+    </div>
   );
 }
 
diff --git a/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx b/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx
index a75eaddd264..7b318e6495e 100644
--- a/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx
+++ b/client/src/components/Nav/SettingsTabs/Data/ImportConversations.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useState, useRef } from 'react';
 import { Import } from 'lucide-react';
 import type { TError } from 'librechat-data-provider';
 import { useUploadConversationsMutation } from '~/data-provider';
@@ -9,6 +9,7 @@ import { cn } from '~/utils';
 
 function ImportConversations() {
   const localize = useLocalize();
+  const fileInputRef = useRef<HTMLInputElement>(null);
 
   const { showToast } = useToastContext();
   const [, setErrors] = useState<string[]>([]);
@@ -26,7 +27,7 @@ function ImportConversations() {
       console.error('Error: ', error);
       setAllowImport(true);
       setError(
-        (error as TError)?.response?.data?.message ?? 'An error occurred while uploading the file.',
+        (error as TError).response?.data?.message ?? 'An error occurred while uploading the file.',
       );
       if (error?.toString().includes('Unsupported import type')) {
         showToast({
@@ -44,13 +45,12 @@ function ImportConversations() {
 
   const startUpload = async (file: File) => {
     const formData = new FormData();
-    formData.append('file', file, encodeURIComponent(file?.name || 'File'));
+    formData.append('file', file, encodeURIComponent(file.name || 'File'));
 
     uploadFile.mutate(formData);
   };
 
   const handleFiles = async (_file: File) => {
-    /* Process files */
     try {
       await startUpload(_file);
     } catch (error) {
@@ -59,33 +59,49 @@ function ImportConversations() {
     }
   };
 
-  const handleFileChange = (event) => {
-    const file = event.target.files[0];
+  const handleFileChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const file = event.target.files?.[0];
     if (file) {
       handleFiles(file);
     }
   };
 
+  const handleImportClick = () => {
+    fileInputRef.current?.click();
+  };
+
+  const handleKeyDown = (event: React.KeyboardEvent<HTMLButtonElement>) => {
+    if (event.key === 'Enter' || event.key === ' ') {
+      event.preventDefault();
+      handleImportClick();
+    }
+  };
+
   return (
     <div className="flex items-center justify-between">
       <div>{localize('com_ui_import_conversation_info')}</div>
-      <label htmlFor={'import-conversations-file'} className="btn btn-neutral relative">
+      <button
+        onClick={handleImportClick}
+        onKeyDown={handleKeyDown}
+        disabled={!allowImport}
+        aria-label={localize('com_ui_import_conversation')}
+        className="btn btn-neutral relative"
+      >
         {allowImport ? (
           <Import className="mr-1 flex h-4 w-4 items-center stroke-1" />
         ) : (
           <Spinner className="mr-1 w-4" />
         )}
         <span>{localize('com_ui_import_conversation')}</span>
-        <input
-          id={'import-conversations-file'}
-          disabled={!allowImport}
-          value=""
-          type="file"
-          className={cn('hidden')}
-          accept=".json"
-          onChange={handleFileChange}
-        />
-      </label>
+      </button>
+      <input
+        ref={fileInputRef}
+        type="file"
+        className={cn('hidden')}
+        accept=".json"
+        onChange={handleFileChange}
+        aria-hidden="true"
+      />
     </div>
   );
 }
diff --git a/client/src/components/Nav/SettingsTabs/Data/SharedLinkTable.tsx b/client/src/components/Nav/SettingsTabs/Data/SharedLinkTable.tsx
index 1e09c8d8ec3..aa48f1d2f99 100644
--- a/client/src/components/Nav/SettingsTabs/Data/SharedLinkTable.tsx
+++ b/client/src/components/Nav/SettingsTabs/Data/SharedLinkTable.tsx
@@ -1,43 +1,45 @@
-import { useMemo, useState, MouseEvent } from 'react';
+import { useState, useMemo } from 'react';
 import { Link } from 'react-router-dom';
-import { MessageSquare, Link as LinkIcon } from 'lucide-react';
+import { Link as LinkIcon, TrashIcon } from 'lucide-react';
 import type { SharedLinksResponse, TSharedLink } from 'librechat-data-provider';
 import { useDeleteSharedLinkMutation, useSharedLinksInfiniteQuery } from '~/data-provider';
 import { useAuthContext, useLocalize, useNavScrolling } from '~/hooks';
+import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
 import { NotificationSeverity } from '~/common';
 import { useToastContext } from '~/Providers';
 import { cn } from '~/utils';
 import {
+  Button,
+  Label,
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+  TooltipAnchor,
+  Skeleton,
   Spinner,
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-  TrashIcon,
+  OGDialog,
+  OGDialogTrigger,
 } from '~/components';
 
-function SharedLinkDeleteButton({
-  shareId,
-  setIsDeleting,
-}: {
-  shareId: string;
-  setIsDeleting: (isDeleting: boolean) => void;
-}) {
+function ShareLinkRow({ sharedLink }: { sharedLink: TSharedLink }) {
+  const [isDeleting, setIsDeleting] = useState(false);
   const localize = useLocalize();
+
   const { showToast } = useToastContext();
   const mutation = useDeleteSharedLinkMutation({
     onError: () => {
       showToast({
         message: localize('com_ui_share_delete_error'),
         severity: NotificationSeverity.ERROR,
-        showIcon: true,
       });
       setIsDeleting(false);
     },
   });
 
-  const handleDelete = async (e: MouseEvent<HTMLButtonElement>) => {
-    e.preventDefault();
+  const confirmDelete = async (shareId: TSharedLink['shareId']) => {
     if (mutation.isLoading) {
       return;
     }
@@ -45,92 +47,78 @@ function SharedLinkDeleteButton({
     await mutation.mutateAsync({ shareId });
     setIsDeleting(false);
   };
-  return (
-    <TooltipProvider delayDuration={250}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <button id="delete-shared-link" aria-label="Delete shared link" onClick={handleDelete}>
-            <TrashIcon />
-          </button>
-        </TooltipTrigger>
-        <TooltipContent side="top" sideOffset={0}>
-          {localize('com_ui_delete')}
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-}
-function SourceChatButton({ conversationId }: { conversationId: string }) {
-  const localize = useLocalize();
-
-  return (
-    <TooltipProvider delayDuration={250}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <Link to={`/c/${conversationId}`} target="_blank" rel="noreferrer">
-            <MessageSquare className="h-4 w-4 hover:text-gray-300" />
-          </Link>
-        </TooltipTrigger>
-        <TooltipContent side="top" sideOffset={0}>
-          {localize('com_nav_source_chat')}
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-}
-
-function ShareLinkRow({ sharedLink }: { sharedLink: TSharedLink }) {
-  const [isDeleting, setIsDeleting] = useState(false);
 
   return (
-    <tr
-      key={sharedLink.conversationId}
-      className="border-b border-gray-200 text-sm font-normal dark:border-white/10"
-    >
-      <td
-        className={cn(
-          'flex items-center py-3 text-blue-800/70 dark:text-blue-500',
-          isDeleting && 'opacity-50',
-        )}
-      >
-        <Link to={`/share/${sharedLink.shareId}`} target="_blank" rel="noreferrer" className="flex">
-          <LinkIcon className="mr-1 h-5 w-5" />
+    <TableRow className={(cn(isDeleting && 'opacity-50'), 'hover:bg-transparent')}>
+      <TableCell>
+        <Link
+          to={`/share/${sharedLink.shareId}`}
+          target="_blank"
+          rel="noreferrer"
+          className="flex items-center text-blue-500 hover:underline"
+        >
+          <LinkIcon className="mr-2 h-4 w-4" />
           {sharedLink.title}
         </Link>
-      </td>
-      <td className="p-3">
-        <div className="flex justify-between">
-          <div className={cn('flex justify-start dark:text-gray-200', isDeleting && 'opacity-50')}>
-            {new Date(sharedLink.createdAt).toLocaleDateString('en-US', {
-              month: 'long',
-              day: 'numeric',
-              year: 'numeric',
-            })}
-          </div>
-          <div
-            className={cn(
-              'flex items-center justify-end gap-3 text-gray-400',
-              isDeleting && 'opacity-50',
-            )}
-          >
-            {sharedLink.conversationId && (
-              <>
-                <SourceChatButton conversationId={sharedLink.conversationId} />
-                <div className={cn('h-4 w-4 cursor-pointer', !isDeleting && 'hover:text-gray-300')}>
-                  <SharedLinkDeleteButton
-                    shareId={sharedLink.shareId}
-                    setIsDeleting={setIsDeleting}
-                  />
-                </div>
-              </>
-            )}
-          </div>
-        </div>
-      </td>
-    </tr>
+      </TableCell>
+      <TableCell>
+        {new Date(sharedLink.createdAt).toLocaleDateString('en-US', {
+          month: 'long',
+          day: 'numeric',
+          year: 'numeric',
+        })}
+      </TableCell>
+      <TableCell className="text-right">
+        {sharedLink.conversationId && (
+          <OGDialog>
+            <OGDialogTrigger asChild>
+              <TooltipAnchor
+                description={localize('com_ui_delete')}
+                render={
+                  <Button
+                    aria-label="Delete shared link"
+                    variant="ghost"
+                    size="icon"
+                    className="size-8"
+                  >
+                    <TrashIcon className="size-4" />
+                  </Button>
+                }
+              ></TooltipAnchor>
+            </OGDialogTrigger>
+            <OGDialogTemplate
+              showCloseButton={false}
+              title={localize('com_ui_delete_conversation')}
+              className="max-w-[450px]"
+              main={
+                <>
+                  <div className="flex w-full flex-col items-center gap-2">
+                    <div className="grid w-full items-center gap-2">
+                      <Label
+                        htmlFor="dialog-confirm-delete"
+                        className="text-left text-sm font-medium"
+                      >
+                        {localize('com_ui_delete_confirm')} <strong>{sharedLink.title}</strong>
+                      </Label>
+                    </div>
+                  </div>
+                </>
+              }
+              selection={{
+                selectHandler: () => confirmDelete(sharedLink.shareId),
+                selectClasses:
+                  'bg-red-700 dark:bg-red-600 hover:bg-red-800 dark:hover:bg-red-800 text-white',
+                selectText: localize('com_ui_delete'),
+              }}
+            />
+          </OGDialog>
+        )}
+      </TableCell>
+    </TableRow>
   );
 }
-export default function ShareLinkTable({ className }: { className?: string }) {
+
+export default function ShareLinkTable({ className }) {
   const localize = useLocalize();
   const { isAuthenticated } = useAuthContext();
   const [showLoading, setShowLoading] = useState(false);
@@ -146,15 +134,28 @@ export default function ShareLinkTable({ className }: { className?: string }) {
   });
 
   const sharedLinks = useMemo(() => data?.pages.flatMap((page) => page.sharedLinks) || [], [data]);
-  const classProp: { className?: string } = {
-    className: 'p-1 hover:text-black dark:hover:text-white',
-  };
-  if (className) {
-    classProp.className = className;
-  }
+
+  const getRandomWidth = () => Math.floor(Math.random() * (400 - 170 + 1)) + 170;
+
+  const skeletons = Array.from({ length: 11 }, (_, index) => {
+    const randomWidth = getRandomWidth();
+    return (
+      <div key={index} className="flex h-10 w-full items-center">
+        <div className="flex w-[410px] items-center">
+          <Skeleton className="h-4" style={{ width: `${randomWidth}px` }} />
+        </div>
+        <div className="flex flex-grow justify-center">
+          <Skeleton className="h-4 w-28" />
+        </div>
+        <div className="mr-2 flex justify-end">
+          <Skeleton className="h-4 w-12" />
+        </div>
+      </div>
+    );
+  });
 
   if (isLoading) {
-    return <Spinner className="m-1 mx-auto mb-4 h-4 w-4 text-black dark:text-white" />;
+    return <div className="text-gray-300">{skeletons}</div>;
   }
 
   if (isError) {
@@ -164,35 +165,34 @@ export default function ShareLinkTable({ className }: { className?: string }) {
       </div>
     );
   }
-  if (!sharedLinks || sharedLinks.length === 0) {
+
+  if (sharedLinks.length === 0) {
     return <div className="text-gray-300">{localize('com_nav_shared_links_empty')}</div>;
   }
 
   return (
     <div
       className={cn(
-        'grid w-full gap-2',
-        '-mr-2 flex-1 flex-col overflow-y-auto pr-2 transition-opacity duration-500',
-        'max-h-[350px]',
+        '-mr-2 grid max-h-[350px] w-full flex-1 flex-col gap-2 overflow-y-auto pr-2 transition-opacity duration-500',
+        className,
       )}
       ref={containerRef}
     >
-      <table className="table-fixed text-left">
-        <thead className="sticky top-0 bg-white dark:bg-gray-700">
-          <tr className="border-b border-gray-200 text-sm font-semibold text-gray-500 dark:border-white/10 dark:text-gray-200">
-            <th className="p-3">{localize('com_nav_shared_links_name')}</th>
-            <th className="p-3">{localize('com_nav_shared_links_date_shared')}</th>
-          </tr>
-        </thead>
-        <tbody>
+      <Table>
+        <TableHeader>
+          <TableRow>
+            <TableHead>{localize('com_nav_shared_links_name')}</TableHead>
+            <TableHead>{localize('com_nav_shared_links_date_shared')}</TableHead>
+            <TableHead className="text-right">{localize('com_assistants_actions')}</TableHead>
+          </TableRow>
+        </TableHeader>
+        <TableBody>
           {sharedLinks.map((sharedLink) => (
             <ShareLinkRow key={sharedLink.shareId} sharedLink={sharedLink} />
           ))}
-        </tbody>
-      </table>
-      {(isFetchingNextPage || showLoading) && (
-        <Spinner className={cn('m-1 mx-auto mb-4 h-4 w-4 text-black dark:text-white')} />
-      )}
+        </TableBody>
+      </Table>
+      {(isFetchingNextPage || showLoading) && <Spinner className="mx-auto my-4" />}
     </div>
   );
 }
diff --git a/client/src/components/Nav/SettingsTabs/Data/SharedLinks.tsx b/client/src/components/Nav/SettingsTabs/Data/SharedLinks.tsx
index 80ff43c6845..9bd707f1979 100644
--- a/client/src/components/Nav/SettingsTabs/Data/SharedLinks.tsx
+++ b/client/src/components/Nav/SettingsTabs/Data/SharedLinks.tsx
@@ -1,6 +1,6 @@
 import { useLocalize } from '~/hooks';
-import { Dialog, DialogTrigger } from '~/components/ui';
-import DialogTemplate from '~/components/ui/DialogTemplate';
+import { OGDialog, OGDialogTrigger } from '~/components/ui';
+import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
 
 import ShareLinkTable from './SharedLinkTable';
 
@@ -11,19 +11,19 @@ export default function SharedLinks() {
     <div className="flex items-center justify-between">
       <div>{localize('com_nav_shared_links')}</div>
 
-      <Dialog>
-        <DialogTrigger asChild>
+      <OGDialog>
+        <OGDialogTrigger asChild>
           <button className="btn btn-neutral relative ">
             {localize('com_nav_shared_links_manage')}
           </button>
-        </DialogTrigger>
-        <DialogTemplate
+        </OGDialogTrigger>
+        <OGDialogTemplate
           title={localize('com_nav_shared_links')}
           className="max-w-[1000px]"
           showCancelButton={false}
           main={<ShareLinkTable />}
         />
-      </Dialog>
+      </OGDialog>
     </div>
   );
 }
diff --git a/client/src/components/Nav/SettingsTabs/General/ArchivedChats.tsx b/client/src/components/Nav/SettingsTabs/General/ArchivedChats.tsx
index 0c257a26b31..7820e784986 100644
--- a/client/src/components/Nav/SettingsTabs/General/ArchivedChats.tsx
+++ b/client/src/components/Nav/SettingsTabs/General/ArchivedChats.tsx
@@ -1,7 +1,6 @@
 import { useLocalize } from '~/hooks';
 import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
-import { OGDialog, OGDialogTrigger } from '~/components/ui';
-
+import { OGDialog, OGDialogTrigger, Button } from '~/components';
 import ArchivedChatsTable from './ArchivedChatsTable';
 
 export default function ArchivedChats() {
@@ -12,9 +11,9 @@ export default function ArchivedChats() {
       <div>{localize('com_nav_archived_chats')}</div>
       <OGDialog>
         <OGDialogTrigger asChild>
-          <button className="btn btn-neutral relative ">
+          <Button variant="outline" aria-label="Archived chats">
             {localize('com_nav_archived_chats_manage')}
-          </button>
+          </Button>
         </OGDialogTrigger>
         <OGDialogTemplate
           title={localize('com_nav_archived_chats')}
diff --git a/client/src/components/Nav/SettingsTabs/General/ArchivedChatsTable.tsx b/client/src/components/Nav/SettingsTabs/General/ArchivedChatsTable.tsx
index 205326f1513..85b193ea248 100644
--- a/client/src/components/Nav/SettingsTabs/General/ArchivedChatsTable.tsx
+++ b/client/src/components/Nav/SettingsTabs/General/ArchivedChatsTable.tsx
@@ -1,44 +1,109 @@
-import { useMemo, useState } from 'react';
-import { MessageCircle, ArchiveRestore } from 'lucide-react';
-import { useConversationsInfiniteQuery } from '~/data-provider';
-import { useAuthContext, useLocalize, useNavScrolling } from '~/hooks';
-import ArchiveButton from '~/components/Conversations/ConvoOptions/ArchiveButton';
-import DeleteButton from '~/components/Conversations/ConvoOptions/DeleteButton';
-import { Spinner } from '~/components/svg';
+import { useState, useCallback, useMemo } from 'react';
+import {
+  Search,
+  TrashIcon,
+  ChevronLeft,
+  ChevronRight,
+  // ChevronsLeft,
+  // ChevronsRight,
+  MessageCircle,
+  ArchiveRestore,
+} from 'lucide-react';
+import type { TConversation } from 'librechat-data-provider';
+import {
+  Table,
+  Input,
+  Button,
+  TableRow,
+  Skeleton,
+  OGDialog,
+  Separator,
+  TableCell,
+  TableBody,
+  TableHead,
+  TableHeader,
+  TooltipAnchor,
+  OGDialogTrigger,
+} from '~/components';
+import { useConversationsInfiniteQuery, useArchiveConvoMutation } from '~/data-provider';
+import { DeleteConversationDialog } from '~/components/Conversations/ConvoOptions';
+import { useAuthContext, useLocalize } from '~/hooks';
 import { cn } from '~/utils';
-import { ConversationListResponse } from 'librechat-data-provider';
 
-export default function ArchivedChatsTable({ className }: { className?: string }) {
+export default function ArchivedChatsTable() {
   const localize = useLocalize();
   const { isAuthenticated } = useAuthContext();
-  const [showLoading, setShowLoading] = useState(false);
+  const [isOpened, setIsOpened] = useState(false);
+  const [currentPage, setCurrentPage] = useState(1);
+  const [searchQuery, setSearchQuery] = useState('');
 
-  const { data, fetchNextPage, hasNextPage, isFetchingNextPage } = useConversationsInfiniteQuery(
-    { pageNumber: '1', isArchived: true },
-    { enabled: isAuthenticated },
+  const { data, isLoading, fetchNextPage, hasNextPage, isFetchingNextPage, refetch } =
+    useConversationsInfiniteQuery(
+      { pageNumber: currentPage.toString(), isArchived: true },
+      { enabled: isAuthenticated && isOpened },
+    );
+  const mutation = useArchiveConvoMutation();
+  const handleUnarchive = useCallback(
+    (conversationId: string) => {
+      mutation.mutate({ conversationId, isArchived: false });
+    },
+    [mutation],
   );
 
-  const { containerRef, moveToTop } = useNavScrolling<ConversationListResponse>({
-    setShowLoading,
-    hasNextPage: hasNextPage,
-    fetchNextPage: fetchNextPage,
-    isFetchingNextPage: isFetchingNextPage,
-  });
-
   const conversations = useMemo(
-    () => data?.pages.flatMap((page) => page.conversations) || [],
-    [data],
+    () => data?.pages[currentPage - 1]?.conversations ?? [],
+    [data, currentPage],
+  );
+  const totalPages = useMemo(() => Math.ceil(Number(data?.pages[0].pages ?? 1)) ?? 1, [data]);
+
+  const handleChatClick = useCallback((conversationId: string) => {
+    if (!conversationId) {
+      return;
+    }
+    window.open(`/c/${conversationId}`, '_blank');
+  }, []);
+
+  const handlePageChange = useCallback(
+    (newPage: number) => {
+      setCurrentPage(newPage);
+      if (!(hasNextPage ?? false)) {
+        return;
+      }
+      fetchNextPage({ pageParam: newPage });
+    },
+    [fetchNextPage, hasNextPage],
   );
 
-  const classProp: { className?: string } = {
-    className: 'p-1 hover:text-black dark:hover:text-white',
-  };
-  if (className) {
-    classProp.className = className;
+  const handleSearch = useCallback((query: string) => {
+    setSearchQuery(query);
+    setCurrentPage(1);
+  }, []);
+
+  const getRandomWidth = () => Math.floor(Math.random() * (400 - 170 + 1)) + 170;
+
+  const skeletons = Array.from({ length: 11 }, (_, index) => {
+    const randomWidth = getRandomWidth();
+    return (
+      <div key={index} className="flex h-10 w-full items-center">
+        <div className="flex w-[410px] items-center">
+          <Skeleton className="h-4" style={{ width: `${randomWidth}px` }} />
+        </div>
+        <div className="flex flex-grow justify-center">
+          <Skeleton className="h-4 w-28" />
+        </div>
+        <div className="mr-2 flex justify-end">
+          <Skeleton className="h-4 w-12" />
+        </div>
+      </div>
+    );
+  });
+
+  if (isLoading || isFetchingNextPage) {
+    return <div className="text-text-secondary">{skeletons}</div>;
   }
 
-  if (!conversations || conversations.length === 0) {
-    return <div className="text-gray-300">{localize('com_nav_archived_chats_empty')}</div>;
+  if (!data || (conversations.length === 0 && totalPages === 0)) {
+    return <div className="text-text-secondary">{localize('com_nav_archived_chats_empty')}</div>;
   }
 
   return (
@@ -46,64 +111,164 @@ export default function ArchivedChatsTable({ className }: { className?: string }
       className={cn(
         'grid w-full gap-2',
         'flex-1 flex-col overflow-y-auto pr-2 transition-opacity duration-500',
-        'max-h-[350px]',
+        'max-h-[629px]',
       )}
-      ref={containerRef}
+      onMouseEnter={() => setIsOpened(true)}
     >
-      <table className="table-fixed text-left">
-        <thead className="sticky top-0 bg-white dark:bg-gray-700">
-          <tr className="border-b border-gray-200 text-sm font-semibold text-gray-500 dark:border-white/10 dark:text-gray-200">
-            <th className="p-3">{localize('com_nav_archive_name')}</th>
-            <th className="p-3">{localize('com_nav_archive_created_at')}</th>
-          </tr>
-        </thead>
-        <tbody>
-          {conversations.map((conversation) => (
-            <tr
-              key={conversation.conversationId}
-              className="border-b border-gray-200 text-sm font-normal dark:border-white/10"
-            >
-              <td className="flex items-center py-3 text-blue-800/70 dark:text-blue-500">
-                <MessageCircle className="mr-1 h-5 w-5" />
-                {conversation.title}
-              </td>
-              <td className="p-1">
-                <div className="flex justify-between">
-                  <div className="flex justify-start dark:text-gray-200">
-                    {new Date(conversation.createdAt).toLocaleDateString('en-US', {
-                      month: 'long',
-                      day: 'numeric',
-                      year: 'numeric',
-                    })}
-                  </div>
-                  <div className="ml-auto mr-4 flex items-center justify-end gap-1 text-gray-400">
-                    {conversation.conversationId && (
-                      <>
-                        <ArchiveButton
-                          className="hover:text-black dark:hover:text-white"
-                          conversationId={conversation.conversationId}
-                          retainView={moveToTop}
-                          shouldArchive={false}
-                          icon={<ArchiveRestore className="h-4 w-4 hover:text-gray-300" />}
+      <div className="flex items-center">
+        <Search className="size-4 text-text-secondary" />
+        <Input
+          type="text"
+          placeholder={localize('com_nav_search_placeholder')}
+          value={searchQuery}
+          onChange={(e) => handleSearch(e.target.value)}
+          className="w-full border-none placeholder:text-text-secondary"
+        />
+      </div>
+      <Separator />
+      {conversations.length === 0 ? (
+        <div className="mt-4 text-text-secondary">{localize('com_nav_no_search_results')}</div>
+      ) : (
+        <>
+          <Table>
+            <TableHeader>
+              <TableRow>
+                <TableHead className="w-[50%] p-4">{localize('com_nav_archive_name')}</TableHead>
+                <TableHead className="w-[35%] p-1">
+                  {localize('com_nav_archive_created_at')}
+                </TableHead>
+                <TableHead className="w-[15%] p-1 text-right">
+                  {localize('com_assistants_actions')}
+                </TableHead>
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {conversations.map((conversation: TConversation) => (
+                <TableRow key={conversation.conversationId} className="hover:bg-transparent">
+                  <TableCell className="flex items-center py-3 text-text-primary">
+                    <button
+                      type="button"
+                      className="flex"
+                      aria-label="Open conversation in a new tab"
+                      onClick={() => {
+                        const conversationId = conversation.conversationId ?? '';
+                        if (!conversationId) {
+                          return;
+                        }
+                        handleChatClick(conversationId);
+                      }}
+                    >
+                      <MessageCircle className="mr-1 h-5 w-5" />
+                      <u>{conversation.title}</u>
+                    </button>
+                  </TableCell>
+                  <TableCell className="p-1">
+                    <div className="flex justify-between">
+                      <div className="flex justify-start text-text-secondary">
+                        {new Date(conversation.createdAt).toLocaleDateString('en-US', {
+                          month: 'long',
+                          day: 'numeric',
+                          year: 'numeric',
+                        })}
+                      </div>
+                    </div>
+                  </TableCell>
+                  <TableCell className="flex items-center justify-end gap-2 p-1">
+                    <TooltipAnchor
+                      description={localize('com_ui_unarchive')}
+                      render={
+                        <Button
+                          type="button"
+                          aria-label="Unarchive conversation"
+                          variant="ghost"
+                          size="icon"
+                          className="size-8"
+                          onClick={() => {
+                            const conversationId = conversation.conversationId ?? '';
+                            if (!conversationId) {
+                              return;
+                            }
+                            handleUnarchive(conversationId);
+                          }}
+                        >
+                          <ArchiveRestore className="size-4" />
+                        </Button>
+                      }
+                    />
+
+                    <OGDialog>
+                      <OGDialogTrigger asChild>
+                        <TooltipAnchor
+                          description={localize('com_ui_delete')}
+                          render={
+                            <Button
+                              type="button"
+                              aria-label="Delete archived conversation"
+                              variant="ghost"
+                              size="icon"
+                              className="size-8"
+                            >
+                              <TrashIcon className="size-4" />
+                            </Button>
+                          }
                         />
-                        <div className="h-5 w-5 hover:text-gray-300">
-                          <DeleteButton
-                            conversationId={conversation.conversationId}
-                            retainView={moveToTop}
-                            title={conversation.title ?? ''}
-                          />
-                        </div>
-                      </>
-                    )}
-                  </div>
-                </div>
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
-      {(isFetchingNextPage || showLoading) && (
-        <Spinner className={cn('m-1 mx-auto mb-4 h-4 w-4 text-black dark:text-white')} />
+                      </OGDialogTrigger>
+                      <DeleteConversationDialog
+                        conversationId={conversation.conversationId ?? ''}
+                        retainView={refetch}
+                        title={conversation.title ?? ''}
+                      />
+                    </OGDialog>
+                  </TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+
+          <div className="flex items-center justify-end gap-6 px-2 py-4">
+            <div className="text-sm font-bold text-text-primary">
+              Page {currentPage} of {totalPages}
+            </div>
+            <div className="flex space-x-2">
+              {/* <Button
+                variant="outline"
+                size="icon"
+                aria-label="Go to the previous 10 pages"
+                onClick={() => handlePageChange(Math.max(currentPage - 10, 1))}
+                disabled={currentPage === 1}
+              >
+                <ChevronsLeft className="size-4" />
+              </Button> */}
+              <Button
+                variant="outline"
+                size="icon"
+                aria-label="Go to the previous page"
+                onClick={() => handlePageChange(Math.max(currentPage - 1, 1))}
+                disabled={currentPage === 1}
+              >
+                <ChevronLeft className="size-4" />
+              </Button>
+              <Button
+                variant="outline"
+                size="icon"
+                aria-label="Go to the next page"
+                onClick={() => handlePageChange(Math.min(currentPage + 1, totalPages))}
+                disabled={currentPage === totalPages}
+              >
+                <ChevronRight className="size-4" />
+              </Button>
+              {/* <Button
+                variant="outline"
+                size="icon"
+                aria-label="Go to the next 10 pages"
+                onClick={() => handlePageChange(Math.min(currentPage + 10, totalPages))}
+                disabled={currentPage === totalPages}
+              >
+                <ChevronsRight className="size-4" />
+              </Button> */}
+            </div>
+          </div>
+        </>
       )}
     </div>
   );
diff --git a/client/src/components/Nav/SettingsTabs/General/AutoScrollSwitch.tsx b/client/src/components/Nav/SettingsTabs/General/AutoScrollSwitch.tsx
index 8eb99e571b9..294d7ac043e 100644
--- a/client/src/components/Nav/SettingsTabs/General/AutoScrollSwitch.tsx
+++ b/client/src/components/Nav/SettingsTabs/General/AutoScrollSwitch.tsx
@@ -24,8 +24,9 @@ export default function AutoScrollSwitch({
       <Switch
         id="autoScroll"
         checked={autoScroll}
+        aria-label="Auto-Scroll to latest message on chat open"
         onCheckedChange={handleCheckedChange}
-        className="ml-4 mt-2"
+        className="ml-4 mt-2 ring-ring-primary"
         data-testid="autoScroll"
       />
     </div>
diff --git a/client/src/components/Nav/SettingsTabs/General/General.tsx b/client/src/components/Nav/SettingsTabs/General/General.tsx
index 7a01e984199..905862d3bb9 100644
--- a/client/src/components/Nav/SettingsTabs/General/General.tsx
+++ b/client/src/components/Nav/SettingsTabs/General/General.tsx
@@ -1,11 +1,10 @@
 import { useRecoilState } from 'recoil';
-import * as Tabs from '@radix-ui/react-tabs';
 import Cookies from 'js-cookie';
-import { SettingsTabValues } from 'librechat-data-provider';
-import React, { useContext, useCallback, useRef } from 'react';
+import React, { useContext, useCallback } from 'react';
 import type { TDangerButtonProps } from '~/common';
-import { ThemeContext, useLocalize } from '~/hooks';
+import UserMsgMarkdownSwitch from './UserMsgMarkdownSwitch';
 import HideSidePanelSwitch from './HideSidePanelSwitch';
+import { ThemeContext, useLocalize } from '~/hooks';
 import AutoScrollSwitch from './AutoScrollSwitch';
 import ArchivedChats from './ArchivedChats';
 import { Dropdown } from '~/components/ui';
@@ -35,8 +34,7 @@ export const ThemeSelector = ({
         value={theme}
         onChange={onChange}
         options={themeOptions}
-        sizeClasses="w-[220px]"
-        anchor="bottom start"
+        sizeClasses="w-[180px]"
         testId="theme-selector"
       />
     </div>
@@ -113,7 +111,6 @@ export const LangSelector = ({
         value={langcode}
         onChange={onChange}
         sizeClasses="[--anchor-max-height:256px]"
-        anchor="bottom start"
         options={languageOptions}
       />
     </div>
@@ -125,8 +122,6 @@ function General() {
 
   const [langcode, setLangcode] = useRecoilState(store.lang);
 
-  const contentRef = useRef(null);
-
   const changeTheme = useCallback(
     (value: string) => {
       setTheme(value);
@@ -151,32 +146,26 @@ function General() {
   );
 
   return (
-    <Tabs.Content
-      value={SettingsTabValues.GENERAL}
-      role="tabpanel"
-      className="w-full md:min-h-[271px]"
-      ref={contentRef}
-    >
-      <div className="flex flex-col gap-3 text-sm text-text-primary">
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <ThemeSelector theme={theme} onChange={changeTheme} />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <LangSelector langcode={langcode} onChange={changeLang} />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <AutoScrollSwitch />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <HideSidePanelSwitch />
-        </div>
-        <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-          <ArchivedChats />
-        </div>
-        {/* <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-600">
-        </div> */}
+    <div className="flex flex-col gap-3 p-1 text-sm text-text-primary">
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+        <ThemeSelector theme={theme} onChange={changeTheme} />
+      </div>
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+        <LangSelector langcode={langcode} onChange={changeLang} />
+      </div>
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+        <UserMsgMarkdownSwitch />
       </div>
-    </Tabs.Content>
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+        <AutoScrollSwitch />
+      </div>
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+        <HideSidePanelSwitch />
+      </div>
+      <div className="border-b border-border-light pb-3 last-of-type:border-b-0">
+        <ArchivedChats />
+      </div>
+    </div>
   );
 }
 
diff --git a/client/src/components/Nav/SettingsTabs/General/HideSidePanelSwitch.tsx b/client/src/components/Nav/SettingsTabs/General/HideSidePanelSwitch.tsx
index b8cf3ec372f..d5854a50ce7 100644
--- a/client/src/components/Nav/SettingsTabs/General/HideSidePanelSwitch.tsx
+++ b/client/src/components/Nav/SettingsTabs/General/HideSidePanelSwitch.tsx
@@ -25,6 +25,7 @@ export default function HideSidePanelSwitch({
       <Switch
         id="hideSidePanel"
         checked={hideSidePanel}
+        aria-label="Hide right-most side panel"
         onCheckedChange={handleCheckedChange}
         className="ml-4 mt-2"
         data-testid="hideSidePanel"
diff --git a/client/src/components/Nav/SettingsTabs/General/LangSelector.spec.tsx b/client/src/components/Nav/SettingsTabs/General/LangSelector.spec.tsx
index 74469b2fd53..2ad856d688e 100644
--- a/client/src/components/Nav/SettingsTabs/General/LangSelector.spec.tsx
+++ b/client/src/components/Nav/SettingsTabs/General/LangSelector.spec.tsx
@@ -1,6 +1,6 @@
 import 'test/matchMedia.mock';
 import React from 'react';
-import { render, fireEvent } from '@testing-library/react';
+import { render, fireEvent, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
 import { LangSelector } from './General';
 import { RecoilRoot } from 'recoil';
@@ -18,14 +18,15 @@ describe('LangSelector', () => {
       unobserve = jest.fn();
       disconnect = jest.fn();
     };
-    const { getByText } = render(
+    const { getByText, getByRole } = render(
       <RecoilRoot>
         <LangSelector langcode="en-US" onChange={mockOnChange} />
       </RecoilRoot>,
     );
 
     expect(getByText('Language')).toBeInTheDocument();
-    expect(getByText('English')).toBeInTheDocument();
+    const dropdownButton = getByRole('combobox');
+    expect(dropdownButton).toHaveTextContent('English');
   });
 
   it('calls onChange when the select value changes', async () => {
@@ -34,25 +35,23 @@ describe('LangSelector', () => {
       unobserve = jest.fn();
       disconnect = jest.fn();
     };
-    const { getByText, getByTestId } = render(
+    const { getByRole, getByTestId } = render(
       <RecoilRoot>
         <LangSelector langcode="en-US" onChange={mockOnChange} />
       </RecoilRoot>,
     );
 
-    expect(getByText('English')).toBeInTheDocument();
+    expect(getByRole('combobox')).toHaveTextContent('English');
 
-    // Find the dropdown button by data-testid
     const dropdownButton = getByTestId('dropdown-menu');
 
-    // Open the dropdown
     fireEvent.click(dropdownButton);
 
-    // Find the option by text and click it
-    const darkOption = getByText('Italiano');
-    fireEvent.click(darkOption);
+    const italianOption = getByRole('option', { name: 'Italiano' });
+    fireEvent.click(italianOption);
 
-    // Ensure that the onChange is called with the expected value after a short delay
-    await new Promise((resolve) => setTimeout(resolve, 0));
+    await waitFor(() => {
+      expect(mockOnChange).toHaveBeenCalledWith('it-IT');
+    });
   });
 });
diff --git a/client/src/components/Nav/SettingsTabs/General/ThemeSelector.spec.tsx b/client/src/components/Nav/SettingsTabs/General/ThemeSelector.spec.tsx
index e8d28c8a391..d3c55f1062e 100644
--- a/client/src/components/Nav/SettingsTabs/General/ThemeSelector.spec.tsx
+++ b/client/src/components/Nav/SettingsTabs/General/ThemeSelector.spec.tsx
@@ -20,14 +20,15 @@ describe('ThemeSelector', () => {
       unobserve = jest.fn();
       disconnect = jest.fn();
     };
-    const { getByText } = render(
+    const { getByText, getByRole } = render(
       <RecoilRoot>
         <ThemeSelector theme="system" onChange={mockOnChange} />
       </RecoilRoot>,
     );
 
     expect(getByText('Theme')).toBeInTheDocument();
-    expect(getByText('System')).toBeInTheDocument();
+    const dropdownButton = getByRole('combobox');
+    expect(dropdownButton).toHaveTextContent('System');
   });
 
   it('calls onChange when the select value changes', async () => {
@@ -44,17 +45,13 @@ describe('ThemeSelector', () => {
 
     expect(getByText('Theme')).toBeInTheDocument();
 
-    // Find the dropdown button by data-testid
     const dropdownButton = getByTestId('theme-selector');
 
-    // Open the dropdown
     fireEvent.click(dropdownButton);
 
-    // Find the option by text and click it
     const darkOption = getByText('Dark');
     fireEvent.click(darkOption);
 
-    // Ensure that the onChange is called with the expected value
     await waitFor(() => {
       expect(mockOnChange).toHaveBeenCalledWith('dark');
     });
diff --git a/client/src/components/Nav/SettingsTabs/General/UserMsgMarkdownSwitch.tsx b/client/src/components/Nav/SettingsTabs/General/UserMsgMarkdownSwitch.tsx
new file mode 100644
index 00000000000..411692c515c
--- /dev/null
+++ b/client/src/components/Nav/SettingsTabs/General/UserMsgMarkdownSwitch.tsx
@@ -0,0 +1,35 @@
+import { useRecoilState } from 'recoil';
+import { Switch } from '~/components/ui';
+import { useLocalize } from '~/hooks';
+import store from '~/store';
+
+export default function UserMsgMarkdownSwitch({
+  onCheckedChange,
+}: {
+  onCheckedChange?: (value: boolean) => void;
+}) {
+  const localize = useLocalize();
+  const [enableUserMsgMarkdown, setEnableUserMsgMarkdown] = useRecoilState<boolean>(
+    store.enableUserMsgMarkdown,
+  );
+
+  const handleCheckedChange = (value: boolean) => {
+    setEnableUserMsgMarkdown(value);
+    if (onCheckedChange) {
+      onCheckedChange(value);
+    }
+  };
+
+  return (
+    <div className="flex items-center justify-between">
+      <div> {localize('com_nav_user_msg_markdown')} </div>
+      <Switch
+        id="enableUserMsgMarkdown"
+        checked={enableUserMsgMarkdown}
+        onCheckedChange={handleCheckedChange}
+        className="ml-4 mt-2 ring-ring-primary"
+        data-testid="enableUserMsgMarkdown"
+      />
+    </div>
+  );
+}
diff --git a/client/src/components/Nav/SettingsTabs/HoverCardSettings.tsx b/client/src/components/Nav/SettingsTabs/HoverCardSettings.tsx
index 0e267c07780..27d4ba7db52 100644
--- a/client/src/components/Nav/SettingsTabs/HoverCardSettings.tsx
+++ b/client/src/components/Nav/SettingsTabs/HoverCardSettings.tsx
@@ -9,12 +9,12 @@ const HoverCardSettings = ({ side, text }) => {
   return (
     <HoverCard openDelay={500}>
       <HoverCardTrigger>
-        <CircleHelpIcon className="h-5 w-5 text-gray-500" />{' '}
+        <CircleHelpIcon className="h-5 w-5 text-text-tertiary" />{' '}
       </HoverCardTrigger>
       <HoverCardPortal>
         <HoverCardContent side={side} className="z-[999] w-80">
           <div className="space-y-2">
-            <p className="text-sm text-gray-600 dark:text-gray-300">{localize(text)}</p>
+            <p className="text-sm text-text-secondary">{localize(text)}</p>
           </div>
         </HoverCardContent>
       </HoverCardPortal>
diff --git a/client/src/components/Nav/SettingsTabs/Speech/STT/EngineSTTDropdown.tsx b/client/src/components/Nav/SettingsTabs/Speech/STT/EngineSTTDropdown.tsx
index 9ccba661ccf..0f59c85d498 100644
--- a/client/src/components/Nav/SettingsTabs/Speech/STT/EngineSTTDropdown.tsx
+++ b/client/src/components/Nav/SettingsTabs/Speech/STT/EngineSTTDropdown.tsx
@@ -31,7 +31,6 @@ const EngineSTTDropdown: React.FC<EngineSTTDropdownProps> = ({ external }) => {
         onChange={handleSelect}
         options={endpointOptions}
         sizeClasses="w-[180px]"
-        anchor="bottom start"
         testId="EngineSTTDropdown"
       />
     </div>
diff --git a/client/src/components/Nav/SettingsTabs/Speech/Speech.tsx b/client/src/components/Nav/SettingsTabs/Speech/Speech.tsx
index 779c32ef93b..137c4493836 100644
--- a/client/src/components/Nav/SettingsTabs/Speech/Speech.tsx
+++ b/client/src/components/Nav/SettingsTabs/Speech/Speech.tsx
@@ -1,7 +1,6 @@
 import { useRecoilState } from 'recoil';
 import * as Tabs from '@radix-ui/react-tabs';
 import { Lightbulb, Cog } from 'lucide-react';
-import { SettingsTabValues } from 'librechat-data-provider';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
 import { useGetCustomConfigSpeechQuery } from 'librechat-data-provider/react-query';
 import {
@@ -141,130 +140,93 @@ function Speech() {
   useOnClickOutside(contentRef, () => confirmClear && setConfirmClear(false), []);
 
   return (
-    <Tabs.Content
-      value={SettingsTabValues.SPEECH}
-      role="tabpanel"
-      className="w-full md:min-h-[271px]"
-      ref={contentRef}
+    <Tabs.Root
+      defaultValue={'simple'}
+      orientation="horizontal"
+      value={advancedMode ? 'advanced' : 'simple'}
     >
-      <Tabs.Root
-        defaultValue={'simple'}
-        orientation="horizontal"
-        value={advancedMode ? 'advanced' : 'simple'}
-      >
-        <div className="sticky -top-1 z-50 mb-4 bg-white dark:bg-gray-700">
-          <Tabs.List className="flex justify-center bg-white dark:bg-gray-700">
-            <Tabs.Trigger
-              onClick={() => setAdvancedMode(false)}
-              className={cn(
-                'group m-1 flex items-center justify-center gap-2 rounded-md px-4 py-2 text-sm text-black transition-all duration-200 ease-in-out radix-state-active:bg-white radix-state-active:text-black dark:text-white dark:radix-state-active:bg-gray-600',
-                isSmallScreen
-                  ? 'flex-row items-center justify-center text-sm text-gray-700 radix-state-active:bg-gray-100 radix-state-active:text-black dark:text-gray-300 dark:radix-state-active:text-white'
-                  : 'bg-white radix-state-active:bg-gray-100 dark:bg-gray-700',
-                'w-full',
-              )}
-              value="simple"
-              style={{ userSelect: 'none' }}
-            >
-              <Lightbulb />
-              Simple
-            </Tabs.Trigger>
-            <Tabs.Trigger
-              onClick={() => setAdvancedMode(true)}
-              className={cn(
-                'group m-1 flex items-center justify-center gap-2 rounded-md px-4 py-2 text-sm text-black transition-all duration-200 ease-in-out radix-state-active:bg-white radix-state-active:text-black dark:text-white dark:radix-state-active:bg-gray-600',
-                isSmallScreen
-                  ? 'flex-row items-center justify-center text-sm text-gray-700 radix-state-active:bg-gray-100 radix-state-active:text-black dark:text-gray-300 dark:radix-state-active:text-white'
-                  : 'bg-white radix-state-active:bg-gray-100 dark:bg-gray-700',
-                'w-full',
-              )}
-              value="advanced"
-              style={{ userSelect: 'none' }}
-            >
-              <Cog />
-              Advanced
-            </Tabs.Trigger>
-          </Tabs.List>
+      <div className="sticky -top-1 z-50 mb-4 bg-white dark:bg-gray-700">
+        <Tabs.List className="flex justify-center bg-background">
+          <Tabs.Trigger
+            onClick={() => setAdvancedMode(false)}
+            className={cn(
+              'group m-1 flex items-center justify-center gap-2 bg-transparent px-4 py-2 text-sm text-text-secondary transition-all duration-200 ease-in-out radix-state-active:bg-secondary radix-state-active:text-foreground radix-state-active:shadow-lg',
+              isSmallScreen ? 'flex-row rounded-lg' : 'rounded-xl',
+              'w-full',
+            )}
+            value="simple"
+            style={{ userSelect: 'none' }}
+          >
+            <Lightbulb />
+            Simple
+          </Tabs.Trigger>
+          <Tabs.Trigger
+            onClick={() => setAdvancedMode(true)}
+            className={cn(
+              'group m-1 flex items-center justify-center gap-2 bg-transparent px-4 py-2 text-sm text-text-secondary transition-all duration-200 ease-in-out radix-state-active:bg-secondary radix-state-active:text-foreground radix-state-active:shadow-lg',
+              isSmallScreen ? 'flex-row rounded-lg' : 'rounded-xl',
+              'w-full',
+            )}
+            value="advanced"
+            style={{ userSelect: 'none' }}
+          >
+            <Cog />
+            Advanced
+          </Tabs.Trigger>
+        </Tabs.List>
+      </div>
+
+      <Tabs.Content value={'simple'}>
+        <div className="flex flex-col gap-3 text-sm text-text-primary">
+          <SpeechToTextSwitch />
+          <EngineSTTDropdown external={sttExternal} />
+          <LanguageSTTDropdown />
+          <div className="h-px bg-border-medium" role="none" />
+          <TextToSpeechSwitch />
+          <EngineTTSDropdown external={ttsExternal} />
+          <VoiceDropdown />
         </div>
+      </Tabs.Content>
 
-        <Tabs.Content value={'simple'}>
-          <div className="flex flex-col gap-3 text-sm text-black dark:text-gray-50">
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <SpeechToTextSwitch />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <EngineSTTDropdown external={sttExternal} />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <LanguageSTTDropdown />
-            </div>
-            <div className="h-px bg-black/20 bg-white/20" role="none" />
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <TextToSpeechSwitch />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <EngineTTSDropdown external={ttsExternal} />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <VoiceDropdown />
-            </div>
-          </div>
-        </Tabs.Content>
+      <Tabs.Content value={'advanced'}>
+        <div className="flex flex-col gap-3 text-sm text-text-primary">
+          <ConversationModeSwitch />
+          <div className="mt-2 h-px bg-border-medium" role="none" />
+          <SpeechToTextSwitch />
 
-        <Tabs.Content value={'advanced'}>
-          <div className="flex flex-col gap-3 text-sm text-black dark:text-gray-50">
-            <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">
-              <ConversationModeSwitch />
-            </div>
-            <div className="h-px bg-black/20 bg-white/20" role="none" />
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <SpeechToTextSwitch />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <EngineSTTDropdown external={sttExternal} />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <LanguageSTTDropdown />
-            </div>
-            <div className="border-b pb-2 last-of-type:border-b-0 dark:border-gray-700">
-              <AutoTranscribeAudioSwitch />
-            </div>
-            {autoTranscribeAudio && (
-              <div className="border-b pb-2 last-of-type:border-b-0 dark:border-gray-700">
-                <DecibelSelector />
-              </div>
-            )}
-            <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">
-              <AutoSendTextSelector />
-            </div>
-            <div className="h-px bg-black/20 bg-white/20" role="none" />
-            <div className="border-b pb-3 last-of-type:border-b-0 dark:border-gray-700">
-              <TextToSpeechSwitch />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <AutomaticPlaybackSwitch />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <EngineTTSDropdown external={ttsExternal} />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <VoiceDropdown />
-            </div>
-            {engineTTS === 'browser' && (
-              <div className="border-b pb-2 last-of-type:border-b-0 dark:border-gray-700">
-                <CloudBrowserVoicesSwitch />
-              </div>
-            )}
-            <div className="border-b pb-2 last-of-type:border-b-0 dark:border-gray-700">
-              <PlaybackRate />
-            </div>
-            <div className="border-b last-of-type:border-b-0 dark:border-gray-700">
-              <CacheTTSSwitch />
+          <EngineSTTDropdown external={sttExternal} />
+
+          <LanguageSTTDropdown />
+          <div className="pb-2">
+            <AutoTranscribeAudioSwitch />
+          </div>
+          {autoTranscribeAudio && (
+            <div className="pb-2">
+              <DecibelSelector />
             </div>
+          )}
+          <div className="pb-2">
+            <AutoSendTextSelector />
           </div>
-        </Tabs.Content>
-      </Tabs.Root>
-    </Tabs.Content>
+          <div className="h-px bg-border-medium" role="none" />
+          <div className="pb-3">
+            <TextToSpeechSwitch />
+          </div>
+          <AutomaticPlaybackSwitch />
+          <EngineTTSDropdown external={ttsExternal} />
+          <VoiceDropdown />
+          {engineTTS === 'browser' && (
+            <div className="pb-2">
+              <CloudBrowserVoicesSwitch />
+            </div>
+          )}
+          <div className="pb-2">
+            <PlaybackRate />
+          </div>
+          <CacheTTSSwitch />
+        </div>
+      </Tabs.Content>
+    </Tabs.Root>
   );
 }
 
diff --git a/client/src/components/Nav/index.ts b/client/src/components/Nav/index.ts
index 895dc12b76b..5770793712d 100644
--- a/client/src/components/Nav/index.ts
+++ b/client/src/components/Nav/index.ts
@@ -1,7 +1,6 @@
 export * from './ExportConversation';
 export * from './SettingsTabs/';
 export { default as ClearConvos } from './ClearConvos';
-export { default as Logout } from './Logout';
 export { default as MobileNav } from './MobileNav';
 export { default as Nav } from './Nav';
 export { default as NavLink } from './NavLink';
diff --git a/client/src/components/Prompts/Groups/FilterPrompts.tsx b/client/src/components/Prompts/Groups/FilterPrompts.tsx
index 3230a8e3145..1981faf5b12 100644
--- a/client/src/components/Prompts/Groups/FilterPrompts.tsx
+++ b/client/src/components/Prompts/Groups/FilterPrompts.tsx
@@ -31,7 +31,7 @@ export function FilterItem({
   return (
     <DropdownMenuItem
       onClick={onClick}
-      className="relative cursor-pointer gap-2 text-text-secondary hover:bg-surface-tertiary focus:bg-surface-tertiary dark:focus:bg-surface-tertiary"
+      className="relative cursor-pointer gap-2 text-text-secondary hover:bg-surface-tertiary focus:bg-surface-tertiary"
     >
       {icon}
       <span>{label}</span>
diff --git a/client/src/components/Prompts/Groups/List.tsx b/client/src/components/Prompts/Groups/List.tsx
index f8d0d82fd01..d04b3358f8c 100644
--- a/client/src/components/Prompts/Groups/List.tsx
+++ b/client/src/components/Prompts/Groups/List.tsx
@@ -31,7 +31,7 @@ export default function List({
         <div className="flex w-full justify-end">
           <Button
             variant="outline"
-            className="mx-2 w-full px-3"
+            className="mx-2 w-full bg-transparent px-3"
             onClick={() => navigate('/d/prompts/new')}
           >
             + {localize('com_ui_create_prompt')}
diff --git a/client/src/components/Prompts/Groups/ListCard.tsx b/client/src/components/Prompts/Groups/ListCard.tsx
index 2730bdc27f1..c17faed8bf4 100644
--- a/client/src/components/Prompts/Groups/ListCard.tsx
+++ b/client/src/components/Prompts/Groups/ListCard.tsx
@@ -1,3 +1,4 @@
+import React from 'react';
 import CategoryIcon from '~/components/Prompts/Groups/CategoryIcon';
 
 export default function ListCard({
@@ -10,19 +11,33 @@ export default function ListCard({
   category: string;
   name: string;
   snippet: string;
-  onClick?: React.MouseEventHandler<HTMLButtonElement>;
+  onClick?: React.MouseEventHandler<HTMLDivElement | HTMLButtonElement>;
   children?: React.ReactNode;
 }) {
+  const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement | HTMLButtonElement>) => {
+    if (event.key === 'Enter' || event.key === ' ') {
+      event.preventDefault();
+      onClick?.(event as unknown as React.MouseEvent<HTMLDivElement | HTMLButtonElement>);
+    }
+  };
+
   return (
-    <button
+    <div
       onClick={onClick}
+      onKeyDown={handleKeyDown}
       className="relative my-2 flex w-full cursor-pointer flex-col gap-2 rounded-2xl border border-border-light px-3 pb-4 pt-3 text-start
       align-top text-[15px] shadow-[0_0_2px_0_rgba(0,0,0,0.05),0_4px_6px_0_rgba(0,0,0,0.02)] transition-all duration-300 ease-in-out hover:bg-surface-tertiary"
+      role="button"
+      tabIndex={0}
+      aria-labelledby={`card-title-${name}`}
     >
       <div className="flex w-full justify-between">
         <div className="flex flex-row gap-2">
-          <CategoryIcon category={category} className="icon-md" />
-          <h3 className="break-word select-none text-balance text-sm font-semibold text-text-primary">
+          <CategoryIcon category={category} className="icon-md" aria-hidden="true" />
+          <h3
+            id={`card-title-${name}`}
+            className="break-word select-none text-balance text-sm font-semibold text-text-primary"
+          >
             {name}
           </h3>
         </div>
@@ -31,6 +46,6 @@ export default function ListCard({
       <div className="ellipsis max-w-full select-none text-balance text-sm text-text-secondary">
         {snippet}
       </div>
-    </button>
+    </div>
   );
 }
diff --git a/client/src/components/Prompts/ManagePrompts.tsx b/client/src/components/Prompts/ManagePrompts.tsx
index 60115a01f03..6c9ce8661b9 100644
--- a/client/src/components/Prompts/ManagePrompts.tsx
+++ b/client/src/components/Prompts/ManagePrompts.tsx
@@ -1,7 +1,7 @@
 import { useCallback } from 'react';
 import { useSetRecoilState } from 'recoil';
 import { useLocalize, useCustomLink } from '~/hooks';
-import { buttonVariants } from '~/components/ui';
+import { Button } from '~/components/ui';
 import { cn } from '~/utils';
 import store from '~/store';
 
@@ -15,13 +15,10 @@ export default function ManagePrompts({ className }: { className?: string }) {
   }, [setPromptsName, setPromptsCategory]);
 
   const clickHandler = useCustomLink('/d/prompts', clickCallback);
+
   return (
-    <a
-      className={cn(buttonVariants({ variant: 'outline' }), className)}
-      href="/d/prompts"
-      onClick={clickHandler}
-    >
+    <Button variant="outline" className={cn(className, 'bg-transparent')} onClick={clickHandler}>
       {localize('com_ui_manage')}
-    </a>
+    </Button>
   );
 }
diff --git a/client/src/components/Prompts/PromptsView.tsx b/client/src/components/Prompts/PromptsView.tsx
index 089f2dbb4a7..fcc23bfb7c6 100644
--- a/client/src/components/Prompts/PromptsView.tsx
+++ b/client/src/components/Prompts/PromptsView.tsx
@@ -41,7 +41,7 @@ export default function PromptsView() {
         <GroupSidePanel isDetailView={isDetailView} {...groupsNav}>
           <div className="mx-2 mt-1 flex flex-row items-center justify-between">
             <FilterPrompts setName={groupsNav.setName} />
-            <AutoSendPrompt className="text-xs dark:text-white" />
+            <AutoSendPrompt className="text-xs text-text-primary" />
           </div>
         </GroupSidePanel>
         <div
diff --git a/client/src/components/Prompts/SharePrompt.tsx b/client/src/components/Prompts/SharePrompt.tsx
index 8f07e224031..c56897d0002 100644
--- a/client/src/components/Prompts/SharePrompt.tsx
+++ b/client/src/components/Prompts/SharePrompt.tsx
@@ -31,7 +31,7 @@ const SharePrompt = ({ group, disabled }: { group?: TPromptGroup; disabled: bool
   const { data: startupConfig = {} as TStartupConfig, isFetching } = useGetStartupConfig();
   const { instanceProjectId } = startupConfig;
   const groupIsGlobal = useMemo(
-    () => !!group?.projectIds?.includes(instanceProjectId),
+    () => !!(group?.projectIds ?? []).includes(instanceProjectId),
     [group, instanceProjectId],
   );
 
@@ -57,7 +57,8 @@ const SharePrompt = ({ group, disabled }: { group?: TPromptGroup; disabled: bool
   }
 
   const onSubmit = (data: FormValues) => {
-    if (!group._id || !instanceProjectId) {
+    const groupId = group._id ?? '';
+    if (!groupId || !instanceProjectId) {
       return;
     }
 
@@ -70,7 +71,7 @@ const SharePrompt = ({ group, disabled }: { group?: TPromptGroup; disabled: bool
     }
 
     updateGroup.mutate({
-      id: group._id,
+      id: groupId,
       payload,
     });
   };
@@ -87,24 +88,38 @@ const SharePrompt = ({ group, disabled }: { group?: TPromptGroup; disabled: bool
           <Share2Icon className="cursor-pointer text-white " />
         </Button>
       </OGDialogTrigger>
-      <OGDialogContent className="bg-white dark:border-gray-700 dark:bg-gray-850 dark:text-gray-300">
+      <OGDialogContent className="border-border-light bg-surface-primary-alt text-text-secondary">
         <OGDialogTitle>{localize('com_ui_share_var', `"${group.name}"`)}</OGDialogTitle>
         <form className="p-2" onSubmit={handleSubmit(onSubmit)}>
           <div className="mb-4 flex items-center justify-between gap-2 py-4">
-            <label
-              className="cursor-pointer select-none"
-              htmlFor={Permissions.SHARED_GLOBAL}
-              onClick={() =>
-                setValue(Permissions.SHARED_GLOBAL, !getValues(Permissions.SHARED_GLOBAL), {
-                  shouldDirty: true,
-                })
-              }
-            >
-              {localize('com_ui_share_to_all_users')}
-              {groupIsGlobal && (
-                <span className="ml-2 text-xs">{localize('com_ui_prompt_shared_to_all')}</span>
-              )}
-            </label>
+            <div className="flex items-center">
+              <button
+                type="button"
+                className="mr-2 cursor-pointer"
+                onClick={() =>
+                  setValue(Permissions.SHARED_GLOBAL, !getValues(Permissions.SHARED_GLOBAL), {
+                    shouldDirty: true,
+                  })
+                }
+                onKeyDown={(e) => {
+                  if (e.key === 'Enter' || e.key === ' ') {
+                    e.preventDefault();
+                    setValue(Permissions.SHARED_GLOBAL, !getValues(Permissions.SHARED_GLOBAL), {
+                      shouldDirty: true,
+                    });
+                  }
+                }}
+                aria-checked={getValues(Permissions.SHARED_GLOBAL)}
+                role="checkbox"
+              >
+                {localize('com_ui_share_to_all_users')}
+              </button>
+              <label htmlFor={Permissions.SHARED_GLOBAL} className="select-none">
+                {groupIsGlobal && (
+                  <span className="ml-2 text-xs">{localize('com_ui_prompt_shared_to_all')}</span>
+                )}
+              </label>
+            </div>
             <Controller
               name={Permissions.SHARED_GLOBAL}
               control={control}
@@ -126,7 +141,7 @@ const SharePrompt = ({ group, disabled }: { group?: TPromptGroup; disabled: bool
                   {...field}
                   checked={field.value}
                   onCheckedChange={field.onChange}
-                  value={field?.value?.toString()}
+                  value={field.value.toString()}
                 />
               )}
             />
diff --git a/client/src/components/SidePanel/Agents/AgentConfig.tsx b/client/src/components/SidePanel/Agents/AgentConfig.tsx
index e8395ba2b55..a35aa8e2eab 100644
--- a/client/src/components/SidePanel/Agents/AgentConfig.tsx
+++ b/client/src/components/SidePanel/Agents/AgentConfig.tsx
@@ -11,9 +11,10 @@ import Action from '~/components/SidePanel/Builder/Action';
 import { useLocalize } from '~/hooks';
 import { ToolSelectDialog } from '~/components/Tools';
 import { useToastContext } from '~/Providers';
-import ContextButton from './ContextButton';
 import { Spinner } from '~/components/svg';
+import DeleteButton from './DeleteButton';
 import AgentAvatar from './AgentAvatar';
+import ShareAgent from './ShareAgent';
 import AgentTool from './AgentTool';
 import { Panel } from '~/common';
 
@@ -57,14 +58,14 @@ export default function AgentConfig({
     () => agentsConfig?.capabilities?.includes(Capabilities.actions),
     [agentsConfig],
   );
-  const retrievalEnabled = useMemo(
-    () => agentsConfig?.capabilities?.includes(Capabilities.retrieval),
-    [agentsConfig],
-  );
-  const codeEnabled = useMemo(
-    () => agentsConfig?.capabilities?.includes(Capabilities.code_interpreter),
-    [agentsConfig],
-  );
+  // const retrievalEnabled = useMemo(
+  //   () => agentsConfig?.capabilities?.includes(Capabilities.retrieval),
+  //   [agentsConfig],
+  // );
+  // const codeEnabled = useMemo(
+  //   () => agentsConfig?.capabilities?.includes(Capabilities.code_interpreter),
+  //   [agentsConfig],
+  // );
 
   /* Mutations */
   const update = useUpdateAgentMutation({
@@ -190,7 +191,7 @@ export default function AgentConfig({
             name="id"
             control={control}
             render={({ field }) => (
-              <p className="h-3 text-xs italic text-gray-600" aria-live="polite">
+              <p className="h-3 text-xs italic text-text-secondary" aria-live="polite">
                 {field.value}
               </p>
             )}
@@ -221,12 +222,11 @@ export default function AgentConfig({
         {/* Instructions */}
         <div className="mb-6">
           <label className={labelClass} htmlFor="instructions">
-            {localize('com_ui_instructions')} <span className="text-red-500">*</span>
+            {localize('com_ui_instructions')}
           </label>
           <Controller
             name="instructions"
             control={control}
-            rules={{ required: true, minLength: 1 }}
             render={({ field, fieldState: { error } }) => (
               <>
                 <textarea
@@ -276,16 +276,16 @@ export default function AgentConfig({
                   />
                 </div>
               )}
-              <span>{model ? model : localize('com_ui_select_model')}</span>
+              <span>{model != null ? model : localize('com_ui_select_model')}</span>
             </div>
           </button>
         </div>
         {/* Agent Tools & Actions */}
         <div className="mb-6">
           <label className={labelClass}>
-            {`${toolsEnabled ? localize('com_assistants_tools') : ''}
-              ${toolsEnabled && actionsEnabled ? ' + ' : ''}
-              ${actionsEnabled ? localize('com_assistants_actions') : ''}`}
+            {`${toolsEnabled === true ? localize('com_assistants_tools') : ''}
+              ${toolsEnabled === true && actionsEnabled === true ? ' + ' : ''}
+              ${actionsEnabled === true ? localize('com_assistants_actions') : ''}`}
           </label>
           <div className="space-y-2">
             {tools?.map((func, i) => (
@@ -339,11 +339,16 @@ export default function AgentConfig({
         </div>
         {/* Context Button */}
         <div className="flex items-center justify-end gap-2">
-          <ContextButton
+          <DeleteButton
             agent_id={agent_id}
             setCurrentAgentId={setCurrentAgentId}
             createMutation={create}
           />
+          <ShareAgent
+            agent_id={agent_id}
+            agentName={agent?.name ?? ''}
+            projectIds={agent?.projectIds ?? []}
+          />
           {/* Submit Button */}
           <button
             className="btn btn-primary focus:shadow-outline flex w-full items-center justify-center px-4 py-2 font-semibold text-white hover:bg-green-600 focus:border-green-500"
diff --git a/client/src/components/SidePanel/Agents/AgentSelect.tsx b/client/src/components/SidePanel/Agents/AgentSelect.tsx
index 132adcee593..7803cca4643 100644
--- a/client/src/components/SidePanel/Agents/AgentSelect.tsx
+++ b/client/src/components/SidePanel/Agents/AgentSelect.tsx
@@ -1,10 +1,11 @@
-import { Plus } from 'lucide-react';
+import { Plus, EarthIcon } from 'lucide-react';
 import { useCallback, useEffect, useRef } from 'react';
+import { useGetStartupConfig } from 'librechat-data-provider/react-query';
 import { Capabilities, defaultAgentFormValues } from 'librechat-data-provider';
-import type { AgentCapabilities, AgentForm, TAgentOption } from '~/common';
 import type { Agent, AgentCreateParams } from 'librechat-data-provider';
 import type { UseMutationResult } from '@tanstack/react-query';
 import type { UseFormReset } from 'react-hook-form';
+import type { AgentCapabilities, AgentForm, TAgentOption } from '~/common';
 import { cn, createDropdownSetter, createProviderOption, processAgentOption } from '~/utils';
 import { useListAgentsQuery, useGetAgentByIdQuery } from '~/data-provider';
 import SelectDropDown from '~/components/ui/SelectDropDown';
@@ -16,7 +17,7 @@ const keys = new Set(Object.keys(defaultAgentFormValues));
 export default function AgentSelect({
   reset,
   value: currentAgentValue,
-  selectedAgentId,
+  selectedAgentId = null,
   setCurrentAgentId,
   createMutation,
 }: {
@@ -31,21 +32,33 @@ export default function AgentSelect({
   // const fileMap = useFileMapContext();
   const lastSelectedAgent = useRef<string | null>(null);
 
-  const { data: agents = [] } = useListAgentsQuery(undefined, {
-    select: (res) => res.data.map((agent) => processAgentOption(agent /*, fileMap */)),
+  const { data: startupConfig } = useGetStartupConfig();
+  const { data: agents = null } = useListAgentsQuery(undefined, {
+    select: (res) =>
+      res.data.map((agent) =>
+        processAgentOption({
+          agent,
+          instanceProjectId: startupConfig?.instanceProjectId,
+          /* fileMap */
+        }),
+      ),
   });
 
   const agentQuery = useGetAgentByIdQuery(selectedAgentId ?? '', {
-    enabled: !!selectedAgentId,
+    enabled: !!(selectedAgentId ?? ''),
   });
 
   const resetAgentForm = useCallback(
     (fullAgent: Agent) => {
+      const { instanceProjectId } = startupConfig ?? {};
+      const isGlobal =
+        (instanceProjectId != null && fullAgent.projectIds?.includes(instanceProjectId)) ?? false;
       const update = {
         ...fullAgent,
         provider: createProviderOption(fullAgent.provider),
         label: fullAgent.name ?? '',
-        value: fullAgent.id ?? '',
+        value: fullAgent.id || '',
+        icon: isGlobal ? <EarthIcon className={'icon-lg text-green-400'} /> : null,
       };
 
       const actions: AgentCapabilities = {
@@ -84,7 +97,7 @@ export default function AgentSelect({
   const onSelect = useCallback(
     (selectedId: string) => {
       const agentExists = !!(selectedId
-        ? agents.find((agent) => agent.id === selectedId)
+        ? (agents ?? []).find((agent) => agent.id === selectedId)
         : undefined);
 
       createMutation.reset();
@@ -120,7 +133,7 @@ export default function AgentSelect({
       return;
     }
 
-    if (selectedAgentId && agents) {
+    if (selectedAgentId != null && selectedAgentId !== '' && agents) {
       timerId = setTimeout(() => {
         lastSelectedAgent.current = selectedAgentId;
         onSelect(selectedAgentId);
@@ -136,8 +149,9 @@ export default function AgentSelect({
 
   const createAgent = localize('com_ui_create') + ' ' + localize('com_ui_agent');
   const hasAgentValue = !!(typeof currentAgentValue === 'object'
-    ? currentAgentValue.value
-    : currentAgentValue);
+    ? currentAgentValue.value != null && currentAgentValue.value !== ''
+    : typeof currentAgentValue !== 'undefined');
+
   return (
     <SelectDropDown
       value={!hasAgentValue ? createAgent : (currentAgentValue as TAgentOption)}
@@ -151,9 +165,11 @@ export default function AgentSelect({
         ]
       }
       iconSide="left"
+      optionIconSide="right"
       showAbove={false}
       showLabel={false}
       emptyTitle={true}
+      showOptionIcon={true}
       containerClassName="flex-grow"
       searchClassName="dark:from-gray-850"
       searchPlaceholder={localize('com_agents_search_name')}
diff --git a/client/src/components/SidePanel/Agents/ContextButton.tsx b/client/src/components/SidePanel/Agents/DeleteButton.tsx
similarity index 89%
rename from client/src/components/SidePanel/Agents/ContextButton.tsx
rename to client/src/components/SidePanel/Agents/DeleteButton.tsx
index 81b92701d1a..af852ebc177 100644
--- a/client/src/components/SidePanel/Agents/ContextButton.tsx
+++ b/client/src/components/SidePanel/Agents/DeleteButton.tsx
@@ -4,11 +4,11 @@ import { OGDialog, OGDialogTrigger, Label } from '~/components/ui';
 import { useChatContext, useToastContext } from '~/Providers';
 import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
 import { useLocalize, useSetIndexOptions } from '~/hooks';
+import { cn, removeFocusOutlines, logger } from '~/utils';
 import { useDeleteAgentMutation } from '~/data-provider';
-import { cn, removeFocusOutlines } from '~/utils/';
 import { TrashIcon } from '~/components/svg';
 
-export default function ContextButton({
+export default function DeleteButton({
   agent_id,
   setCurrentAgentId,
   createMutation,
@@ -34,8 +34,8 @@ export default function ContextButton({
         status: 'success',
       });
 
-      if (createMutation.data?.id) {
-        console.log('[deleteAgent] resetting createMutation');
+      if (createMutation.data?.id ?? '') {
+        logger.log('agents', 'resetting createMutation');
         createMutation.reset();
       }
 
@@ -49,7 +49,7 @@ export default function ContextButton({
         return setOption('agent_id')(firstAgent.id);
       }
 
-      const currentAgent = updatedList?.find((agent) => agent.id === conversation?.agent_id);
+      const currentAgent = updatedList.find((agent) => agent.id === conversation?.agent_id);
 
       if (currentAgent) {
         setCurrentAgentId(currentAgent.id);
@@ -78,6 +78,7 @@ export default function ContextButton({
             'btn btn-neutral border-token-border-light relative h-9 rounded-lg font-medium',
             removeFocusOutlines,
           )}
+          aria-label={localize('com_ui_delete') + ' ' + localize('com_ui_agent')}
           type="button"
         >
           <div className="flex w-full items-center justify-center gap-2 text-red-500">
diff --git a/client/src/components/SidePanel/Agents/ShareAgent.tsx b/client/src/components/SidePanel/Agents/ShareAgent.tsx
new file mode 100644
index 00000000000..287e54b56ee
--- /dev/null
+++ b/client/src/components/SidePanel/Agents/ShareAgent.tsx
@@ -0,0 +1,206 @@
+import React, { useEffect, useMemo } from 'react';
+import { Share2Icon } from 'lucide-react';
+import { useForm, Controller } from 'react-hook-form';
+import { Permissions } from 'librechat-data-provider';
+import { useGetStartupConfig } from 'librechat-data-provider/react-query';
+import type { TStartupConfig, AgentUpdateParams } from 'librechat-data-provider';
+import {
+  Switch,
+  OGDialog,
+  OGDialogTitle,
+  OGDialogClose,
+  OGDialogContent,
+  OGDialogTrigger,
+} from '~/components/ui';
+import { useUpdateAgentMutation } from '~/data-provider';
+import { cn, removeFocusOutlines } from '~/utils';
+import { useToastContext } from '~/Providers';
+import { useLocalize } from '~/hooks';
+
+type FormValues = {
+  [Permissions.SHARED_GLOBAL]: boolean;
+};
+
+export default function ShareAgent({
+  agent_id = '',
+  agentName,
+  projectIds = [],
+}: {
+  agent_id?: string;
+  agentName?: string;
+  projectIds?: string[];
+}) {
+  const localize = useLocalize();
+  const { showToast } = useToastContext();
+  const { data: startupConfig = {} as TStartupConfig, isFetching } = useGetStartupConfig();
+  const { instanceProjectId } = startupConfig;
+  const agentIsGlobal = useMemo(
+    () => !!projectIds.includes(instanceProjectId),
+    [projectIds, instanceProjectId],
+  );
+
+  const {
+    control,
+    setValue,
+    getValues,
+    handleSubmit,
+    formState: { isSubmitting },
+  } = useForm<FormValues>({
+    mode: 'onChange',
+    defaultValues: {
+      [Permissions.SHARED_GLOBAL]: agentIsGlobal,
+    },
+  });
+
+  useEffect(() => {
+    setValue(Permissions.SHARED_GLOBAL, agentIsGlobal);
+  }, [agentIsGlobal, setValue]);
+
+  const updateAgent = useUpdateAgentMutation({
+    onSuccess: (data) => {
+      showToast({
+        message: `${localize('com_assistants_update_success')} ${
+          data.name ?? localize('com_ui_agent')
+        }`,
+        status: 'success',
+      });
+    },
+    onError: (err) => {
+      const error = err as Error;
+      showToast({
+        message: `${localize('com_agents_update_error')}${
+          error.message ? ` ${localize('com_ui_error')}: ${error.message}` : ''
+        }`,
+        status: 'error',
+      });
+    },
+  });
+
+  if (!agent_id || !instanceProjectId) {
+    return null;
+  }
+
+  const onSubmit = (data: FormValues) => {
+    if (!agent_id || !instanceProjectId) {
+      return;
+    }
+
+    const payload = {} as AgentUpdateParams;
+
+    if (data[Permissions.SHARED_GLOBAL]) {
+      payload.projectIds = [startupConfig.instanceProjectId];
+    } else {
+      payload.removeProjectIds = [startupConfig.instanceProjectId];
+    }
+
+    updateAgent.mutate({
+      agent_id,
+      data: payload,
+    });
+  };
+
+  return (
+    <OGDialog>
+      <OGDialogTrigger asChild>
+        <button
+          className={cn(
+            'btn btn-neutral border-token-border-light relative h-9 rounded-lg font-medium',
+            removeFocusOutlines,
+          )}
+          aria-label={localize(
+            'com_ui_share_var',
+            agentName != null && agentName !== '' ? `"${agentName}"` : localize('com_ui_agent'),
+          )}
+          type="button"
+        >
+          <div className="flex w-full items-center justify-center gap-2 text-blue-500">
+            <Share2Icon className="icon-md h-4 w-4" />
+          </div>
+        </button>
+      </OGDialogTrigger>
+      <OGDialogContent className="border-border-light bg-surface-primary-alt text-text-secondary">
+        <OGDialogTitle>
+          {localize(
+            'com_ui_share_var',
+            agentName != null && agentName !== '' ? `"${agentName}"` : localize('com_ui_agent'),
+          )}
+        </OGDialogTitle>
+        <form
+          className="p-2"
+          onSubmit={(e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            handleSubmit(onSubmit)(e);
+          }}
+        >
+          <div className="mb-4 flex items-center justify-between gap-2 py-4">
+            <div className="flex items-center">
+              <button
+                type="button"
+                className="mr-2 cursor-pointer"
+                onClick={() =>
+                  setValue(Permissions.SHARED_GLOBAL, !getValues(Permissions.SHARED_GLOBAL), {
+                    shouldDirty: true,
+                  })
+                }
+                onKeyDown={(e) => {
+                  if (e.key === 'Enter' || e.key === ' ') {
+                    e.preventDefault();
+                    setValue(Permissions.SHARED_GLOBAL, !getValues(Permissions.SHARED_GLOBAL), {
+                      shouldDirty: true,
+                    });
+                  }
+                }}
+                aria-checked={getValues(Permissions.SHARED_GLOBAL)}
+                role="checkbox"
+              >
+                {localize('com_ui_share_to_all_users')}
+              </button>
+              <label htmlFor={Permissions.SHARED_GLOBAL} className="select-none">
+                {agentIsGlobal && (
+                  <span className="ml-2 text-xs">{localize('com_ui_agent_shared_to_all')}</span>
+                )}
+              </label>
+            </div>
+            <Controller
+              name={Permissions.SHARED_GLOBAL}
+              control={control}
+              disabled={isFetching || updateAgent.isLoading || !instanceProjectId}
+              rules={{
+                validate: (value) => {
+                  const isValid = !(value && agentIsGlobal);
+                  if (!isValid) {
+                    showToast({
+                      message: localize('com_ui_agent_already_shared_to_all'),
+                      status: 'warning',
+                    });
+                  }
+                  return isValid;
+                },
+              }}
+              render={({ field }) => (
+                <Switch
+                  {...field}
+                  checked={field.value}
+                  onCheckedChange={field.onChange}
+                  value={field.value.toString()}
+                />
+              )}
+            />
+          </div>
+          <div className="flex justify-end">
+            <OGDialogClose asChild>
+              <button
+                type="submit"
+                disabled={isSubmitting || isFetching}
+                className="btn rounded bg-green-500 font-bold text-white transition-all hover:bg-green-600"
+              >
+                {localize('com_ui_save')}
+              </button>
+            </OGDialogClose>
+          </div>
+        </form>
+      </OGDialogContent>
+    </OGDialog>
+  );
+}
diff --git a/client/src/components/SidePanel/Builder/Action.tsx b/client/src/components/SidePanel/Builder/Action.tsx
index b129cc0d15f..656888a3d70 100644
--- a/client/src/components/SidePanel/Builder/Action.tsx
+++ b/client/src/components/SidePanel/Builder/Action.tsx
@@ -1,32 +1,40 @@
 import { useState } from 'react';
 import type { Action } from 'librechat-data-provider';
 import GearIcon from '~/components/svg/GearIcon';
+import { cn } from '~/utils';
 
 export default function Action({ action, onClick }: { action: Action; onClick: () => void }) {
   const [isHovering, setIsHovering] = useState(false);
 
   return (
-    <div>
+    <div
+      role="button"
+      tabIndex={0}
+      onClick={onClick}
+      onKeyDown={(e) => {
+        if (e.key === 'Enter' || e.key === ' ') {
+          onClick();
+        }
+      }}
+      className="group flex w-full rounded-lg border border-border-medium text-sm hover:cursor-pointer focus:outline-none focus:ring-2 focus:ring-text-primary"
+      onMouseEnter={() => setIsHovering(true)}
+      onMouseLeave={() => setIsHovering(false)}
+      aria-label={`Action for ${action.metadata.domain}`}
+    >
       <div
-        onClick={onClick}
-        className="flex w-full rounded-lg text-sm hover:cursor-pointer"
-        onMouseEnter={() => setIsHovering(true)}
-        onMouseLeave={() => setIsHovering(false)}
+        className="h-9 grow overflow-hidden text-ellipsis whitespace-nowrap px-3 py-2"
+        style={{ wordBreak: 'break-all' }}
       >
-        <div
-          className="h-9 grow whitespace-nowrap px-3 py-2"
-          style={{ textOverflow: 'ellipsis', wordBreak: 'break-all', overflow: 'hidden' }}
-        >
-          {action.metadata.domain}
-        </div>
-        {isHovering && (
-          <button
-            type="button"
-            className="transition-colors flex h-9 w-9 min-w-9 items-center justify-center rounded-lg duration-200 hover:bg-gray-200 dark:hover:bg-gray-700"
-          >
-            <GearIcon className="icon-sm" />
-          </button>
+        {action.metadata.domain}
+      </div>
+      <div
+        className={cn(
+          'h-9 w-9 min-w-9 items-center justify-center rounded-lg transition-colors duration-200 hover:bg-surface-tertiary focus:outline-none focus:ring-2 focus:ring-text-primary group-focus:flex',
+          isHovering ? 'flex' : 'hidden',
         )}
+        aria-label="Settings"
+      >
+        <GearIcon className="icon-sm" aria-hidden="true" />
       </div>
     </div>
   );
diff --git a/client/src/components/SidePanel/Builder/AssistantConversationStarters.tsx b/client/src/components/SidePanel/Builder/AssistantConversationStarters.tsx
index 9d673044a50..30b9157f1c0 100644
--- a/client/src/components/SidePanel/Builder/AssistantConversationStarters.tsx
+++ b/client/src/components/SidePanel/Builder/AssistantConversationStarters.tsx
@@ -2,7 +2,7 @@ import React, { useRef, useState } from 'react';
 import { Plus, X } from 'lucide-react';
 import { Transition } from 'react-transition-group';
 import { Constants } from 'librechat-data-provider';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '~/components/ui';
+import { TooltipAnchor } from '~/components/ui';
 import { useLocalize } from '~/hooks';
 
 interface AssistantConversationStartersProps {
@@ -106,25 +106,19 @@ const AssistantConversationStarters: React.FC<AssistantConversationStartersProps
                 }}
                 className="absolute right-1 top-1"
               >
-                <TooltipProvider delayDuration={1000}>
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <button
-                        type="button"
-                        className="flex size-7 items-center justify-center rounded-lg transition-colors duration-200 hover:bg-surface-hover"
-                        onClick={handleAddStarter}
-                        disabled={hasReachedMax}
-                      >
-                        <Plus className="size-4" />
-                      </button>
-                    </TooltipTrigger>
-                    <TooltipContent side="top" sideOffset={0}>
-                      {hasReachedMax
-                        ? localize('com_assistants_max_starters_reached')
-                        : localize('com_ui_add')}
-                    </TooltipContent>
-                  </Tooltip>
-                </TooltipProvider>
+                <TooltipAnchor
+                  side="top"
+                  description={
+                    hasReachedMax
+                      ? localize('com_assistants_max_starters_reached')
+                      : localize('com_ui_add')
+                  }
+                  className="flex size-7 items-center justify-center rounded-lg transition-colors duration-200 hover:bg-surface-hover"
+                  onClick={handleAddStarter}
+                  disabled={hasReachedMax}
+                >
+                  <Plus className="size-4" />
+                </TooltipAnchor>
               </div>
             )}
           </Transition>
@@ -143,22 +137,14 @@ const AssistantConversationStarters: React.FC<AssistantConversationStartersProps
               type="text"
               maxLength={64}
             />
-            <TooltipProvider delayDuration={1000}>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <button
-                    type="button"
-                    className="absolute right-1 top-1 flex size-7 items-center justify-center rounded-lg transition-colors duration-200 hover:bg-surface-hover"
-                    onClick={() => handleDeleteStarter(index)}
-                  >
-                    <X className="size-4" />
-                  </button>
-                </TooltipTrigger>
-                <TooltipContent side="top" sideOffset={0}>
-                  {localize('com_ui_delete')}
-                </TooltipContent>
-              </Tooltip>
-            </TooltipProvider>
+            <TooltipAnchor
+              side="top"
+              description={localize('com_ui_delete')}
+              className="absolute right-1 top-1 flex size-7 items-center justify-center rounded-lg transition-colors duration-200 hover:bg-surface-hover"
+              onClick={() => handleDeleteStarter(index)}
+            >
+              <X className="size-4" />
+            </TooltipAnchor>
           </div>
         ))}
       </div>
diff --git a/client/src/components/SidePanel/Nav.tsx b/client/src/components/SidePanel/Nav.tsx
index 2bcd3aded9d..d2692c3e53b 100644
--- a/client/src/components/SidePanel/Nav.tsx
+++ b/client/src/components/SidePanel/Nav.tsx
@@ -2,8 +2,8 @@ import { useState } from 'react';
 import * as AccordionPrimitive from '@radix-ui/react-accordion';
 import type { NavLink, NavProps } from '~/common';
 import { Accordion, AccordionItem, AccordionContent } from '~/components/ui/Accordion';
-import { Tooltip, TooltipContent, TooltipTrigger } from '~/components/ui/Tooltip';
 import { buttonVariants } from '~/components/ui/Button';
+import { TooltipAnchor, Button } from '~/components';
 import { cn, removeFocusOutlines } from '~/utils';
 import { useLocalize } from '~/hooks';
 
@@ -30,17 +30,13 @@ export default function Nav({ links, isCollapsed, resize, defaultActive }: NavPr
                 {links.map((link, index) => {
                   const variant = getVariant(link);
                   return isCollapsed ? (
-                    <Tooltip key={index} delayDuration={0}>
-                      <TooltipTrigger asChild>
-                        <button
-                          className={cn(
-                            buttonVariants({ variant, size: 'icon' }),
-                            removeFocusOutlines,
-                            'h-9 w-9',
-                            variant === 'default'
-                              ? 'dark:bg-muted dark:text-muted-foreground dark:hover:bg-muted dark:hover:text-white'
-                              : '',
-                          )}
+                    <TooltipAnchor
+                      description={localize(link.title)}
+                      side="left"
+                      render={
+                        <Button
+                          variant="ghost"
+                          size="icon"
                           onClick={(e) => {
                             if (link.onClick) {
                               link.onClick(e);
@@ -51,21 +47,11 @@ export default function Nav({ links, isCollapsed, resize, defaultActive }: NavPr
                             resize && resize(25);
                           }}
                         >
-                          <link.icon className="h-4 w-4" />
+                          <link.icon className="h-4 w-4 text-text-secondary" />
                           <span className="sr-only">{link.title}</span>
-                        </button>
-                      </TooltipTrigger>
-                      <TooltipContent
-                        side="left"
-                        sideOffset={10}
-                        className="flex items-center gap-4"
-                      >
-                        {localize(link.title)}
-                        {link.label && (
-                          <span className="text-muted-foreground ml-auto">{link.label}</span>
-                        )}
-                      </TooltipContent>
-                    </Tooltip>
+                        </Button>
+                      }
+                    ></TooltipAnchor>
                   ) : (
                     <Accordion
                       key={index}
@@ -77,16 +63,10 @@ export default function Nav({ links, isCollapsed, resize, defaultActive }: NavPr
                       <AccordionItem value={link.id} className="w-full border-none">
                         <AccordionPrimitive.Header asChild>
                           <AccordionPrimitive.Trigger asChild>
-                            <button
-                              className={cn(
-                                buttonVariants({ variant, size: 'sm' }),
-                                removeFocusOutlines,
-                                variant === 'default'
-                                  ? 'dark:bg-muted dark:hover:bg-muted dark:text-white dark:hover:text-white'
-                                  : '',
-                                'hover:bg-gray-200 data-[state=open]:bg-gray-200 data-[state=open]:text-black dark:hover:bg-gray-700 dark:data-[state=open]:bg-gray-700 dark:data-[state=open]:text-white',
-                                'w-full justify-start rounded-md border dark:border-gray-700',
-                              )}
+                            <Button
+                              variant="outline"
+                              size="sm"
+                              className="w-full justify-start bg-transparent text-text-secondary data-[state=open]:bg-surface-secondary data-[state=open]:text-text-primary"
                               onClick={(e) => {
                                 if (link.onClick) {
                                   link.onClick(e);
@@ -107,7 +87,7 @@ export default function Nav({ links, isCollapsed, resize, defaultActive }: NavPr
                                   {link.label}
                                 </span>
                               )}
-                            </button>
+                            </Button>
                           </AccordionPrimitive.Trigger>
                         </AccordionPrimitive.Header>
 
diff --git a/client/src/components/SidePanel/Parameters/DynamicCheckbox.tsx b/client/src/components/SidePanel/Parameters/DynamicCheckbox.tsx
index 5722a9e5ec6..98d85524a99 100644
--- a/client/src/components/SidePanel/Parameters/DynamicCheckbox.tsx
+++ b/client/src/components/SidePanel/Parameters/DynamicCheckbox.tsx
@@ -9,17 +9,17 @@ import OptionHover from './OptionHover';
 import { ESide } from '~/common';
 
 function DynamicCheckbox({
-  label,
+  label = '',
   settingKey,
   defaultValue,
-  description,
+  description = '',
   columnSpan,
   setOption,
   optionType,
   readonly = false,
-  showDefault = true,
-  labelCode,
-  descriptionCode,
+  showDefault = false,
+  labelCode = false,
+  descriptionCode = false,
   conversation,
 }: DynamicSettingProps) {
   const localize = useLocalize();
@@ -57,7 +57,7 @@ function DynamicCheckbox({
   return (
     <div
       className={`flex flex-col items-center justify-start gap-6 ${
-        columnSpan ? `col-span-${columnSpan}` : 'col-span-full'
+        columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full'
       }`}
     >
       <HoverCard openDelay={300}>
@@ -67,11 +67,11 @@ function DynamicCheckbox({
               htmlFor={`${settingKey}-dynamic-checkbox`}
               className="text-left text-sm font-medium"
             >
-              {labelCode ? localize(label ?? '') || label : label ?? settingKey}{' '}
+              {labelCode ? localize(label) ?? label : label || settingKey}{' '}
               {showDefault && (
                 <small className="opacity-40">
                   ({localize('com_endpoint_default')}:{' '}
-                  {defaultValue ? localize('com_ui_yes') : localize('com_ui_no')})
+                  {defaultValue != null ? localize('com_ui_yes') : localize('com_ui_no')})
                 </small>
               )}
             </Label>
@@ -86,7 +86,7 @@ function DynamicCheckbox({
         </HoverCardTrigger>
         {description && (
           <OptionHover
-            description={descriptionCode ? localize(description) || description : description}
+            description={descriptionCode ? localize(description) ?? description : description}
             side={ESide.Left}
           />
         )}
diff --git a/client/src/components/SidePanel/Parameters/DynamicCombobox.tsx b/client/src/components/SidePanel/Parameters/DynamicCombobox.tsx
new file mode 100644
index 00000000000..16af125b754
--- /dev/null
+++ b/client/src/components/SidePanel/Parameters/DynamicCombobox.tsx
@@ -0,0 +1,132 @@
+import { useMemo, useState, useCallback } from 'react';
+import { OptionTypes } from 'librechat-data-provider';
+import type { DynamicSettingProps } from 'librechat-data-provider';
+import { Label, HoverCard, HoverCardTrigger } from '~/components/ui';
+import ControlCombobox from '~/components/ui/ControlCombobox';
+import { useLocalize, useParameterEffects } from '~/hooks';
+import { useChatContext } from '~/Providers';
+import OptionHover from './OptionHover';
+import { ESide } from '~/common';
+import { cn } from '~/utils';
+
+function DynamicCombobox({
+  label = '',
+  settingKey,
+  defaultValue,
+  description = '',
+  columnSpan,
+  setOption,
+  optionType,
+  options: _options,
+  items: _items,
+  showLabel = true,
+  showDefault = false,
+  labelCode = false,
+  descriptionCode = false,
+  searchPlaceholderCode = false,
+  selectPlaceholderCode = false,
+  conversation,
+  isCollapsed = false,
+  SelectIcon = null,
+  selectPlaceholder = '',
+  searchPlaceholder = '',
+}: DynamicSettingProps & { isCollapsed?: boolean; SelectIcon?: React.ReactNode }) {
+  const localize = useLocalize();
+  const { preset } = useChatContext();
+  const [inputValue, setInputValue] = useState<string | null>(null);
+
+  const selectedValue = useMemo(() => {
+    if (optionType === OptionTypes.Custom) {
+      return inputValue;
+    }
+    return conversation?.[settingKey] ?? defaultValue;
+  }, [conversation, defaultValue, optionType, settingKey, inputValue]);
+
+  const items = useMemo(() => {
+    if (_items != null) {
+      return _items;
+    }
+    return (_options ?? []).map((option) => ({
+      label: option,
+      value: option,
+    }));
+  }, [_options, _items]);
+
+  const handleChange = useCallback(
+    (value: string) => {
+      if (optionType === OptionTypes.Custom) {
+        setInputValue(value);
+      } else {
+        setOption(settingKey)(value);
+      }
+    },
+    [optionType, setOption, settingKey],
+  );
+
+  useParameterEffects({
+    preset,
+    settingKey,
+    defaultValue,
+    conversation,
+    inputValue,
+    setInputValue,
+    preventDelayedUpdate: true,
+  });
+
+  const options = items ?? _options ?? [];
+  if (options.length === 0) {
+    return null;
+  }
+
+  return (
+    <div
+      className={cn(
+        'flex flex-col items-center justify-start gap-6',
+        columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full',
+      )}
+    >
+      <HoverCard openDelay={300}>
+        <HoverCardTrigger className="grid w-full items-center gap-2">
+          {showLabel === true && (
+            <div className="flex w-full justify-between">
+              <Label
+                htmlFor={`${settingKey}-dynamic-combobox`}
+                className="text-left text-sm font-medium"
+              >
+                {labelCode ? localize(label) ?? label : label || settingKey}
+                {showDefault && (
+                  <small className="opacity-40">
+                    ({localize('com_endpoint_default')}: {defaultValue})
+                  </small>
+                )}
+              </Label>
+            </div>
+          )}
+          <ControlCombobox
+            displayValue={selectedValue}
+            selectPlaceholder={
+              selectPlaceholderCode === true ? localize(selectPlaceholder) : selectPlaceholder
+            }
+            searchPlaceholder={
+              searchPlaceholderCode === true ? localize(searchPlaceholder) : searchPlaceholder
+            }
+            isCollapsed={isCollapsed}
+            ariaLabel={settingKey}
+            selectedValue={selectedValue ?? ''}
+            setValue={handleChange}
+            items={items}
+            SelectIcon={SelectIcon}
+          />
+        </HoverCardTrigger>
+        {description && (
+          <OptionHover
+            description={descriptionCode ? localize(description) ?? description : description}
+            side={ESide.Left}
+          />
+        )}
+      </HoverCard>
+    </div>
+  );
+}
+
+export default DynamicCombobox;
diff --git a/client/src/components/SidePanel/Parameters/DynamicDropdown.tsx b/client/src/components/SidePanel/Parameters/DynamicDropdown.tsx
index 4e298fb872e..e90c348acc7 100644
--- a/client/src/components/SidePanel/Parameters/DynamicDropdown.tsx
+++ b/client/src/components/SidePanel/Parameters/DynamicDropdown.tsx
@@ -9,19 +9,22 @@ import { ESide } from '~/common';
 import { cn } from '~/utils';
 
 function DynamicDropdown({
-  label,
+  label = '',
   settingKey,
   defaultValue,
-  description,
+  description = '',
   columnSpan,
   setOption,
   optionType,
   options,
   // type: _type,
   readonly = false,
-  showDefault = true,
-  labelCode,
-  descriptionCode,
+  showLabel = true,
+  showDefault = false,
+  labelCode = false,
+  descriptionCode = false,
+  placeholder = '',
+  placeholderCode = false,
   conversation,
 }: DynamicSettingProps) {
   const localize = useLocalize();
@@ -64,24 +67,26 @@ function DynamicDropdown({
     <div
       className={cn(
         'flex flex-col items-center justify-start gap-6',
-        columnSpan ? `col-span-${columnSpan}` : 'col-span-full',
+        columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full',
       )}
     >
       <HoverCard openDelay={300}>
         <HoverCardTrigger className="grid w-full items-center gap-2">
-          <div className="flex w-full justify-between">
-            <Label
-              htmlFor={`${settingKey}-dynamic-dropdown`}
-              className="text-left text-sm font-medium"
-            >
-              {labelCode ? localize(label ?? '') || label : label ?? settingKey}
-              {showDefault && (
-                <small className="opacity-40">
-                  ({localize('com_endpoint_default')}: {defaultValue})
-                </small>
-              )}
-            </Label>
-          </div>
+          {showLabel === true && (
+            <div className="flex w-full justify-between">
+              <Label
+                htmlFor={`${settingKey}-dynamic-dropdown`}
+                className="text-left text-sm font-medium"
+              >
+                {labelCode ? localize(label) ?? label : label || settingKey}
+                {showDefault && (
+                  <small className="opacity-40">
+                    ({localize('com_endpoint_default')}: {defaultValue})
+                  </small>
+                )}
+              </Label>
+            </div>
+          )}
           <SelectDropDown
             showLabel={false}
             emptyTitle={true}
@@ -91,11 +96,12 @@ function DynamicDropdown({
             availableValues={options}
             containerClassName="w-full"
             id={`${settingKey}-dynamic-dropdown`}
+            placeholder={placeholderCode ? localize(placeholder) ?? placeholder : placeholder}
           />
         </HoverCardTrigger>
         {description && (
           <OptionHover
-            description={descriptionCode ? localize(description) || description : description}
+            description={descriptionCode ? localize(description) ?? description : description}
             side={ESide.Left}
           />
         )}
diff --git a/client/src/components/SidePanel/Parameters/DynamicInput.tsx b/client/src/components/SidePanel/Parameters/DynamicInput.tsx
index feccbae784e..e1439a8c8f3 100644
--- a/client/src/components/SidePanel/Parameters/DynamicInput.tsx
+++ b/client/src/components/SidePanel/Parameters/DynamicInput.tsx
@@ -9,25 +9,25 @@ import OptionHover from './OptionHover';
 import { ESide } from '~/common';
 
 function DynamicInput({
-  label,
+  label = '',
   settingKey,
   defaultValue,
-  description,
+  description = '',
   columnSpan,
   setOption,
   optionType,
-  placeholder,
+  placeholder = '',
   readonly = false,
-  showDefault = true,
-  labelCode,
-  descriptionCode,
-  placeholderCode,
+  showDefault = false,
+  labelCode = false,
+  descriptionCode = false,
+  placeholderCode = false,
   conversation,
 }: DynamicSettingProps) {
   const localize = useLocalize();
   const { preset } = useChatContext();
 
-  const [setInputValue, inputValue] = useDebouncedInput<string | null>({
+  const [setInputValue, inputValue, setLocalValue] = useDebouncedInput<string | null>({
     optionKey: optionType !== OptionTypes.Custom ? settingKey : undefined,
     initialValue:
       optionType !== OptionTypes.Custom
@@ -43,13 +43,13 @@ function DynamicInput({
     defaultValue: typeof defaultValue === 'undefined' ? '' : defaultValue,
     conversation,
     inputValue,
-    setInputValue,
+    setInputValue: setLocalValue,
   });
 
   return (
     <div
       className={`flex flex-col items-center justify-start gap-6 ${
-        columnSpan ? `col-span-${columnSpan}` : 'col-span-full'
+        columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full'
       }`}
     >
       <HoverCard openDelay={300}>
@@ -59,11 +59,11 @@ function DynamicInput({
               htmlFor={`${settingKey}-dynamic-input`}
               className="text-left text-sm font-medium"
             >
-              {labelCode ? localize(label ?? '') || label : label ?? settingKey}{' '}
+              {labelCode ? localize(label) ?? label : label || settingKey}{' '}
               {showDefault && (
                 <small className="opacity-40">
                   (
-                  {typeof defaultValue === 'undefined' || !(defaultValue as string)?.length
+                  {typeof defaultValue === 'undefined' || !(defaultValue as string).length
                     ? localize('com_endpoint_default_blank')
                     : `${localize('com_endpoint_default')}: ${defaultValue}`}
                   )
@@ -76,13 +76,13 @@ function DynamicInput({
             disabled={readonly}
             value={inputValue ?? ''}
             onChange={setInputValue}
-            placeholder={placeholderCode ? localize(placeholder ?? '') || placeholder : placeholder}
+            placeholder={placeholderCode ? localize(placeholder) ?? placeholder : placeholder}
             className={cn(defaultTextProps, 'flex h-10 max-h-10 w-full resize-none px-3 py-2')}
           />
         </HoverCardTrigger>
         {description && (
           <OptionHover
-            description={descriptionCode ? localize(description) || description : description}
+            description={descriptionCode ? localize(description) ?? description : description}
             side={ESide.Left}
           />
         )}
diff --git a/client/src/components/SidePanel/Parameters/DynamicInputNumber.tsx b/client/src/components/SidePanel/Parameters/DynamicInputNumber.tsx
index 3807f2ed6fb..9da1dcd6996 100644
--- a/client/src/components/SidePanel/Parameters/DynamicInputNumber.tsx
+++ b/client/src/components/SidePanel/Parameters/DynamicInputNumber.tsx
@@ -9,19 +9,19 @@ import { useChatContext } from '~/Providers';
 import OptionHover from './OptionHover';
 
 function DynamicInputNumber({
-  label,
+  label = '',
   settingKey,
   defaultValue,
-  description,
+  description = '',
   columnSpan,
   setOption,
   optionType,
   readonly = false,
-  showDefault = true,
-  labelCode,
-  descriptionCode,
-  placeholderCode,
-  placeholder,
+  showDefault = false,
+  labelCode = false,
+  descriptionCode = false,
+  placeholderCode = false,
+  placeholder = '',
   conversation,
   range,
   className = '',
@@ -30,7 +30,7 @@ function DynamicInputNumber({
   const localize = useLocalize();
   const { preset } = useChatContext();
 
-  const [setInputValue, inputValue] = useDebouncedInput<ValueType | null>({
+  const [setInputValue, inputValue, setLocalValue] = useDebouncedInput<ValueType | null>({
     optionKey: optionType !== OptionTypes.Custom ? settingKey : undefined,
     initialValue:
       optionType !== OptionTypes.Custom
@@ -46,14 +46,14 @@ function DynamicInputNumber({
     defaultValue: typeof defaultValue === 'undefined' ? '' : defaultValue,
     conversation,
     inputValue,
-    setInputValue,
+    setInputValue: setLocalValue,
   });
 
   return (
     <div
       className={cn(
         'flex flex-col items-center justify-start gap-6',
-        columnSpan ? `col-span-${columnSpan}` : 'col-span-full',
+        columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full',
         className,
       )}
     >
@@ -64,7 +64,7 @@ function DynamicInputNumber({
               htmlFor={`${settingKey}-dynamic-setting`}
               className="text-left text-sm font-medium"
             >
-              {labelCode ? localize(label ?? '') || label : label ?? settingKey}{' '}
+              {labelCode ? localize(label) ?? label : label || settingKey}{' '}
               {showDefault && (
                 <small className="opacity-40">
                   ({localize('com_endpoint_default')}: {defaultValue})
@@ -79,9 +79,7 @@ function DynamicInputNumber({
               min={range?.min}
               max={range?.max}
               step={range?.step}
-              placeholder={
-                placeholderCode ? localize(placeholder ?? '') || placeholder : placeholder
-              }
+              placeholder={placeholderCode ? localize(placeholder) ?? placeholder : placeholder}
               controls={false}
               className={cn(
                 defaultTextProps,
@@ -96,7 +94,7 @@ function DynamicInputNumber({
         </HoverCardTrigger>
         {description && (
           <OptionHover
-            description={descriptionCode ? localize(description) || description : description}
+            description={descriptionCode ? localize(description) ?? description : description}
             side={ESide.Left}
           />
         )}
diff --git a/client/src/components/SidePanel/Parameters/DynamicSlider.tsx b/client/src/components/SidePanel/Parameters/DynamicSlider.tsx
index 365f07177a2..2397ec7d6b3 100644
--- a/client/src/components/SidePanel/Parameters/DynamicSlider.tsx
+++ b/client/src/components/SidePanel/Parameters/DynamicSlider.tsx
@@ -9,27 +9,30 @@ import { useChatContext } from '~/Providers';
 import OptionHover from './OptionHover';
 
 function DynamicSlider({
-  label,
+  label = '',
   settingKey,
   defaultValue,
   range,
-  description,
+  description = '',
   columnSpan,
   setOption,
   optionType,
   options,
   readonly = false,
-  showDefault = true,
+  showDefault = false,
   includeInput = true,
-  labelCode,
-  descriptionCode,
+  labelCode = false,
+  descriptionCode = false,
   conversation,
 }: DynamicSettingProps) {
   const localize = useLocalize();
   const { preset } = useChatContext();
-  const isEnum = useMemo(() => !range && options && options.length > 0, [options, range]);
+  const isEnum = useMemo(
+    () => (!range && options && options.length > 0) ?? false,
+    [options, range],
+  );
 
-  const [setInputValue, inputValue] = useDebouncedInput<string | number>({
+  const [setInputValue, inputValue, setLocalValue] = useDebouncedInput<string | number>({
     optionKey: optionType !== OptionTypes.Custom ? settingKey : undefined,
     initialValue: optionType !== OptionTypes.Custom ? conversation?.[settingKey] : defaultValue,
     setter: () => ({}),
@@ -43,8 +46,7 @@ function DynamicSlider({
     defaultValue,
     conversation,
     inputValue,
-    setInputValue,
-    preventDelayedUpdate: isEnum,
+    setInputValue: setLocalValue,
   });
 
   const selectedValue = useMemo(() => {
@@ -87,6 +89,16 @@ function DynamicSlider({
     [isEnum, setInputValue, valueToEnumOption],
   );
 
+  const max = useMemo(() => {
+    if (isEnum && options) {
+      return options.length - 1;
+    } else if (range) {
+      return range.max;
+    } else {
+      return 0;
+    }
+  }, [isEnum, options, range]);
+
   if (!range && !isEnum) {
     return null;
   }
@@ -94,18 +106,18 @@ function DynamicSlider({
   return (
     <div
       className={cn(
-        'flex flex-col items-center justify-start gap-6',
-        columnSpan ? `col-span-${columnSpan}` : 'col-span-full',
+        'flex flex-col items-center justify-start gap-2',
+        columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full',
       )}
     >
       <HoverCard openDelay={300}>
         <HoverCardTrigger className="grid w-full items-center gap-2">
-          <div className="flex justify-between">
+          <div className="flex w-full items-center justify-between">
             <Label
               htmlFor={`${settingKey}-dynamic-setting`}
               className="text-left text-sm font-medium"
             >
-              {labelCode ? localize(label ?? '') || label : label ?? settingKey}{' '}
+              {labelCode ? localize(label) ?? label : label || settingKey}{' '}
               {showDefault && (
                 <small className="opacity-40">
                   ({localize('com_endpoint_default')}: {defaultValue})
@@ -156,15 +168,16 @@ function DynamicSlider({
             ]}
             onValueChange={(value) => handleValueChange(value[0])}
             doubleClickHandler={() => setInputValue(defaultValue as string | number)}
-            max={isEnum && options ? options.length - 1 : range ? range.max : 0}
+            max={max}
             min={range ? range.min : 0}
             step={range ? range.step ?? 1 : 1}
             className="flex h-4 w-full"
+            trackClassName="bg-surface-hover"
           />
         </HoverCardTrigger>
         {description && (
           <OptionHover
-            description={descriptionCode ? localize(description) || description : description}
+            description={descriptionCode ? localize(description) ?? description : description}
             side={ESide.Left}
           />
         )}
diff --git a/client/src/components/SidePanel/Parameters/DynamicSwitch.tsx b/client/src/components/SidePanel/Parameters/DynamicSwitch.tsx
index f069e899d2c..3f5aea86f91 100644
--- a/client/src/components/SidePanel/Parameters/DynamicSwitch.tsx
+++ b/client/src/components/SidePanel/Parameters/DynamicSwitch.tsx
@@ -8,17 +8,17 @@ import OptionHover from './OptionHover';
 import { ESide } from '~/common';
 
 function DynamicSwitch({
-  label,
+  label = '',
   settingKey,
   defaultValue,
-  description,
+  description = '',
   columnSpan,
   setOption,
   optionType,
   readonly = false,
-  showDefault = true,
-  labelCode,
-  descriptionCode,
+  showDefault = false,
+  labelCode = false,
+  descriptionCode = false,
   conversation,
 }: DynamicSettingProps) {
   const localize = useLocalize();
@@ -55,7 +55,7 @@ function DynamicSwitch({
   return (
     <div
       className={`flex flex-col items-center justify-start gap-6 ${
-        columnSpan ? `col-span-${columnSpan}` : 'col-span-full'
+        columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full'
       }`}
     >
       <HoverCard openDelay={300}>
@@ -65,10 +65,11 @@ function DynamicSwitch({
               htmlFor={`${settingKey}-dynamic-switch`}
               className="text-left text-sm font-medium"
             >
-              {labelCode ? localize(label ?? '') || label : label ?? settingKey}{' '}
+              {labelCode ? localize(label) ?? label : label || settingKey}{' '}
               {showDefault && (
                 <small className="opacity-40">
-                  ({localize('com_endpoint_default')}: {defaultValue ? 'com_ui_on' : 'com_ui_off'})
+                  ({localize('com_endpoint_default')}:{' '}
+                  {defaultValue != null ? 'com_ui_on' : 'com_ui_off'})
                 </small>
               )}
             </Label>
@@ -83,7 +84,7 @@ function DynamicSwitch({
         </HoverCardTrigger>
         {description && (
           <OptionHover
-            description={descriptionCode ? localize(description) || description : description}
+            description={descriptionCode ? localize(description) ?? description : description}
             side={ESide.Left}
           />
         )}
diff --git a/client/src/components/SidePanel/Parameters/DynamicTags.tsx b/client/src/components/SidePanel/Parameters/DynamicTags.tsx
index a028a8aa56c..5a48be32bb8 100644
--- a/client/src/components/SidePanel/Parameters/DynamicTags.tsx
+++ b/client/src/components/SidePanel/Parameters/DynamicTags.tsx
@@ -10,19 +10,19 @@ import OptionHover from './OptionHover';
 import { ESide } from '~/common';
 
 function DynamicTags({
-  label,
+  label = '',
   settingKey,
   defaultValue = [],
-  description,
+  description = '',
   columnSpan,
   setOption,
   optionType,
-  placeholder,
+  placeholder = '',
   readonly = false,
-  showDefault = true,
-  labelCode,
-  descriptionCode,
-  placeholderCode,
+  showDefault = false,
+  labelCode = false,
+  descriptionCode = false,
+  placeholderCode = false,
   descriptionSide = ESide.Left,
   conversation,
   minTags,
@@ -65,7 +65,7 @@ function DynamicTags({
       return defaultValue ?? [];
     }
 
-    return conversation?.[settingKey];
+    return conversation[settingKey];
   }, [conversation, defaultValue, optionType, settingKey, tags]);
 
   const onTagRemove = useCallback(
@@ -74,7 +74,7 @@ function DynamicTags({
         return;
       }
 
-      if (minTags && currentTags.length <= minTags) {
+      if (minTags != null && currentTags.length <= minTags) {
         showToast({
           message: localize('com_ui_min_tags', minTags + ''),
           status: 'warning',
@@ -93,7 +93,7 @@ function DynamicTags({
     }
 
     let update = [...(currentTags ?? []), tagText];
-    if (maxTags && update.length > maxTags) {
+    if (maxTags != null && update.length > maxTags) {
       showToast({
         message: localize('com_ui_max_tags', maxTags + ''),
         status: 'warning',
@@ -117,7 +117,7 @@ function DynamicTags({
   return (
     <div
       className={`flex flex-col items-center justify-start gap-6 ${
-        columnSpan ? `col-span-${columnSpan}` : 'col-span-full'
+        columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full'
       }`}
     >
       <HoverCard openDelay={300}>
@@ -127,11 +127,11 @@ function DynamicTags({
               htmlFor={`${settingKey}-dynamic-input`}
               className="text-left text-sm font-medium"
             >
-              {labelCode ? localize(label ?? '') || label : label ?? settingKey}{' '}
+              {labelCode ? localize(label) ?? label : label || settingKey}{' '}
               {showDefault && (
                 <small className="opacity-40">
                   (
-                  {typeof defaultValue === 'undefined' || !(defaultValue as string)?.length
+                  {typeof defaultValue === 'undefined' || !(defaultValue as string).length
                     ? localize('com_endpoint_default_blank')
                     : `${localize('com_endpoint_default')}: ${defaultValue}`}
                   )
@@ -171,9 +171,7 @@ function DynamicTags({
                   }
                 }}
                 onChange={(e) => setTagText(e.target.value)}
-                placeholder={
-                  placeholderCode ? localize(placeholder ?? '') || placeholder : placeholder
-                }
+                placeholder={placeholderCode ? localize(placeholder) ?? placeholder : placeholder}
                 className={cn(defaultTextProps, 'flex h-10 max-h-10 px-3 py-2')}
               />
             </div>
@@ -181,7 +179,7 @@ function DynamicTags({
         </HoverCardTrigger>
         {description && (
           <OptionHover
-            description={descriptionCode ? localize(description) || description : description}
+            description={descriptionCode ? localize(description) ?? description : description}
             side={descriptionSide as ESide}
           />
         )}
diff --git a/client/src/components/SidePanel/Parameters/DynamicTextarea.tsx b/client/src/components/SidePanel/Parameters/DynamicTextarea.tsx
index f6411b155b2..ddc10d684b5 100644
--- a/client/src/components/SidePanel/Parameters/DynamicTextarea.tsx
+++ b/client/src/components/SidePanel/Parameters/DynamicTextarea.tsx
@@ -9,25 +9,25 @@ import OptionHover from './OptionHover';
 import { ESide } from '~/common';
 
 function DynamicTextarea({
-  label,
+  label = '',
   settingKey,
   defaultValue,
-  description,
+  description = '',
   columnSpan,
   setOption,
   optionType,
-  placeholder,
+  placeholder = '',
   readonly = false,
-  showDefault = true,
-  labelCode,
-  descriptionCode,
-  placeholderCode,
+  showDefault = false,
+  labelCode = false,
+  descriptionCode = false,
+  placeholderCode = false,
   conversation,
 }: DynamicSettingProps) {
   const localize = useLocalize();
   const { preset } = useChatContext();
 
-  const [setInputValue, inputValue] = useDebouncedInput<string | null>({
+  const [setInputValue, inputValue, setLocalValue] = useDebouncedInput<string | null>({
     optionKey: optionType !== OptionTypes.Custom ? settingKey : undefined,
     initialValue:
       optionType !== OptionTypes.Custom
@@ -43,13 +43,13 @@ function DynamicTextarea({
     defaultValue: typeof defaultValue === 'undefined' ? '' : defaultValue,
     conversation,
     inputValue,
-    setInputValue,
+    setInputValue: setLocalValue,
   });
 
   return (
     <div
       className={`flex flex-col items-center justify-start gap-6 ${
-        columnSpan ? `col-span-${columnSpan}` : 'col-span-full'
+        columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full'
       }`}
     >
       <HoverCard openDelay={300}>
@@ -59,11 +59,11 @@ function DynamicTextarea({
               htmlFor={`${settingKey}-dynamic-textarea`}
               className="text-left text-sm font-medium"
             >
-              {labelCode ? localize(label ?? '') || label : label ?? settingKey}{' '}
+              {labelCode ? localize(label) ?? label : label || settingKey}{' '}
               {showDefault && (
                 <small className="opacity-40">
                   (
-                  {typeof defaultValue === 'undefined' || !(defaultValue as string)?.length
+                  {typeof defaultValue === 'undefined' || !(defaultValue as string).length
                     ? localize('com_endpoint_default_blank')
                     : `${localize('com_endpoint_default')}: ${defaultValue}`}
                   )
@@ -76,7 +76,7 @@ function DynamicTextarea({
             disabled={readonly}
             value={inputValue ?? ''}
             onChange={setInputValue}
-            placeholder={placeholderCode ? localize(placeholder ?? '') || placeholder : placeholder}
+            placeholder={placeholderCode ? localize(placeholder) ?? placeholder : placeholder}
             className={cn(
               defaultTextProps,
               // TODO: configurable max height
@@ -86,7 +86,7 @@ function DynamicTextarea({
         </HoverCardTrigger>
         {description && (
           <OptionHover
-            description={descriptionCode ? localize(description) || description : description}
+            description={descriptionCode ? localize(description) ?? description : description}
             side={ESide.Left}
           />
         )}
diff --git a/client/src/components/SidePanel/Parameters/Panel.tsx b/client/src/components/SidePanel/Parameters/Panel.tsx
index f277da16926..4b941f5641a 100644
--- a/client/src/components/SidePanel/Parameters/Panel.tsx
+++ b/client/src/components/SidePanel/Parameters/Panel.tsx
@@ -1,203 +1,121 @@
-import { ComponentTypes } from 'librechat-data-provider';
-import type {
-  DynamicSettingProps,
-  SettingDefinition,
-  SettingsConfiguration,
-} from 'librechat-data-provider';
-import { useSetIndexOptions } from '~/hooks';
+import React, { useMemo, useState, useEffect, useCallback } from 'react';
+import { useGetEndpointsQuery } from 'librechat-data-provider/react-query';
+import { getSettingsKeys, tPresetUpdateSchema } from 'librechat-data-provider';
+import type { TPreset } from 'librechat-data-provider';
+import { SaveAsPresetDialog } from '~/components/Endpoints';
+import { useSetIndexOptions, useLocalize } from '~/hooks';
+import { getEndpointField, logger } from '~/utils';
+import { componentMapping } from './components';
 import { useChatContext } from '~/Providers';
-import {
-  DynamicDropdown,
-  DynamicCheckbox,
-  DynamicTextarea,
-  DynamicSlider,
-  DynamicSwitch,
-  DynamicInput,
-  DynamicTags,
-} from './';
-
-const settingsConfiguration: SettingsConfiguration = [
-  {
-    key: 'temperature',
-    label: 'com_endpoint_temperature',
-    labelCode: true,
-    description: 'com_endpoint_openai_temp',
-    descriptionCode: true,
-    type: 'number',
-    default: 1,
-    range: {
-      min: 0,
-      max: 2,
-      step: 0.01,
-    },
-    component: 'slider',
-    optionType: 'model',
-    // columnSpan: 2,
-    // includeInput: false,
-  },
-  {
-    key: 'top_p',
-    label: 'com_endpoint_top_p',
-    labelCode: true,
-    description: 'com_endpoint_openai_topp',
-    descriptionCode: true,
-    type: 'number',
-    default: 1,
-    range: {
-      min: 0,
-      max: 1,
-      step: 0.01,
-    },
-    component: 'slider',
-    optionType: 'model',
-  },
-  {
-    key: 'presence_penalty',
-    label: 'com_endpoint_presence_penalty',
-    labelCode: true,
-    description: 'com_endpoint_openai_pres',
-    descriptionCode: true,
-    type: 'number',
-    default: 0,
-    range: {
-      min: -2,
-      max: 2,
-      step: 0.01,
-    },
-    component: 'slider',
-    optionType: 'model',
-  },
-  {
-    key: 'frequency_penalty',
-    label: 'com_endpoint_frequency_penalty',
-    labelCode: true,
-    description: 'com_endpoint_openai_freq',
-    descriptionCode: true,
-    type: 'number',
-    default: 0,
-    range: {
-      min: -2,
-      max: 2,
-      step: 0.01,
-    },
-    component: 'slider',
-    optionType: 'model',
-  },
-  {
-    key: 'chatGptLabel',
-    label: 'com_endpoint_custom_name',
-    labelCode: true,
-    type: 'string',
-    default: '',
-    component: 'input',
-    placeholder: 'com_endpoint_openai_custom_name_placeholder',
-    placeholderCode: true,
-    optionType: 'conversation',
-  },
-  {
-    key: 'promptPrefix',
-    label: 'com_endpoint_prompt_prefix',
-    labelCode: true,
-    type: 'string',
-    default: '',
-    component: 'textarea',
-    placeholder: 'com_endpoint_openai_prompt_prefix_placeholder',
-    placeholderCode: true,
-    optionType: 'conversation',
-    // columnSpan: 2,
-  },
-  {
-    key: 'resendFiles',
-    label: 'com_endpoint_plug_resend_files',
-    labelCode: true,
-    description: 'com_endpoint_openai_resend_files',
-    descriptionCode: true,
-    type: 'boolean',
-    default: true,
-    component: 'switch',
-    optionType: 'conversation',
-    showDefault: false,
-    columnSpan: 2,
-  },
-  {
-    key: 'imageDetail',
-    label: 'com_endpoint_plug_image_detail',
-    labelCode: true,
-    description: 'com_endpoint_openai_detail',
-    descriptionCode: true,
-    type: 'enum',
-    default: 'auto',
-    options: ['low', 'auto', 'high'],
-    optionType: 'conversation',
-    component: 'slider',
-    showDefault: false,
-    columnSpan: 2,
-  },
-  {
-    key: 'stop',
-    label: 'com_endpoint_stop',
-    labelCode: true,
-    description: 'com_endpoint_openai_stop',
-    descriptionCode: true,
-    placeholder: 'com_endpoint_stop_placeholder',
-    placeholderCode: true,
-    type: 'array',
-    default: [],
-    component: 'tags',
-    optionType: 'conversation',
-    columnSpan: 4,
-    minTags: 1,
-    maxTags: 4,
-  },
-];
-
-const componentMapping: Record<ComponentTypes, React.ComponentType<DynamicSettingProps>> = {
-  [ComponentTypes.Slider]: DynamicSlider,
-  [ComponentTypes.Dropdown]: DynamicDropdown,
-  [ComponentTypes.Switch]: DynamicSwitch,
-  [ComponentTypes.Textarea]: DynamicTextarea,
-  [ComponentTypes.Input]: DynamicInput,
-  [ComponentTypes.Checkbox]: DynamicCheckbox,
-  [ComponentTypes.Tags]: DynamicTags,
-};
+import { settings } from './settings';
+
+const excludedKeys = new Set([
+  'conversationId',
+  'title',
+  'endpoint',
+  'endpointType',
+  'createdAt',
+  'updatedAt',
+  'messages',
+  'isArchived',
+  'tags',
+  'user',
+  '__v',
+  '_id',
+  'tools',
+  'model',
+]);
 
 export default function Parameters() {
-  const { conversation } = useChatContext();
+  const localize = useLocalize();
+  const { conversation, setConversation } = useChatContext();
   const { setOption } = useSetIndexOptions();
 
-  const temperature = settingsConfiguration.find(
-    (setting) => setting.key === 'temperature',
-  ) as SettingDefinition;
-  const TempComponent = componentMapping[temperature.component];
-  const { key: temp, default: tempDefault, ...tempSettings } = temperature;
-
-  const imageDetail = settingsConfiguration.find(
-    (setting) => setting.key === 'imageDetail',
-  ) as SettingDefinition;
-  const DetailComponent = componentMapping[imageDetail.component];
-  const { key: detail, default: detailDefault, ...detailSettings } = imageDetail;
-
-  const resendFiles = settingsConfiguration.find(
-    (setting) => setting.key === 'resendFiles',
-  ) as SettingDefinition;
-  const Switch = componentMapping[resendFiles.component];
-  const { key: switchKey, default: switchDefault, ...switchSettings } = resendFiles;
-
-  const promptPrefix = settingsConfiguration.find(
-    (setting) => setting.key === 'promptPrefix',
-  ) as SettingDefinition;
-  const Textarea = componentMapping[promptPrefix.component];
-  const { key: textareaKey, default: textareaDefault, ...textareaSettings } = promptPrefix;
-
-  const chatGptLabel = settingsConfiguration.find(
-    (setting) => setting.key === 'chatGptLabel',
-  ) as SettingDefinition;
-  const Input = componentMapping[chatGptLabel.component];
-  const { key: inputKey, default: inputDefault, ...inputSettings } = chatGptLabel;
-
-  const stop = settingsConfiguration.find((setting) => setting.key === 'stop') as SettingDefinition;
-  const Tags = componentMapping[stop.component];
-  const { key: stopKey, default: stopDefault, ...stopSettings } = stop;
+  const [isDialogOpen, setIsDialogOpen] = useState(false);
+  const [preset, setPreset] = useState<TPreset | null>(null);
+
+  const { data: endpointsConfig } = useGetEndpointsQuery();
+
+  const bedrockRegions = useMemo(() => {
+    return endpointsConfig?.[conversation?.endpoint ?? '']?.availableRegions ?? [];
+  }, [endpointsConfig, conversation?.endpoint]);
+
+  const endpointType = useMemo(
+    () => getEndpointField(endpointsConfig, conversation?.endpoint, 'type'),
+    [conversation?.endpoint, endpointsConfig],
+  );
+
+  const parameters = useMemo(() => {
+    const [combinedKey, endpointKey] = getSettingsKeys(
+      endpointType ?? conversation?.endpoint ?? '',
+      conversation?.model ?? '',
+    );
+    return settings[combinedKey] ?? settings[endpointKey];
+  }, [conversation, endpointType]);
+
+  useEffect(() => {
+    if (!parameters) {
+      return;
+    }
+
+    // const defaultValueMap = new Map();
+    // const paramKeys = new Set(
+    //   parameters.map((setting) => {
+    //     if (setting.default != null) {
+    //       defaultValueMap.set(setting.key, setting.default);
+    //     }
+    //     return setting.key;
+    //   }),
+    // );
+    const paramKeys = new Set(parameters.map((setting) => setting.key));
+    setConversation((prev) => {
+      if (!prev) {
+        return prev;
+      }
+
+      const updatedConversation = { ...prev };
+
+      const conversationKeys = Object.keys(updatedConversation);
+      const updatedKeys: string[] = [];
+      conversationKeys.forEach((key) => {
+        // const defaultValue = defaultValueMap.get(key);
+        // if (paramKeys.has(key) && defaultValue != null && prev[key] != null) {
+        //   updatedKeys.push(key);
+        //   updatedConversation[key] = defaultValue;
+        //   return;
+        // }
+
+        if (paramKeys.has(key)) {
+          return;
+        }
+
+        if (excludedKeys.has(key)) {
+          return;
+        }
+
+        if (prev[key] != null) {
+          updatedKeys.push(key);
+          delete updatedConversation[key];
+        }
+      });
+
+      logger.log('parameters', 'parameters effect, updated keys:', updatedKeys);
+
+      return updatedConversation;
+    });
+  }, [parameters, setConversation]);
+
+  const openDialog = useCallback(() => {
+    const newPreset = tPresetUpdateSchema.parse({
+      ...conversation,
+    }) as TPreset;
+    setPreset(newPreset);
+    setIsDialogOpen(true);
+  }, [conversation]);
+
+  if (!parameters) {
+    return null;
+  }
 
   return (
     <div className="h-auto max-w-full overflow-x-hidden p-3">
@@ -205,49 +123,41 @@ export default function Parameters() {
         {' '}
         {/* This is the parent element containing all settings */}
         {/* Below is an example of an applied dynamic setting, each be contained by a div with the column span specified */}
-        <Input
-          settingKey={inputKey}
-          defaultValue={inputDefault}
-          {...inputSettings}
-          setOption={setOption}
-          conversation={conversation}
-        />
-        <Textarea
-          settingKey={textareaKey}
-          defaultValue={textareaDefault}
-          {...textareaSettings}
-          setOption={setOption}
-          conversation={conversation}
-        />
-        <TempComponent
-          settingKey={temp}
-          defaultValue={tempDefault}
-          {...tempSettings}
-          setOption={setOption}
-          conversation={conversation}
-        />
-        <Switch
-          settingKey={switchKey}
-          defaultValue={switchDefault}
-          {...switchSettings}
-          setOption={setOption}
-          conversation={conversation}
-        />
-        <DetailComponent
-          settingKey={detail}
-          defaultValue={detailDefault}
-          {...detailSettings}
-          setOption={setOption}
-          conversation={conversation}
-        />
-        <Tags
-          settingKey={stopKey}
-          defaultValue={stopDefault}
-          {...stopSettings}
-          setOption={setOption}
-          conversation={conversation}
-        />
+        {parameters.map((setting) => {
+          const Component = componentMapping[setting.component];
+          if (!Component) {
+            return null;
+          }
+          const { key, default: defaultValue, ...rest } = setting;
+
+          if (key === 'region' && bedrockRegions.length) {
+            rest.options = bedrockRegions;
+          }
+
+          return (
+            <Component
+              key={key}
+              settingKey={key}
+              defaultValue={defaultValue}
+              {...rest}
+              setOption={setOption}
+              conversation={conversation}
+            />
+          );
+        })}
+      </div>
+      <div className="mt-6 flex justify-center">
+        <button
+          onClick={openDialog}
+          className="btn btn-primary focus:shadow-outline flex w-full items-center justify-center px-4 py-2 font-semibold text-white hover:bg-green-600 focus:border-green-500"
+          type="button"
+        >
+          {localize('com_endpoint_save_as_preset')}
+        </button>
       </div>
+      {preset && (
+        <SaveAsPresetDialog open={isDialogOpen} onOpenChange={setIsDialogOpen} preset={preset} />
+      )}
     </div>
   );
 }
diff --git a/client/src/components/SidePanel/Parameters/components.tsx b/client/src/components/SidePanel/Parameters/components.tsx
new file mode 100644
index 00000000000..9c36d0eb206
--- /dev/null
+++ b/client/src/components/SidePanel/Parameters/components.tsx
@@ -0,0 +1,26 @@
+import { ComponentTypes } from 'librechat-data-provider';
+import type { DynamicSettingProps } from 'librechat-data-provider';
+import {
+  DynamicCombobox,
+  DynamicDropdown,
+  DynamicCheckbox,
+  DynamicTextarea,
+  DynamicSlider,
+  DynamicSwitch,
+  DynamicInput,
+  DynamicTags,
+} from './';
+
+export const componentMapping: Record<
+  ComponentTypes,
+  React.ComponentType<DynamicSettingProps> | undefined
+> = {
+  [ComponentTypes.Slider]: DynamicSlider,
+  [ComponentTypes.Dropdown]: DynamicDropdown,
+  [ComponentTypes.Switch]: DynamicSwitch,
+  [ComponentTypes.Textarea]: DynamicTextarea,
+  [ComponentTypes.Input]: DynamicInput,
+  [ComponentTypes.Checkbox]: DynamicCheckbox,
+  [ComponentTypes.Tags]: DynamicTags,
+  [ComponentTypes.Combobox]: DynamicCombobox,
+};
diff --git a/client/src/components/SidePanel/Parameters/index.ts b/client/src/components/SidePanel/Parameters/index.ts
index e5c59ced584..d945367c6d4 100644
--- a/client/src/components/SidePanel/Parameters/index.ts
+++ b/client/src/components/SidePanel/Parameters/index.ts
@@ -1,4 +1,5 @@
 export { default as DynamicInputNumber } from './DynamicInputNumber';
+export { default as DynamicCombobox } from './DynamicCombobox';
 export { default as DynamicDropdown } from './DynamicDropdown';
 export { default as DynamicCheckbox } from './DynamicCheckbox';
 export { default as DynamicTextarea } from './DynamicTextarea';
@@ -6,3 +7,4 @@ export { default as DynamicSlider } from './DynamicSlider';
 export { default as DynamicSwitch } from './DynamicSwitch';
 export { default as DynamicInput } from './DynamicInput';
 export { default as DynamicTags } from './DynamicTags';
+export { default as OptionHoverAlt } from './OptionHover';
diff --git a/client/src/components/SidePanel/Parameters/settings.ts b/client/src/components/SidePanel/Parameters/settings.ts
new file mode 100644
index 00000000000..f9b6398ae22
--- /dev/null
+++ b/client/src/components/SidePanel/Parameters/settings.ts
@@ -0,0 +1,574 @@
+import {
+  ImageDetail,
+  EModelEndpoint,
+  openAISettings,
+  BedrockProviders,
+  anthropicSettings,
+} from 'librechat-data-provider';
+import type { SettingsConfiguration, SettingDefinition } from 'librechat-data-provider';
+
+// Base definitions
+const baseDefinitions: Record<string, SettingDefinition> = {
+  model: {
+    key: 'model',
+    label: 'com_ui_model',
+    labelCode: true,
+    type: 'string',
+    component: 'dropdown',
+    optionType: 'model',
+    selectPlaceholder: 'com_ui_select_model',
+    searchPlaceholder: 'com_ui_select_search_model',
+    searchPlaceholderCode: true,
+    selectPlaceholderCode: true,
+    columnSpan: 4,
+  },
+  temperature: {
+    key: 'temperature',
+    label: 'com_endpoint_temperature',
+    labelCode: true,
+    description: 'com_endpoint_openai_temp',
+    descriptionCode: true,
+    type: 'number',
+    component: 'slider',
+    optionType: 'model',
+    columnSpan: 4,
+  },
+  topP: {
+    key: 'topP',
+    label: 'com_endpoint_top_p',
+    labelCode: true,
+    description: 'com_endpoint_anthropic_topp',
+    descriptionCode: true,
+    type: 'number',
+    component: 'slider',
+    optionType: 'model',
+    columnSpan: 4,
+  },
+  stop: {
+    key: 'stop',
+    label: 'com_endpoint_stop',
+    labelCode: true,
+    description: 'com_endpoint_openai_stop',
+    descriptionCode: true,
+    placeholder: 'com_endpoint_stop_placeholder',
+    placeholderCode: true,
+    type: 'array',
+    default: [],
+    component: 'tags',
+    optionType: 'conversation',
+    minTags: 0,
+    maxTags: 4,
+  },
+  imageDetail: {
+    key: 'imageDetail',
+    label: 'com_endpoint_plug_image_detail',
+    labelCode: true,
+    description: 'com_endpoint_openai_detail',
+    descriptionCode: true,
+    type: 'enum',
+    default: ImageDetail.auto,
+    component: 'slider',
+    options: [ImageDetail.low, ImageDetail.auto, ImageDetail.high],
+    optionType: 'conversation',
+    columnSpan: 2,
+  },
+};
+
+const createDefinition = (
+  base: Partial<SettingDefinition>,
+  overrides: Partial<SettingDefinition>,
+): SettingDefinition => {
+  return { ...base, ...overrides } as SettingDefinition;
+};
+
+const librechat: Record<string, SettingDefinition> = {
+  modelLabel: {
+    key: 'modelLabel',
+    label: 'com_endpoint_custom_name',
+    labelCode: true,
+    type: 'string',
+    default: '',
+    component: 'input',
+    placeholder: 'com_endpoint_openai_custom_name_placeholder',
+    placeholderCode: true,
+    optionType: 'conversation',
+  },
+  maxContextTokens: {
+    key: 'maxContextTokens',
+    label: 'com_endpoint_context_tokens',
+    labelCode: true,
+    type: 'number',
+    component: 'input',
+    placeholder: 'com_nav_theme_system',
+    placeholderCode: true,
+    description: 'com_endpoint_context_info',
+    descriptionCode: true,
+    optionType: 'model',
+    columnSpan: 2,
+  },
+  resendFiles: {
+    key: 'resendFiles',
+    label: 'com_endpoint_plug_resend_files',
+    labelCode: true,
+    description: 'com_endpoint_openai_resend_files',
+    descriptionCode: true,
+    type: 'boolean',
+    default: true,
+    component: 'switch',
+    optionType: 'conversation',
+    showDefault: false,
+    columnSpan: 2,
+  },
+  promptPrefix: {
+    key: 'promptPrefix',
+    label: 'com_endpoint_prompt_prefix',
+    labelCode: true,
+    type: 'string',
+    default: '',
+    component: 'textarea',
+    placeholder: 'com_endpoint_openai_prompt_prefix_placeholder',
+    placeholderCode: true,
+    optionType: 'model',
+  },
+};
+
+const openAIParams: Record<string, SettingDefinition> = {
+  chatGptLabel: {
+    ...librechat.modelLabel,
+    key: 'chatGptLabel',
+  },
+  promptPrefix: librechat.promptPrefix,
+  temperature: createDefinition(baseDefinitions.temperature, {
+    default: openAISettings.temperature.default,
+    range: {
+      min: openAISettings.temperature.min,
+      max: openAISettings.temperature.max,
+      step: openAISettings.temperature.step,
+    },
+  }),
+  top_p: createDefinition(baseDefinitions.topP, {
+    key: 'top_p',
+    default: openAISettings.top_p.default,
+    range: {
+      min: openAISettings.top_p.min,
+      max: openAISettings.top_p.max,
+      step: openAISettings.top_p.step,
+    },
+  }),
+  frequency_penalty: {
+    key: 'frequency_penalty',
+    label: 'com_endpoint_frequency_penalty',
+    labelCode: true,
+    description: 'com_endpoint_openai_freq',
+    descriptionCode: true,
+    type: 'number',
+    default: openAISettings.frequency_penalty.default,
+    range: {
+      min: openAISettings.frequency_penalty.min,
+      max: openAISettings.frequency_penalty.max,
+      step: openAISettings.frequency_penalty.step,
+    },
+    component: 'slider',
+    optionType: 'model',
+    columnSpan: 4,
+  },
+  presence_penalty: {
+    key: 'presence_penalty',
+    label: 'com_endpoint_presence_penalty',
+    labelCode: true,
+    description: 'com_endpoint_openai_pres',
+    descriptionCode: true,
+    type: 'number',
+    default: openAISettings.presence_penalty.default,
+    range: {
+      min: openAISettings.presence_penalty.min,
+      max: openAISettings.presence_penalty.max,
+      step: openAISettings.presence_penalty.step,
+    },
+    component: 'slider',
+    optionType: 'model',
+    columnSpan: 4,
+  },
+  max_tokens: {
+    key: 'max_tokens',
+    label: 'com_endpoint_max_output_tokens',
+    labelCode: true,
+    type: 'number',
+    component: 'input',
+    description: 'com_endpoint_openai_max_tokens',
+    descriptionCode: true,
+    placeholder: 'com_nav_theme_system',
+    placeholderCode: true,
+    optionType: 'model',
+    columnSpan: 2,
+  },
+};
+
+const anthropic: Record<string, SettingDefinition> = {
+  maxOutputTokens: {
+    key: 'maxOutputTokens',
+    label: 'com_endpoint_max_output_tokens',
+    labelCode: true,
+    type: 'number',
+    component: 'input',
+    description: 'com_endpoint_anthropic_maxoutputtokens',
+    descriptionCode: true,
+    placeholder: 'com_nav_theme_system',
+    placeholderCode: true,
+    range: {
+      min: anthropicSettings.maxOutputTokens.min,
+      max: anthropicSettings.maxOutputTokens.max,
+      step: anthropicSettings.maxOutputTokens.step,
+    },
+    optionType: 'model',
+    columnSpan: 2,
+  },
+  temperature: createDefinition(baseDefinitions.temperature, {
+    default: anthropicSettings.temperature.default,
+    range: {
+      min: anthropicSettings.temperature.min,
+      max: anthropicSettings.temperature.max,
+      step: anthropicSettings.temperature.step,
+    },
+  }),
+  topP: createDefinition(baseDefinitions.topP, {
+    default: anthropicSettings.topP.default,
+    range: {
+      min: anthropicSettings.topP.min,
+      max: anthropicSettings.topP.max,
+      step: anthropicSettings.topP.step,
+    },
+  }),
+  topK: {
+    key: 'topK',
+    label: 'com_endpoint_top_k',
+    labelCode: true,
+    description: 'com_endpoint_anthropic_topk',
+    descriptionCode: true,
+    type: 'number',
+    default: anthropicSettings.topK.default,
+    range: {
+      min: anthropicSettings.topK.min,
+      max: anthropicSettings.topK.max,
+      step: anthropicSettings.topK.step,
+    },
+    component: 'slider',
+    optionType: 'model',
+    columnSpan: 4,
+  },
+  promptCache: {
+    key: 'promptCache',
+    label: 'com_endpoint_prompt_cache',
+    labelCode: true,
+    description: 'com_endpoint_anthropic_prompt_cache',
+    descriptionCode: true,
+    type: 'boolean',
+    default: true,
+    component: 'switch',
+    optionType: 'conversation',
+    showDefault: false,
+    columnSpan: 2,
+  },
+};
+
+const bedrock: Record<string, SettingDefinition> = {
+  system: {
+    key: 'system',
+    label: 'com_endpoint_prompt_prefix',
+    labelCode: true,
+    type: 'string',
+    default: '',
+    component: 'textarea',
+    placeholder: 'com_endpoint_openai_prompt_prefix_placeholder',
+    placeholderCode: true,
+    optionType: 'model',
+  },
+  region: {
+    key: 'region',
+    type: 'string',
+    label: 'com_ui_region',
+    labelCode: true,
+    component: 'combobox',
+    optionType: 'conversation',
+    selectPlaceholder: 'com_ui_select_region',
+    searchPlaceholder: 'com_ui_select_search_region',
+    searchPlaceholderCode: true,
+    selectPlaceholderCode: true,
+    columnSpan: 2,
+  },
+  maxTokens: {
+    key: 'maxTokens',
+    label: 'com_endpoint_max_output_tokens',
+    labelCode: true,
+    type: 'number',
+    component: 'input',
+    placeholder: 'com_endpoint_anthropic_maxoutputtokens',
+    placeholderCode: true,
+    optionType: 'model',
+    columnSpan: 2,
+  },
+  temperature: createDefinition(baseDefinitions.temperature, {
+    default: 1,
+    range: { min: 0, max: 1, step: 0.01 },
+  }),
+  topK: createDefinition(anthropic.topK, {
+    range: { min: 0, max: 500, step: 1 },
+  }),
+  topP: createDefinition(baseDefinitions.topP, {
+    default: 0.999,
+    range: { min: 0, max: 1, step: 0.01 },
+  }),
+};
+
+const mistral: Record<string, SettingDefinition> = {
+  temperature: createDefinition(baseDefinitions.temperature, {
+    default: 0.7,
+    range: { min: 0, max: 1, step: 0.01 },
+  }),
+  topP: createDefinition(baseDefinitions.topP, {
+    range: { min: 0, max: 1, step: 0.01 },
+  }),
+};
+
+const cohere: Record<string, SettingDefinition> = {
+  temperature: createDefinition(baseDefinitions.temperature, {
+    default: 0.3,
+    range: { min: 0, max: 1, step: 0.01 },
+  }),
+  topP: createDefinition(baseDefinitions.topP, {
+    default: 0.75,
+    range: { min: 0.01, max: 0.99, step: 0.01 },
+  }),
+};
+
+const meta: Record<string, SettingDefinition> = {
+  temperature: createDefinition(baseDefinitions.temperature, {
+    default: 0.5,
+    range: { min: 0, max: 1, step: 0.01 },
+  }),
+  topP: createDefinition(baseDefinitions.topP, {
+    default: 0.9,
+    range: { min: 0, max: 1, step: 0.01 },
+  }),
+};
+
+const openAI: SettingsConfiguration = [
+  openAIParams.chatGptLabel,
+  librechat.promptPrefix,
+  librechat.maxContextTokens,
+  openAIParams.max_tokens,
+  openAIParams.temperature,
+  openAIParams.top_p,
+  openAIParams.frequency_penalty,
+  openAIParams.presence_penalty,
+  baseDefinitions.stop,
+  librechat.resendFiles,
+  baseDefinitions.imageDetail,
+];
+
+const openAICol1: SettingsConfiguration = [
+  baseDefinitions.model as SettingDefinition,
+  openAIParams.chatGptLabel,
+  librechat.promptPrefix,
+  librechat.maxContextTokens,
+];
+
+const openAICol2: SettingsConfiguration = [
+  openAIParams.max_tokens,
+  openAIParams.temperature,
+  openAIParams.top_p,
+  openAIParams.frequency_penalty,
+  openAIParams.presence_penalty,
+  baseDefinitions.stop,
+  librechat.resendFiles,
+  baseDefinitions.imageDetail,
+];
+
+const anthropicConfig: SettingsConfiguration = [
+  librechat.modelLabel,
+  librechat.promptPrefix,
+  librechat.maxContextTokens,
+  anthropic.maxOutputTokens,
+  anthropic.temperature,
+  anthropic.topP,
+  anthropic.topK,
+  librechat.resendFiles,
+  anthropic.promptCache,
+];
+
+const anthropicCol1: SettingsConfiguration = [
+  baseDefinitions.model as SettingDefinition,
+  librechat.modelLabel,
+  librechat.promptPrefix,
+];
+
+const anthropicCol2: SettingsConfiguration = [
+  librechat.maxContextTokens,
+  anthropic.maxOutputTokens,
+  anthropic.temperature,
+  anthropic.topP,
+  anthropic.topK,
+  librechat.resendFiles,
+  anthropic.promptCache,
+];
+
+const bedrockAnthropic: SettingsConfiguration = [
+  librechat.modelLabel,
+  bedrock.system,
+  librechat.maxContextTokens,
+  bedrock.maxTokens,
+  bedrock.temperature,
+  bedrock.topP,
+  bedrock.topK,
+  baseDefinitions.stop,
+  bedrock.region,
+  librechat.resendFiles,
+];
+
+const bedrockMistral: SettingsConfiguration = [
+  librechat.modelLabel,
+  librechat.promptPrefix,
+  librechat.maxContextTokens,
+  bedrock.maxTokens,
+  mistral.temperature,
+  mistral.topP,
+  bedrock.region,
+  librechat.resendFiles,
+];
+
+const bedrockCohere: SettingsConfiguration = [
+  librechat.modelLabel,
+  librechat.promptPrefix,
+  librechat.maxContextTokens,
+  bedrock.maxTokens,
+  cohere.temperature,
+  cohere.topP,
+  bedrock.region,
+  librechat.resendFiles,
+];
+
+const bedrockGeneral: SettingsConfiguration = [
+  librechat.modelLabel,
+  librechat.promptPrefix,
+  librechat.maxContextTokens,
+  meta.temperature,
+  meta.topP,
+  bedrock.region,
+  librechat.resendFiles,
+];
+
+const bedrockAnthropicCol1: SettingsConfiguration = [
+  baseDefinitions.model as SettingDefinition,
+  librechat.modelLabel,
+  bedrock.system,
+  baseDefinitions.stop,
+];
+
+const bedrockAnthropicCol2: SettingsConfiguration = [
+  librechat.maxContextTokens,
+  bedrock.maxTokens,
+  bedrock.temperature,
+  bedrock.topP,
+  bedrock.topK,
+  bedrock.region,
+  librechat.resendFiles,
+];
+
+const bedrockMistralCol1: SettingsConfiguration = [
+  baseDefinitions.model as SettingDefinition,
+  librechat.modelLabel,
+  librechat.promptPrefix,
+];
+
+const bedrockMistralCol2: SettingsConfiguration = [
+  librechat.maxContextTokens,
+  bedrock.maxTokens,
+  mistral.temperature,
+  mistral.topP,
+  bedrock.region,
+  librechat.resendFiles,
+];
+
+const bedrockCohereCol1: SettingsConfiguration = [
+  baseDefinitions.model as SettingDefinition,
+  librechat.modelLabel,
+  librechat.promptPrefix,
+];
+
+const bedrockCohereCol2: SettingsConfiguration = [
+  librechat.maxContextTokens,
+  bedrock.maxTokens,
+  cohere.temperature,
+  cohere.topP,
+  bedrock.region,
+  librechat.resendFiles,
+];
+
+const bedrockGeneralCol1: SettingsConfiguration = [
+  baseDefinitions.model as SettingDefinition,
+  librechat.modelLabel,
+  librechat.promptPrefix,
+];
+
+const bedrockGeneralCol2: SettingsConfiguration = [
+  librechat.maxContextTokens,
+  meta.temperature,
+  meta.topP,
+  bedrock.region,
+  librechat.resendFiles,
+];
+
+export const settings: Record<string, SettingsConfiguration | undefined> = {
+  [EModelEndpoint.openAI]: openAI,
+  [EModelEndpoint.azureOpenAI]: openAI,
+  [EModelEndpoint.custom]: openAI,
+  [EModelEndpoint.anthropic]: anthropicConfig,
+  [`${EModelEndpoint.bedrock}-${BedrockProviders.Anthropic}`]: bedrockAnthropic,
+  [`${EModelEndpoint.bedrock}-${BedrockProviders.MistralAI}`]: bedrockMistral,
+  [`${EModelEndpoint.bedrock}-${BedrockProviders.Cohere}`]: bedrockCohere,
+  [`${EModelEndpoint.bedrock}-${BedrockProviders.Meta}`]: bedrockGeneral,
+  [`${EModelEndpoint.bedrock}-${BedrockProviders.AI21}`]: bedrockGeneral,
+  [`${EModelEndpoint.bedrock}-${BedrockProviders.Amazon}`]: bedrockGeneral,
+};
+
+const openAIColumns = {
+  col1: openAICol1,
+  col2: openAICol2,
+};
+
+const bedrockGeneralColumns = {
+  col1: bedrockGeneralCol1,
+  col2: bedrockGeneralCol2,
+};
+
+export const presetSettings: Record<
+  string,
+  | {
+      col1: SettingsConfiguration;
+      col2: SettingsConfiguration;
+    }
+  | undefined
+> = {
+  [EModelEndpoint.openAI]: openAIColumns,
+  [EModelEndpoint.azureOpenAI]: openAIColumns,
+  [EModelEndpoint.custom]: openAIColumns,
+  [EModelEndpoint.anthropic]: {
+    col1: anthropicCol1,
+    col2: anthropicCol2,
+  },
+  [`${EModelEndpoint.bedrock}-${BedrockProviders.Anthropic}`]: {
+    col1: bedrockAnthropicCol1,
+    col2: bedrockAnthropicCol2,
+  },
+  [`${EModelEndpoint.bedrock}-${BedrockProviders.MistralAI}`]: {
+    col1: bedrockMistralCol1,
+    col2: bedrockMistralCol2,
+  },
+  [`${EModelEndpoint.bedrock}-${BedrockProviders.Cohere}`]: {
+    col1: bedrockCohereCol1,
+    col2: bedrockCohereCol2,
+  },
+  [`${EModelEndpoint.bedrock}-${BedrockProviders.Meta}`]: bedrockGeneralColumns,
+  [`${EModelEndpoint.bedrock}-${BedrockProviders.AI21}`]: bedrockGeneralColumns,
+  [`${EModelEndpoint.bedrock}-${BedrockProviders.Amazon}`]: bedrockGeneralColumns,
+};
diff --git a/client/src/components/SidePanel/SidePanel.tsx b/client/src/components/SidePanel/SidePanel.tsx
index dedee5d282d..b150e2c2dcb 100644
--- a/client/src/components/SidePanel/SidePanel.tsx
+++ b/client/src/components/SidePanel/SidePanel.tsx
@@ -9,13 +9,12 @@ import {
 import type { ImperativePanelHandle } from 'react-resizable-panels';
 import type { TEndpointsConfig } from 'librechat-data-provider';
 import { ResizableHandleAlt, ResizablePanel, ResizablePanelGroup } from '~/components/ui/Resizable';
-import { TooltipProvider, Tooltip } from '~/components/ui/Tooltip';
-import useSideNavLinks from '~/hooks/Nav/useSideNavLinks';
 import { useMediaQuery, useLocalStorage, useLocalize } from '~/hooks';
+import useSideNavLinks from '~/hooks/Nav/useSideNavLinks';
 import NavToggle from '~/components/Nav/NavToggle';
+import { cn, getEndpointField } from '~/utils';
 import { useChatContext } from '~/Providers';
 import Switcher from './Switcher';
-import { cn } from '~/utils';
 import Nav from './Nav';
 
 interface SidePanelProps {
@@ -82,6 +81,10 @@ const SidePanel = ({
     return typeof activePanel === 'string' ? activePanel : undefined;
   }, []);
 
+  const endpointType = useMemo(
+    () => getEndpointField(endpointsConfig, endpoint, 'type'),
+    [endpoint, endpointsConfig],
+  );
   const assistants = useMemo(() => endpointsConfig?.[endpoint ?? ''], [endpoint, endpointsConfig]);
   const agents = useMemo(() => endpointsConfig?.[endpoint ?? ''], [endpoint, endpointsConfig]);
 
@@ -109,6 +112,7 @@ const SidePanel = ({
     hidePanel,
     assistants,
     keyProvided,
+    endpointType,
     interfaceConfig,
   });
 
@@ -176,116 +180,109 @@ const SidePanel = ({
 
   return (
     <>
-      <TooltipProvider delayDuration={0}>
-        <ResizablePanelGroup
-          direction="horizontal"
-          onLayout={(sizes) => throttledSaveLayout(sizes)}
-          className="transition-width relative h-full w-full flex-1 overflow-auto bg-white dark:bg-gray-800"
+      <ResizablePanelGroup
+        direction="horizontal"
+        onLayout={(sizes) => throttledSaveLayout(sizes)}
+        className="transition-width relative h-full w-full flex-1 overflow-auto bg-white dark:bg-gray-800"
+      >
+        <ResizablePanel
+          defaultSize={currentLayout[0]}
+          minSize={minSizeMain}
+          order={1}
+          id="messages-view"
         >
-          <ResizablePanel
-            defaultSize={currentLayout[0]}
-            minSize={minSizeMain}
-            order={1}
-            id="messages-view"
-          >
-            {children}
-          </ResizablePanel>
-          {artifacts != null && (
-            <>
-              <ResizableHandleAlt withHandle className="ml-3 bg-border-medium dark:text-white" />
-              <ResizablePanel
-                defaultSize={currentLayout[1]}
-                minSize={minSizeMain}
-                order={2}
-                id="artifacts-panel"
-              >
-                {artifacts}
-              </ResizablePanel>
-            </>
-          )}
-          <TooltipProvider delayDuration={400}>
-            <Tooltip>
-              <div
-                onMouseEnter={() => setIsHovering(true)}
-                onMouseLeave={() => setIsHovering(false)}
-                className="relative flex w-px items-center justify-center"
-              >
-                <NavToggle
-                  navVisible={!isCollapsed}
-                  isHovering={isHovering}
-                  onToggle={toggleNavVisible}
-                  setIsHovering={setIsHovering}
-                  className={cn(
-                    'fixed top-1/2',
-                    (isCollapsed && (minSize === 0 || collapsedSize === 0)) || fullCollapse
-                      ? 'mr-9'
-                      : 'mr-16',
-                  )}
-                  translateX={false}
-                  side="right"
-                />
-              </div>
-            </Tooltip>
-          </TooltipProvider>
-          {(!isCollapsed || minSize > 0) && !isSmallScreen && !fullCollapse && (
-            <ResizableHandleAlt withHandle className="bg-transparent dark:text-white" />
-          )}
-          <ResizablePanel
-            tagName="nav"
-            id="controls-nav"
-            order={artifacts != null ? 3 : 2}
-            aria-label={localize('com_ui_controls')}
-            role="region"
-            collapsedSize={collapsedSize}
-            defaultSize={currentLayout[currentLayout.length - 1]}
-            collapsible={true}
-            minSize={minSize}
-            maxSize={40}
-            ref={panelRef}
-            style={{
-              overflowY: 'auto',
-              transition: 'width 0.2s ease, visibility 0s linear 0.2s',
-            }}
-            onExpand={() => {
-              setIsCollapsed(false);
-              localStorage.setItem('react-resizable-panels:collapsed', 'false');
-            }}
-            onCollapse={() => {
-              setIsCollapsed(true);
-              localStorage.setItem('react-resizable-panels:collapsed', 'true');
-            }}
+          {children}
+        </ResizablePanel>
+        {artifacts != null && (
+          <>
+            <ResizableHandleAlt withHandle className="ml-3 bg-border-medium dark:text-white" />
+            <ResizablePanel
+              defaultSize={currentLayout[1]}
+              minSize={minSizeMain}
+              order={2}
+              id="artifacts-panel"
+            >
+              {artifacts}
+            </ResizablePanel>
+          </>
+        )}
+        <div
+          onMouseEnter={() => setIsHovering(true)}
+          onMouseLeave={() => setIsHovering(false)}
+          className="relative flex w-px items-center justify-center"
+        >
+          <NavToggle
+            navVisible={!isCollapsed}
+            isHovering={isHovering}
+            onToggle={toggleNavVisible}
+            setIsHovering={setIsHovering}
             className={cn(
-              'sidenav hide-scrollbar border-l border-border-light bg-surface-primary-alt transition-opacity',
-              isCollapsed ? 'min-w-[50px]' : 'min-w-[340px] sm:min-w-[352px]',
-              (isSmallScreen && isCollapsed && (minSize === 0 || collapsedSize === 0)) ||
-                fullCollapse
-                ? 'hidden min-w-0'
-                : 'opacity-100',
-            )}
-          >
-            {interfaceConfig.modelSelect && (
-              <div
-                className={cn(
-                  'sticky left-0 right-0 top-0 z-[100] flex h-[52px] flex-wrap items-center justify-center bg-surface-primary-alt',
-                  isCollapsed ? 'h-[52px]' : 'px-2',
-                )}
-              >
-                <Switcher
-                  isCollapsed={isCollapsed}
-                  endpointKeyProvided={keyProvided}
-                  endpoint={endpoint}
-                />
-              </div>
+              'fixed top-1/2',
+              (isCollapsed && (minSize === 0 || collapsedSize === 0)) || fullCollapse
+                ? 'mr-9'
+                : 'mr-16',
             )}
-            <Nav
-              resize={panelRef.current?.resize}
-              isCollapsed={isCollapsed}
-              defaultActive={defaultActive}
-              links={Links}
-            />
-          </ResizablePanel>
-        </ResizablePanelGroup>
-      </TooltipProvider>
+            translateX={false}
+            side="right"
+          />
+        </div>
+        {(!isCollapsed || minSize > 0) && !isSmallScreen && !fullCollapse && (
+          <ResizableHandleAlt withHandle className="bg-transparent dark:text-white" />
+        )}
+        <ResizablePanel
+          tagName="nav"
+          id="controls-nav"
+          order={artifacts != null ? 3 : 2}
+          aria-label={localize('com_ui_controls')}
+          role="region"
+          collapsedSize={collapsedSize}
+          defaultSize={currentLayout[currentLayout.length - 1]}
+          collapsible={true}
+          minSize={minSize}
+          maxSize={40}
+          ref={panelRef}
+          style={{
+            overflowY: 'auto',
+            transition: 'width 0.2s ease, visibility 0s linear 0.2s',
+          }}
+          onExpand={() => {
+            setIsCollapsed(false);
+            localStorage.setItem('react-resizable-panels:collapsed', 'false');
+          }}
+          onCollapse={() => {
+            setIsCollapsed(true);
+            localStorage.setItem('react-resizable-panels:collapsed', 'true');
+          }}
+          className={cn(
+            'sidenav hide-scrollbar border-l border-border-light bg-background transition-opacity',
+            isCollapsed ? 'min-w-[50px]' : 'min-w-[340px] sm:min-w-[352px]',
+            (isSmallScreen && isCollapsed && (minSize === 0 || collapsedSize === 0)) || fullCollapse
+              ? 'hidden min-w-0'
+              : 'opacity-100',
+          )}
+        >
+          {interfaceConfig.modelSelect && (
+            <div
+              className={cn(
+                'sticky left-0 right-0 top-0 z-[100] flex h-[52px] flex-wrap items-center justify-center bg-background',
+                isCollapsed ? 'h-[52px]' : 'px-2',
+              )}
+            >
+              <Switcher
+                isCollapsed={isCollapsed}
+                endpointKeyProvided={keyProvided}
+                endpoint={endpoint}
+              />
+            </div>
+          )}
+          <Nav
+            resize={panelRef.current?.resize}
+            isCollapsed={isCollapsed}
+            defaultActive={defaultActive}
+            links={Links}
+          />
+        </ResizablePanel>
+      </ResizablePanelGroup>
       <button
         aria-label="Close right side panel"
         className={`nav-mask ${!isCollapsed ? 'active' : ''}`}
diff --git a/client/src/components/svg/BedrockIcon.tsx b/client/src/components/svg/BedrockIcon.tsx
new file mode 100644
index 00000000000..f514790c380
--- /dev/null
+++ b/client/src/components/svg/BedrockIcon.tsx
@@ -0,0 +1,23 @@
+import { cn } from '~/utils';
+
+export default function BedrockIcon({
+  size = 25,
+  className = '',
+}: {
+  size?: number;
+  className?: string;
+}) {
+  return (
+    <svg
+      width={size}
+      height={size}
+      viewBox="0 0 24 24"
+      xmlns="http://www.w3.org/2000/svg"
+      className={cn('fill-current text-black', className)}
+    >
+      <g fill="currentColor">
+        <path d="M12,18.1397014 L9.574,18.9487014 L8.628,18.3177014 L9.658,17.9737014 L9.342,17.0257014 L7.574,17.6147014 L7,17.2327014 L7,14.4997014 C7,14.3107014 6.893,14.1377014 6.724,14.0527014 L5,13.1907014 L5,10.8087014 L6.5,10.0587014 L8,10.8087014 L8,12.4997014 C8,12.6897014 8.107,12.8627014 8.276,12.9477014 L10.276,13.9477014 L10.724,13.0527014 L9,12.1907014 L9,10.8087014 L10.724,9.94770136 C10.893,9.86270136 11,9.68970136 11,9.49970136 L11,7.99970136 L10,7.99970136 L10,9.19070136 L8.5,9.94070136 L7,9.19070136 L7,6.76770136 L8,6.10070136 L8,7.99970136 L9,7.99970136 L9,5.43470136 L9.574,5.05170136 L12,5.86070136 L12,18.1397014 Z M17.5,16.9997014 C17.775,16.9997014 18,17.2237014 18,17.4997014 C18,17.7757014 17.775,17.9997014 17.5,17.9997014 C17.225,17.9997014 17,17.7757014 17,17.4997014 C17,17.2237014 17.225,16.9997014 17.5,16.9997014 L17.5,16.9997014 Z M16.5,5.99970136 C16.775,5.99970136 17,6.22370136 17,6.49970136 C17,6.77570136 16.775,6.99970136 16.5,6.99970136 C16.225,6.99970136 16,6.77570136 16,6.49970136 C16,6.22370136 16.225,5.99970136 16.5,5.99970136 L16.5,5.99970136 Z M18.5,11.9997014 C18.775,11.9997014 19,12.2237014 19,12.4997014 C19,12.7757014 18.775,12.9997014 18.5,12.9997014 C18.225,12.9997014 18,12.7757014 18,12.4997014 C18,12.2237014 18.225,11.9997014 18.5,11.9997014 L18.5,11.9997014 Z M17.092,12.9997014 C17.299,13.5807014 17.849,13.9997014 18.5,13.9997014 C19.327,13.9997014 20,13.3277014 20,12.4997014 C20,11.6727014 19.327,10.9997014 18.5,10.9997014 C17.849,10.9997014 17.299,11.4197014 17.092,11.9997014 L13,11.9997014 L13,9.99970136 L16.5,9.99970136 C16.776,9.99970136 17,9.77670136 17,9.49970136 L17,7.90770136 C17.581,7.70070136 18,7.15070136 18,6.49970136 C18,5.67270136 17.327,4.99970136 16.5,4.99970136 C15.673,4.99970136 15,5.67270136 15,6.49970136 C15,7.15070136 15.419,7.70070136 16,7.90770136 L16,8.99970136 L13,8.99970136 L13,5.49970136 C13,5.28470136 12.862,5.09370136 12.658,5.02570136 L9.658,4.02570136 C9.511,3.97670136 9.351,3.99870136 9.223,4.08370136 L6.223,6.08370136 C6.084,6.17670136 6,6.33270136 6,6.49970136 L6,9.19070136 L4.276,10.0527014 C4.107,10.1377014 4,10.3107014 4,10.4997014 L4,13.4997014 C4,13.6897014 4.107,13.8627014 4.276,13.9477014 L6,14.8087014 L6,17.4997014 C6,17.6667014 6.084,17.8237014 6.223,17.9157014 L9.223,19.9157014 C9.306,19.9717014 9.402,19.9997014 9.5,19.9997014 C9.553,19.9997014 9.606,19.9917014 9.658,19.9737014 L12.658,18.9737014 C12.862,18.9067014 13,18.7157014 13,18.4997014 L13,15.9997014 L15.293,15.9997014 L16.146,16.8537014 L16.159,16.8407014 C16.061,17.0407014 16,17.2627014 16,17.4997014 C16,18.3267014 16.673,18.9997014 17.5,18.9997014 C18.327,18.9997014 19,18.3267014 19,17.4997014 C19,16.6727014 18.327,15.9997014 17.5,15.9997014 C17.262,15.9997014 17.04,16.0607014 16.841,16.1597014 L16.854,16.1467014 L15.854,15.1467014 C15.76,15.0527014 15.633,14.9997014 15.5,14.9997014 L13,14.9997014 L13,12.9997014 L17.092,12.9997014 Z" />
+      </g>
+    </svg>
+  );
+}
diff --git a/client/src/components/svg/EditIcon.tsx b/client/src/components/svg/EditIcon.tsx
index 7adfef0784c..21a6b3c31f2 100644
--- a/client/src/components/svg/EditIcon.tsx
+++ b/client/src/components/svg/EditIcon.tsx
@@ -1,37 +1,34 @@
 import React from 'react';
 import { cn } from '~/utils';
 
-const EditIcon = React.forwardRef<SVGSVGElement>(
-  (
-    props: {
-      className?: string;
-      size?: string;
-    },
-    ref,
-  ) => {
-    const { className = 'icon-md', size = '1.2em' } = props;
-    return (
-      <svg
-        ref={ref}
-        fill="none"
-        strokeWidth="2"
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 24 24"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        height={size}
-        width={size}
-        className={cn(className)}
-      >
-        <path
-          fillRule="evenodd"
-          clipRule="evenodd"
-          d="M13.2929 4.29291C15.0641 2.52167 17.9359 2.52167 19.7071 4.2929C21.4783 6.06414 21.4783 8.93588 19.7071 10.7071L18.7073 11.7069L11.1603 19.2539C10.7182 19.696 10.1489 19.989 9.53219 20.0918L4.1644 20.9864C3.84584 21.0395 3.52125 20.9355 3.29289 20.7071C3.06453 20.4788 2.96051 20.1542 3.0136 19.8356L3.90824 14.4678C4.01103 13.8511 4.30396 13.2818 4.7461 12.8397L13.2929 4.29291ZM13 7.41422L6.16031 14.2539C6.01293 14.4013 5.91529 14.591 5.88102 14.7966L5.21655 18.7835L9.20339 18.119C9.40898 18.0847 9.59872 17.9871 9.7461 17.8397L16.5858 11L13 7.41422ZM18 9.5858L14.4142 6.00001L14.7071 5.70712C15.6973 4.71693 17.3027 4.71693 18.2929 5.70712C19.2831 6.69731 19.2831 8.30272 18.2929 9.29291L18 9.5858Z"
-          fill="currentColor"
-        ></path>
-      </svg>
-    );
-  },
-);
+type IconProps = {
+  className?: string;
+  size?: string;
+};
+
+const EditIcon = React.forwardRef<SVGSVGElement, IconProps>((props: IconProps, ref) => {
+  const { className = 'icon-md', size = '1.2em' } = props;
+  return (
+    <svg
+      ref={ref}
+      fill="none"
+      strokeWidth="2"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 24 24"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      height={size}
+      width={size}
+      className={cn(className)}
+    >
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M13.2929 4.29291C15.0641 2.52167 17.9359 2.52167 19.7071 4.2929C21.4783 6.06414 21.4783 8.93588 19.7071 10.7071L18.7073 11.7069L11.1603 19.2539C10.7182 19.696 10.1489 19.989 9.53219 20.0918L4.1644 20.9864C3.84584 21.0395 3.52125 20.9355 3.29289 20.7071C3.06453 20.4788 2.96051 20.1542 3.0136 19.8356L3.90824 14.4678C4.01103 13.8511 4.30396 13.2818 4.7461 12.8397L13.2929 4.29291ZM13 7.41422L6.16031 14.2539C6.01293 14.4013 5.91529 14.591 5.88102 14.7966L5.21655 18.7835L9.20339 18.119C9.40898 18.0847 9.59872 17.9871 9.7461 17.8397L16.5858 11L13 7.41422ZM18 9.5858L14.4142 6.00001L14.7071 5.70712C15.6973 4.71693 17.3027 4.71693 18.2929 5.70712C19.2831 6.69731 19.2831 8.30272 18.2929 9.29291L18 9.5858Z"
+        fill="currentColor"
+      ></path>
+    </svg>
+  );
+});
 
 export default EditIcon;
diff --git a/client/src/components/svg/NewChatIcon.tsx b/client/src/components/svg/NewChatIcon.tsx
index 59bc7ac1ece..841ad1aeed0 100644
--- a/client/src/components/svg/NewChatIcon.tsx
+++ b/client/src/components/svg/NewChatIcon.tsx
@@ -8,6 +8,7 @@ export default function NewChatIcon({ className = '' }: { className?: string })
       fill="none"
       xmlns="http://www.w3.org/2000/svg"
       className={cn('text-black dark:text-white', className)}
+      aria-hidden={true}
     >
       <path
         fillRule="evenodd"
diff --git a/client/src/components/svg/Spinner.tsx b/client/src/components/svg/Spinner.tsx
index b32904224f5..99728da34b8 100644
--- a/client/src/components/svg/Spinner.tsx
+++ b/client/src/components/svg/Spinner.tsx
@@ -3,25 +3,18 @@ import { cn } from '~/utils/';
 export default function Spinner({ className = 'm-auto', size = '1em' }) {
   return (
     <svg
-      stroke="currentColor"
+      xmlns="http://www.w3.org/2000/svg"
+      width={size}
+      height={size}
+      viewBox="0 0 24 24"
       fill="none"
+      stroke="currentColor"
       strokeWidth="2"
-      viewBox="0 0 24 24"
       strokeLinecap="round"
       strokeLinejoin="round"
-      className={cn(className, 'animate-spin text-center')}
-      height={size}
-      width={size}
-      xmlns="http://www.w3.org/2000/svg"
+      className={cn('animate-spin', className)}
     >
-      <line x1="12" y1="2" x2="12" y2="6" />
-      <line x1="12" y1="18" x2="12" y2="22" />
-      <line x1="4.93" y1="4.93" x2="7.76" y2="7.76" />
-      <line x1="16.24" y1="16.24" x2="19.07" y2="19.07" />
-      <line x1="2" y1="12" x2="6" y2="12" />
-      <line x1="18" y1="12" x2="22" y2="12" />
-      <line x1="4.93" y1="19.07" x2="7.76" y2="16.24" />
-      <line x1="16.24" y1="7.76" x2="19.07" y2="4.93" />
+      <path d="M21 12a9 9 0 1 1-6.219-8.56" />
     </svg>
   );
 }
diff --git a/client/src/components/svg/index.ts b/client/src/components/svg/index.ts
index 8af68f965f2..d88a626a0d1 100644
--- a/client/src/components/svg/index.ts
+++ b/client/src/components/svg/index.ts
@@ -55,3 +55,4 @@ export { default as Sparkles } from './Sparkles';
 export { default as SpeechIcon } from './SpeechIcon';
 export { default as SaveIcon } from './SaveIcon';
 export { default as CircleHelpIcon } from './CircleHelpIcon';
+export { default as BedrockIcon } from './BedrockIcon';
diff --git a/client/src/components/ui/Button.tsx b/client/src/components/ui/Button.tsx
index a48e6502921..64989f4d1a0 100644
--- a/client/src/components/ui/Button.tsx
+++ b/client/src/components/ui/Button.tsx
@@ -1,52 +1,28 @@
 import * as React from 'react';
-import { VariantProps, cva } from 'class-variance-authority';
+import { Slot } from '@radix-ui/react-slot';
+import { cva, type VariantProps } from 'class-variance-authority';
 import { cn } from '~/utils';
 
 const buttonVariants = cva(
-  'rounded-md inline-flex items-center justify-center text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:opacity-50 disabled:pointer-events-none',
+  'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
   {
     variants: {
       variant: {
-        default:
-          'bg-gray-600 text-white hover:bg-gray-800 dark:bg-gray-200 dark:text-gray-900 dark:hover:bg-gray-300',
-        destructive: 'bg-red-600 text-white hover:bg-red-700 dark:bg-red-600 dark:hover:bg-red-700',
+        default: 'bg-primary text-primary-foreground hover:bg-primary/90',
+        destructive: 'bg-destructive text-destructive-foreground hover:bg-destructive/90',
         outline:
-          'bg-transparent border border-gray-200 text-gray-700 hover:bg-gray-200 dark:border-gray-700 dark:text-gray-100 dark:hover:bg-gray-700',
-        subtle:
-          'bg-gray-100 text-gray-900 hover:bg-gray-200 dark:bg-gray-700 dark:text-gray-100 dark:hover:bg-gray-600',
-        ghost:
-          'bg-transparent text-gray-900 hover:bg-gray-100 dark:text-gray-100 dark:hover:bg-gray-800 data-[state=open]:bg-transparent',
-        link: 'bg-transparent underline-offset-4 hover:underline text-gray-600 dark:text-gray-400 hover:bg-transparent dark:hover:bg-transparent',
-        success:
-          'bg-green-500 text-white hover:bg-green-700 dark:bg-green-500 dark:hover:bg-green-700',
-        warning:
-          'bg-yellow-500 text-white hover:bg-yellow-600 dark:bg-yellow-600 dark:hover:bg-yellow-700',
-        info: 'bg-blue-500 text-white hover:bg-blue-600 dark:bg-blue-600 dark:hover:bg-blue-700',
+          'text-text-primary border border-input bg-background hover:bg-accent hover:text-accent-foreground',
+        secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80',
+        ghost: 'hover:bg-accent hover:text-accent-foreground',
+        link: 'text-primary underline-offset-4 hover:underline',
       },
       size: {
-        default: 'h-10 py-2 px-4',
-        sm: 'h-8 px-3 rounded',
-        lg: 'h-12 px-6 rounded-md',
-        xl: 'h-14 px-8 rounded-lg text-base',
-        icon: 'h-10 w-10',
-      },
-      fullWidth: {
-        true: 'w-full',
-      },
-      loading: {
-        true: 'opacity-80 pointer-events-none',
+        default: 'h-10 px-4 py-2',
+        sm: 'h-9 rounded-md px-3',
+        lg: 'h-11 rounded-md px-8',
+        icon: 'size-10',
       },
     },
-    compoundVariants: [
-      {
-        variant: ['default', 'destructive', 'success', 'warning', 'info'],
-        className: 'focus-visible:ring-white focus-visible:ring-offset-2',
-      },
-      {
-        variant: 'outline',
-        className: 'focus-visible:ring-gray-400 dark:focus-visible:ring-gray-500',
-      },
-    ],
     defaultVariants: {
       variant: 'default',
       size: 'default',
@@ -57,62 +33,14 @@ const buttonVariants = cva(
 export interface ButtonProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
     VariantProps<typeof buttonVariants> {
-  loading?: boolean;
-  leftIcon?: React.ReactNode;
-  rightIcon?: React.ReactNode;
+  asChild?: boolean;
 }
 
-const Button = React.forwardRef<HTMLButtonElement, ButtonProps & { customId?: string }>(
-  (
-    {
-      className,
-      variant,
-      size,
-      fullWidth,
-      loading,
-      leftIcon,
-      rightIcon,
-      children,
-      customId,
-      ...props
-    },
-    ref,
-  ) => {
+const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
+  ({ className, variant, size, asChild = false, ...props }, ref) => {
+    const Comp = asChild ? Slot : 'button';
     return (
-      <button
-        className={cn(buttonVariants({ variant, size, fullWidth, loading, className }))}
-        ref={ref}
-        {...props}
-        id={customId ?? props.id ?? 'shadcn-button'}
-        disabled={props.disabled || loading}
-        aria-busy={loading}
-      >
-        {loading && (
-          <svg
-            className="-ml-1 mr-3 h-5 w-5 animate-spin text-current"
-            xmlns="http://www.w3.org/2000/svg"
-            fill="none"
-            viewBox="0 0 24 24"
-          >
-            <circle
-              className="opacity-25"
-              cx="12"
-              cy="12"
-              r="10"
-              stroke="currentColor"
-              strokeWidth="4"
-            ></circle>
-            <path
-              className="opacity-75"
-              fill="currentColor"
-              d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
-            ></path>
-          </svg>
-        )}
-        {leftIcon && <span className="mr-2">{leftIcon}</span>}
-        {children}
-        {rightIcon && <span className="ml-2">{rightIcon}</span>}
-      </button>
+      <Comp className={cn(buttonVariants({ variant, size, className }))} ref={ref} {...props} />
     );
   },
 );
diff --git a/client/src/components/ui/Dropdown.tsx b/client/src/components/ui/Dropdown.tsx
index f51763cd63a..73aef17afca 100644
--- a/client/src/components/ui/Dropdown.tsx
+++ b/client/src/components/ui/Dropdown.tsx
@@ -1,14 +1,7 @@
-import React, { FC, useState } from 'react';
-import {
-  Listbox,
-  ListboxButton,
-  ListboxOption,
-  ListboxOptions,
-  Transition,
-} from '@headlessui/react';
-import { AnchorPropsWithSelection } from '@headlessui/react/dist/internal/floating';
-import type { Option } from '~/common';
+import React, { useState } from 'react';
+import * as Select from '@ariakit/react/select';
 import { cn } from '~/utils/';
+import type { Option } from '~/common';
 
 interface DropdownProps {
   value: string;
@@ -16,112 +9,89 @@ interface DropdownProps {
   onChange: (value: string) => void;
   options: string[] | Option[];
   className?: string;
-  anchor?: AnchorPropsWithSelection;
   sizeClasses?: string;
   testId?: string;
 }
 
-const Dropdown: FC<DropdownProps> = ({
+const Dropdown: React.FC<DropdownProps> = ({
   value: initialValue,
   label = '',
   onChange,
   options,
   className = '',
-  anchor,
   sizeClasses,
   testId = 'dropdown-menu',
 }) => {
   const [selectedValue, setSelectedValue] = useState(initialValue);
 
+  const handleChange = (value: string) => {
+    setSelectedValue(value);
+    onChange(value);
+  };
+
+  const selectProps = Select.useSelectStore({
+    value: selectedValue,
+    setValue: handleChange,
+  });
+
   return (
     <div className={cn('relative', className)}>
-      <Listbox
-        value={selectedValue}
-        onChange={(newValue) => {
-          setSelectedValue(newValue);
-          onChange(newValue);
-        }}
+      <Select.Select
+        store={selectProps}
+        className={cn(
+          'focus:ring-offset-ring-offset relative inline-flex w-auto items-center justify-between rounded-lg border border-input bg-background py-2 pl-3 pr-8 text-text-primary transition-all duration-200 ease-in-out hover:bg-accent hover:text-accent-foreground focus:ring-ring-primary',
+          className,
+        )}
+        data-testid={testId}
       >
-        <div className={cn('relative', className)}>
-          <ListboxButton
-            data-testid={testId}
-            className={cn(
-              'focus:ring-offset-ring-offset relative inline-flex w-auto items-center justify-between rounded-md border-border-light bg-header-primary py-2 pl-3 pr-8 text-text-primary transition-all duration-100 ease-in-out hover:bg-header-hover focus:ring-ring-primary',
-              className,
-            )}
-            aria-label="Select an option"
-          >
-            <span className="block truncate">
-              {label}
-              {options
-                .map((o) => (typeof o === 'string' ? { value: o, label: o } : o))
-                .find((o) => o.value === selectedValue)?.label ?? selectedValue}
-            </span>
-            <span className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
-              <svg
-                xmlns="http://www.w3.org/2000/svg"
-                fill="none"
-                viewBox="0 0 24 24"
-                strokeWidth="2"
-                stroke="currentColor"
-                className="h-4 w-5 rotate-0 transform text-text-primary transition-transform duration-300 ease-in-out"
-              >
-                <polyline points="6 9 12 15 18 9"></polyline>
-              </svg>
-            </span>
-          </ListboxButton>
-          <Transition
-            leave="transition ease-in duration-50"
-            leaveFrom="opacity-100"
-            leaveTo="opacity-0"
+        <div className="flex w-full items-center justify-between">
+          <span className="block truncate">
+            {label}
+            {options
+              .map((o) => (typeof o === 'string' ? { value: o, label: o } : o))
+              .find((o) => o.value === selectedValue)?.label ?? selectedValue}
+          </span>
+          <Select.SelectArrow />
+        </div>
+      </Select.Select>
+      <Select.SelectPopover
+        store={selectProps}
+        className={cn('popover-ui', sizeClasses, className)}
+      >
+        {options.map((item, index) => (
+          <Select.SelectItem
+            key={index}
+            value={typeof item === 'string' ? item : item.value}
+            className="select-item"
+            data-theme={typeof item === 'string' ? item : (item as Option).value}
           >
-            <ListboxOptions
-              className={cn(
-                'absolute z-50 mt-1 flex flex-col items-start gap-1 overflow-auto rounded-lg border border-border-medium bg-header-primary p-1.5 shadow-lg transition-opacity',
-                sizeClasses,
-                className,
+            <div className="flex w-full items-center justify-between">
+              <span className="block truncate">
+                {typeof item === 'string' ? item : (item as Option).label}
+              </span>
+              {selectedValue === (typeof item === 'string' ? item : item.value) && (
+                <span className="ml-auto pl-2">
+                  <svg
+                    width="24"
+                    height="24"
+                    viewBox="0 0 24 24"
+                    fill="none"
+                    xmlns="http://www.w3.org/2000/svg"
+                    className="icon-md block group-hover:hidden"
+                  >
+                    <path
+                      fillRule="evenodd"
+                      clipRule="evenodd"
+                      d="M2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12ZM16.0755 7.93219C16.5272 8.25003 16.6356 8.87383 16.3178 9.32549L11.5678 16.0755C11.3931 16.3237 11.1152 16.4792 10.8123 16.4981C10.5093 16.517 10.2142 16.3973 10.0101 16.1727L7.51006 13.4227C7.13855 13.014 7.16867 12.3816 7.57733 12.0101C7.98598 11.6386 8.61843 11.6687 8.98994 12.0773L10.6504 13.9039L14.6822 8.17451C15 7.72284 15.6238 7.61436 16.0755 7.93219Z"
+                      fill="currentColor"
+                    />
+                  </svg>
+                </span>
               )}
-              anchor={anchor}
-              aria-label="List of options"
-            >
-              {options.map((item, index) => (
-                <ListboxOption
-                  key={index}
-                  value={typeof item === 'string' ? item : item.value}
-                  className="focus-visible:ring-offset ring-offset-ring-offset relative cursor-pointer select-none rounded border-border-light bg-header-primary py-2.5 pl-3 pr-3 text-sm text-text-secondary ring-ring-primary hover:bg-header-hover focus-visible:ring"
-                  style={{ width: '100%' }}
-                  data-theme={typeof item === 'string' ? item : (item as Option).value}
-                >
-                  <div className="flex w-full items-center justify-between">
-                    <span className="block truncate">
-                      {typeof item === 'string' ? item : (item as Option).label}
-                    </span>
-                    {selectedValue === (typeof item === 'string' ? item : item.value) && (
-                      <span className="ml-auto pl-2">
-                        <svg
-                          width="24"
-                          height="24"
-                          viewBox="0 0 24 24"
-                          fill="none"
-                          xmlns="http://www.w3.org/2000/svg"
-                          className="icon-md block group-hover:hidden"
-                        >
-                          <path
-                            fillRule="evenodd"
-                            clipRule="evenodd"
-                            d="M2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12ZM16.0755 7.93219C16.5272 8.25003 16.6356 8.87383 16.3178 9.32549L11.5678 16.0755C11.3931 16.3237 11.1152 16.4792 10.8123 16.4981C10.5093 16.517 10.2142 16.3973 10.0101 16.1727L7.51006 13.4227C7.13855 13.014 7.16867 12.3816 7.57733 12.0101C7.98598 11.6386 8.61843 11.6687 8.98994 12.0773L10.6504 13.9039L14.6822 8.17451C15 7.72284 15.6238 7.61436 16.0755 7.93219Z"
-                            fill="currentColor"
-                          />
-                        </svg>
-                      </span>
-                    )}
-                  </div>
-                </ListboxOption>
-              ))}
-            </ListboxOptions>
-          </Transition>
-        </div>
-      </Listbox>
+            </div>
+          </Select.SelectItem>
+        ))}
+      </Select.SelectPopover>
     </div>
   );
 };
diff --git a/client/src/components/ui/DropdownMenu.tsx b/client/src/components/ui/DropdownMenu.tsx
index a06f0794000..b317806826e 100644
--- a/client/src/components/ui/DropdownMenu.tsx
+++ b/client/src/components/ui/DropdownMenu.tsx
@@ -156,7 +156,7 @@ const DropdownMenuSeparator = React.forwardRef<
 >(({ className = '', ...props }, ref) => (
   <DropdownMenuPrimitive.Separator
     ref={ref}
-    className={cn('-mx-1 my-1 h-px bg-gray-100 dark:bg-gray-900', className)}
+    className={cn('-mx-1 my-1 h-px bg-border-medium', className)}
     {...props}
   />
 ));
diff --git a/client/src/components/ui/DropdownNoState.tsx b/client/src/components/ui/DropdownNoState.tsx
index 2d6b7a22f6f..03ef5f07700 100644
--- a/client/src/components/ui/DropdownNoState.tsx
+++ b/client/src/components/ui/DropdownNoState.tsx
@@ -21,6 +21,10 @@ interface DropdownProps {
   testId?: string;
 }
 
+/*
+ * Mainly used for the Speech Voice Selection Dropdown
+ */
+
 const Dropdown: FC<DropdownProps> = ({
   value,
   label = '',
diff --git a/client/src/components/ui/Input.tsx b/client/src/components/ui/Input.tsx
index 20b2f59dd56..042f6a56909 100644
--- a/client/src/components/ui/Input.tsx
+++ b/client/src/components/ui/Input.tsx
@@ -8,7 +8,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(({ className, ...pr
   return (
     <input
       className={cn(
-        'dark:border-gray-00 flex h-10 w-full rounded-md border border-gray-300 bg-transparent px-3 py-2 text-sm placeholder:text-gray-400 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 dark:text-gray-50',
+        'flex h-10 w-full rounded-md border border-border-light bg-transparent px-3 py-2 text-sm placeholder:text-text-tertiary focus:outline-none disabled:cursor-not-allowed disabled:opacity-50 dark:text-gray-50',
         className ?? '',
       )}
       ref={ref}
diff --git a/client/src/components/ui/MultiSearch.tsx b/client/src/components/ui/MultiSearch.tsx
index c3b3c563b22..18564493405 100644
--- a/client/src/components/ui/MultiSearch.tsx
+++ b/client/src/components/ui/MultiSearch.tsx
@@ -19,29 +19,29 @@ export default function MultiSearch({
   const localize = useLocalize();
   const onChangeHandler: React.ChangeEventHandler<HTMLInputElement> = useCallback(
     (e) => onChange(e.target.value),
-    [],
+    [onChange],
   );
 
   return (
     <div
       className={cn(
-        'group sticky left-0 top-0 z-10 flex h-12 items-center gap-2 bg-gradient-to-b from-white from-65% to-transparent px-2 px-3 py-2 text-black transition-colors duration-300 focus:bg-gradient-to-b focus:from-white focus:to-white/50 dark:from-gray-700 dark:to-transparent dark:text-white dark:focus:from-white/10 dark:focus:to-white/20',
+        'group sticky left-0 top-0 z-10 flex h-12 items-center gap-2 bg-gradient-to-b from-white from-65% to-transparent px-3 py-2 text-black transition-colors duration-300 focus:bg-gradient-to-b focus:from-white focus:to-white/50 dark:from-gray-700 dark:to-transparent dark:text-white dark:focus:from-white/10 dark:focus:to-white/20',
         className,
       )}
     >
       <Search className="h-4 w-4 text-gray-500 transition-colors duration-300 dark:group-focus-within:text-gray-300 dark:group-hover:text-gray-300" />
       <input
         type="text"
-        value={value || ''}
+        value={value ?? ''}
         onChange={onChangeHandler}
-        placeholder={placeholder || localize('com_ui_select_search_model')}
+        placeholder={placeholder ?? localize('com_ui_select_search_model')}
         className="flex-1 rounded-md border-none bg-transparent px-2.5 py-2 text-sm focus:outline-none focus:ring-1 focus:ring-gray-700/10 dark:focus:ring-gray-200/10"
       />
       <div className="relative flex h-5 w-5 items-center justify-end text-gray-500">
         <X
           className={cn(
             'text-gray-500 dark:text-gray-300',
-            value?.length ? 'cursor-pointer opacity-100' : 'opacity-0',
+            value?.length ?? 0 ? 'cursor-pointer opacity-100' : 'opacity-0',
           )}
           onClick={() => onChange('')}
         />
@@ -104,20 +104,24 @@ export function useMultiSearch<OptionsType extends unknown[]>({
 
   // Iterate said options
   const filteredOptions = useMemo(() => {
-    if (!shouldShowSearch || !filterValue || !availableOptions.length) {
+    const currentFilter = filterValue ?? '';
+    if (!shouldShowSearch || !currentFilter || !availableOptions.length) {
       // Don't render if available options aren't present, there's no filter active
       return availableOptions;
     }
     // Filter through the values, using a simple text-based search
     // nothing too fancy, but we can add a better search algo later if we need
-    const upperFilterValue = filterValue.toUpperCase();
+    const upperFilterValue = currentFilter.toUpperCase();
 
     return availableOptions.filter((value) =>
       getTextKeyHelper(value).includes(upperFilterValue),
     ) as OptionsType;
   }, [availableOptions, getTextKeyHelper, filterValue, shouldShowSearch]);
 
-  const onSearchChange = useCallback((nextFilterValue) => setFilterValue(nextFilterValue), []);
+  const onSearchChange = useCallback(
+    (nextFilterValue: string) => setFilterValue(nextFilterValue),
+    [],
+  );
 
   const searchRender = shouldShowSearch ? (
     <MultiSearch
diff --git a/client/src/components/ui/OGDialogTemplate.tsx b/client/src/components/ui/OGDialogTemplate.tsx
index 10bd8e112a7..c700da0f443 100644
--- a/client/src/components/ui/OGDialogTemplate.tsx
+++ b/client/src/components/ui/OGDialogTemplate.tsx
@@ -24,6 +24,7 @@ type DialogTemplateProps = {
   leftButtons?: ReactNode;
   selection?: SelectionProps;
   className?: string;
+  overlayClassName?: string;
   headerClassName?: string;
   mainClassName?: string;
   footerClassName?: string;
@@ -40,11 +41,12 @@ const OGDialogTemplate = forwardRef((props: DialogTemplateProps, ref: Ref<HTMLDi
     selection,
     className,
     leftButtons,
-    description,
+    description = '',
     mainClassName,
     headerClassName,
     footerClassName,
     showCloseButton,
+    overlayClassName,
     showCancelButton = true,
   } = props;
   const { selectHandler, selectClasses, selectText } = selection || {};
@@ -54,33 +56,31 @@ const OGDialogTemplate = forwardRef((props: DialogTemplateProps, ref: Ref<HTMLDi
     'bg-gray-800 text-white transition-colors hover:bg-gray-700 disabled:cursor-not-allowed disabled:opacity-50 dark:bg-gray-200 dark:text-gray-800 dark:hover:bg-gray-200';
   return (
     <OGDialogContent
+      overlayClassName={overlayClassName}
       showCloseButton={showCloseButton}
       ref={ref}
-      className={cn(
-        'bg-white dark:border-gray-700 dark:bg-gray-850 dark:text-gray-300',
-        className || '',
-      )}
+      className={cn('border-none bg-background text-foreground', className ?? '')}
       onClick={(e) => e.stopPropagation()}
     >
       <OGDialogHeader className={cn(headerClassName ?? '')}>
         <OGDialogTitle>{title}</OGDialogTitle>
         {description && <OGDialogDescription className="">{description}</OGDialogDescription>}
       </OGDialogHeader>
-      <div className={cn('px-0', mainClassName)}>{main ? main : null}</div>
+      <div className={cn('px-0', mainClassName)}>{main != null ? main : null}</div>
       <OGDialogFooter className={footerClassName}>
-        <div>{leftButtons ? leftButtons : null}</div>
+        <div>{leftButtons != null ? leftButtons : null}</div>
         <div className="flex h-auto gap-3">
           {showCancelButton && (
-            <OGDialogClose className="btn btn-neutral border-token-border-light relative rounded-lg text-sm">
+            <OGDialogClose className="btn btn-neutral border-token-border-light relative rounded-lg text-sm ring-offset-2 focus:ring-2 focus:ring-black dark:ring-offset-0">
               {Cancel}
             </OGDialogClose>
           )}
-          {buttons ? buttons : null}
+          {buttons != null ? buttons : null}
           {selection ? (
             <OGDialogClose
               onClick={selectHandler}
               className={`${
-                selectClasses || defaultSelect
+                selectClasses ?? defaultSelect
               } inline-flex h-10 items-center justify-center rounded-lg border-none px-4 py-2 text-sm`}
             >
               {selectText}
diff --git a/client/src/components/ui/OriginalDialog.tsx b/client/src/components/ui/OriginalDialog.tsx
index 5da47af7b6f..f68746b9ff3 100644
--- a/client/src/components/ui/OriginalDialog.tsx
+++ b/client/src/components/ui/OriginalDialog.tsx
@@ -18,7 +18,7 @@ const DialogOverlay = React.forwardRef<
   <DialogPrimitive.Overlay
     ref={ref}
     className={cn(
-      'fixed inset-0 z-50 bg-black/80  data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
+      'fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
       className,
     )}
     {...props}
@@ -29,25 +29,26 @@ DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
 type DialogContentProps = React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & {
   showCloseButton?: boolean;
   disableScroll?: boolean;
+  overlayClassName?: string;
 };
 
 const DialogContent = React.forwardRef<
   React.ElementRef<typeof DialogPrimitive.Content>,
   DialogContentProps
->(({ className, showCloseButton = true, children, ...props }, ref) => (
+>(({ className, overlayClassName, showCloseButton = true, children, ...props }, ref) => (
   <DialogPortal>
-    <DialogOverlay />
+    <DialogOverlay className={overlayClassName} />
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
-        'bg-background fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
+        'max-w-11/12 fixed left-[50%] top-[50%] z-50 grid w-full translate-x-[-50%] translate-y-[-50%] gap-4 bg-background p-6 text-text-primary shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
         className,
       )}
       {...props}
     >
       {children}
       {showCloseButton && (
-        <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none">
+        <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-ring-primary ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
           <X className="h-4 w-4" />
           <span className="sr-only">Close</span>
         </DialogPrimitive.Close>
@@ -88,7 +89,7 @@ const DialogDescription = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Description
     ref={ref}
-    className={cn('text-muted-foreground text-sm', className)}
+    className={cn('text-sm text-muted-foreground', className)}
     {...props}
   />
 ));
diff --git a/client/src/components/ui/Pagination.tsx b/client/src/components/ui/Pagination.tsx
new file mode 100644
index 00000000000..84779ee4878
--- /dev/null
+++ b/client/src/components/ui/Pagination.tsx
@@ -0,0 +1,105 @@
+import * as React from 'react';
+import { ChevronLeft, ChevronRight, MoreHorizontal } from 'lucide-react';
+import { ButtonProps, buttonVariants } from './Button';
+import { cn } from '~/utils';
+
+const Pagination = ({ className, ...props }: React.ComponentProps<'nav'>) => (
+  <nav
+    role="navigation"
+    aria-label="pagination"
+    className={cn('mx-auto flex w-full justify-center', className)}
+    {...props}
+  />
+);
+Pagination.displayName = 'Pagination';
+
+const PaginationContent = React.forwardRef<HTMLUListElement, React.ComponentProps<'ul'>>(
+  ({ className, ...props }, ref) => (
+    <ul ref={ref} className={cn('flex flex-row items-center gap-1', className)} {...props} />
+  ),
+);
+PaginationContent.displayName = 'PaginationContent';
+
+const PaginationItem = React.forwardRef<HTMLLIElement, React.ComponentProps<'li'>>(
+  ({ className, ...props }, ref) => <li ref={ref} className={cn('', className)} {...props} />,
+);
+PaginationItem.displayName = 'PaginationItem';
+
+type PaginationLinkProps = {
+  isActive?: boolean;
+} & Pick<ButtonProps, 'size'> &
+  React.ComponentProps<'a'>;
+
+const PaginationLink = ({
+  className,
+  isActive = false,
+  size = 'icon',
+  children,
+  ...props
+}: PaginationLinkProps) => (
+  <a
+    aria-current={isActive ? 'page' : undefined}
+    className={cn(
+      buttonVariants({
+        variant: isActive ? 'outline' : 'ghost',
+        size,
+      }),
+      className,
+    )}
+    {...props}
+  >
+    {children || <span className="sr-only">Page link</span>}
+  </a>
+);
+PaginationLink.displayName = 'PaginationLink';
+
+const PaginationPrevious = ({
+  className,
+  ...props
+}: React.ComponentProps<typeof PaginationLink>) => (
+  <PaginationLink
+    aria-label="Go to previous page"
+    size="default"
+    className={cn('gap-1 pl-2.5', className)}
+    {...props}
+  >
+    <ChevronLeft className="h-4 w-4" />
+    <span>Previous</span>
+  </PaginationLink>
+);
+PaginationPrevious.displayName = 'PaginationPrevious';
+
+const PaginationNext = ({ className, ...props }: React.ComponentProps<typeof PaginationLink>) => (
+  <PaginationLink
+    aria-label="Go to next page"
+    size="default"
+    className={cn('gap-1 pr-2.5', className)}
+    {...props}
+  >
+    <span>Next</span>
+    <ChevronRight className="h-4 w-4" />
+  </PaginationLink>
+);
+PaginationNext.displayName = 'PaginationNext';
+
+const PaginationEllipsis = ({ className, ...props }: React.ComponentProps<'span'>) => (
+  <span
+    aria-hidden
+    className={cn('flex h-9 w-9 items-center justify-center', className)}
+    {...props}
+  >
+    <MoreHorizontal className="h-4 w-4" />
+    <span className="sr-only">More pages</span>
+  </span>
+);
+PaginationEllipsis.displayName = 'PaginationEllipsis';
+
+export {
+  Pagination,
+  PaginationContent,
+  PaginationEllipsis,
+  PaginationItem,
+  PaginationLink,
+  PaginationNext,
+  PaginationPrevious,
+};
diff --git a/client/src/components/ui/SelectDropDown.tsx b/client/src/components/ui/SelectDropDown.tsx
index 80478c29aad..26ed808b28e 100644
--- a/client/src/components/ui/SelectDropDown.tsx
+++ b/client/src/components/ui/SelectDropDown.tsx
@@ -25,6 +25,7 @@ type SelectDropDownProps = {
   showAbove?: boolean;
   showLabel?: boolean;
   iconSide?: 'left' | 'right';
+  optionIconSide?: 'left' | 'right';
   renderOption?: () => React.ReactNode;
   containerClassName?: string;
   currentValueClass?: string;
@@ -38,17 +39,30 @@ type SelectDropDownProps = {
   showOptionIcon?: boolean;
 };
 
+function getOptionText(option: string | Option | OptionWithIcon): string {
+  if (typeof option === 'string') {
+    return option;
+  }
+  if ('label' in option) {
+    return option.label ?? '';
+  }
+  if ('value' in option) {
+    return (option.value ?? '') + '';
+  }
+  return '';
+}
+
 function SelectDropDown({
   title: _title,
   value,
   disabled,
   setValue,
-  tabIndex,
   availableValues,
   showAbove = false,
   showLabel = true,
   emptyTitle = false,
   iconSide = 'right',
+  optionIconSide = 'left',
   placeholder,
   containerClassName,
   optionsListClass,
@@ -59,7 +73,7 @@ function SelectDropDown({
   renderOption,
   searchClassName,
   searchPlaceholder,
-  showOptionIcon,
+  showOptionIcon = false,
 }: SelectDropDownProps) {
   const localize = useLocalize();
   const transitionProps = { className: 'top-full mt-3' };
@@ -71,7 +85,7 @@ function SelectDropDown({
 
   if (emptyTitle) {
     title = '';
-  } else if (!title) {
+  } else if (!(title ?? '')) {
     title = localize('com_ui_model');
   }
 
@@ -81,12 +95,15 @@ function SelectDropDown({
   const [filteredValues, searchRender] = useMultiSearch<string[] | Option[]>({
     availableOptions: availableValues,
     placeholder: searchPlaceholder,
-    getTextKeyOverride: (option) => ((option as Option)?.label || '').toUpperCase(),
+    getTextKeyOverride: (option) => getOptionText(option).toUpperCase(),
     className: searchClassName,
+    disabled,
   });
-  const hasSearchRender = Boolean(searchRender);
+  const hasSearchRender = searchRender != null;
   const options = hasSearchRender ? filteredValues : availableValues;
 
+  const renderIcon = showOptionIcon && value != null && (value as OptionWithIcon).icon != null;
+
   return (
     <div className={cn('flex items-center justify-center gap-2 ', containerClassName ?? '')}>
       <div className={cn('relative w-full', subContainerClassName ?? '')}>
@@ -121,20 +138,27 @@ function SelectDropDown({
                     {!showLabel && !emptyTitle && (
                       <span className="text-xs text-gray-700 dark:text-gray-500">{title}:</span>
                     )}
-                    {showOptionIcon && value && (value as OptionWithIcon)?.icon && (
+                    {renderIcon && optionIconSide !== 'right' && (
                       <span className="icon-md flex items-center">
                         {(value as OptionWithIcon).icon}
                       </span>
                     )}
-                    {value ? (
-                      typeof value !== 'string' ? (
-                        value?.label ?? ''
-                      ) : (
-                        value
-                      )
-                    ) : (
-                      <span className="text-gray-500 dark:text-gray-400">{placeholder}</span>
+                    {renderIcon && (
+                      <span className="icon-md absolute right-0 mr-8 flex items-center">
+                        {(value as OptionWithIcon).icon}
+                      </span>
                     )}
+                    {(() => {
+                      if (!value) {
+                        return <span className="text-text-secondary">{placeholder}</span>;
+                      }
+
+                      if (typeof value !== 'string') {
+                        return value.label ?? '';
+                      }
+
+                      return value;
+                    })()}
                   </span>
                 </span>
                 <span className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
@@ -188,10 +212,10 @@ function SelectDropDown({
                     }
 
                     const currentLabel =
-                      typeof option === 'string' ? option : option?.label ?? option?.value ?? '';
-                    const currentValue = typeof option === 'string' ? option : option?.value ?? '';
+                      typeof option === 'string' ? option : option.label ?? option.value ?? '';
+                    const currentValue = typeof option === 'string' ? option : option.value ?? '';
                     const currentIcon =
-                      typeof option === 'string' ? null : (option?.icon as React.ReactNode) ?? null;
+                      typeof option === 'string' ? null : (option.icon as React.ReactNode) ?? null;
                     let activeValue: string | number | null | Option = value;
                     if (typeof activeValue !== 'string') {
                       activeValue = activeValue?.value ?? '';
@@ -204,7 +228,7 @@ function SelectDropDown({
                         className={({ active }) =>
                           cn(
                             'group relative flex h-[42px] cursor-pointer select-none items-center overflow-hidden pl-3 pr-9 text-gray-800 hover:bg-gray-20 dark:text-white dark:hover:bg-gray-600',
-                            active ? 'bg-surface-tertiary' : '',
+                            active ? 'bg-surface-active text-text-primary' : '',
                             optionsClass ?? '',
                           )
                         }
@@ -217,7 +241,16 @@ function SelectDropDown({
                               iconSide === 'left' ? 'ml-4' : '',
                             )}
                           >
-                            {currentIcon && <span className="mr-1">{currentIcon}</span>}
+                            {currentIcon != null && (
+                              <span
+                                className={cn(
+                                  'mr-1',
+                                  optionIconSide === 'right' ? 'absolute right-0 pr-2' : '',
+                                )}
+                              >
+                                {currentIcon}
+                              </span>
+                            )}
                             {currentLabel}
                           </span>
                           {currentValue === activeValue && (
diff --git a/client/src/components/ui/SelectDropDownPop.tsx b/client/src/components/ui/SelectDropDownPop.tsx
index cc79bcc4f7c..bf34fe756ba 100644
--- a/client/src/components/ui/SelectDropDownPop.tsx
+++ b/client/src/components/ui/SelectDropDownPop.tsx
@@ -60,7 +60,7 @@ function SelectDropDownPop({
             <button
               data-testid="select-dropdown-button"
               className={cn(
-                'pointer-cursor relative flex flex-col rounded-md border border-black/10 bg-white py-2 pl-3 pr-10 text-left focus:ring-0 focus:ring-offset-0 dark:border-gray-700 dark:bg-gray-800 sm:text-sm',
+                'pointer-cursor relative flex flex-col rounded-lg border border-black/10 bg-white py-2 pl-3 pr-10 text-left focus:ring-0 focus:ring-offset-0 dark:border-gray-700 dark:bg-gray-800 sm:text-sm',
                 'hover:bg-gray-50 radix-state-open:bg-gray-50 dark:hover:bg-gray-700 dark:radix-state-open:bg-gray-700',
               )}
               aria-label={`Select ${title}`}
diff --git a/client/src/components/ui/Separator.tsx b/client/src/components/ui/Separator.tsx
index 32f9633c797..f95d48a793f 100644
--- a/client/src/components/ui/Separator.tsx
+++ b/client/src/components/ui/Separator.tsx
@@ -12,7 +12,7 @@ const Separator = React.forwardRef<
     decorative={decorative}
     orientation={orientation}
     className={cn(
-      'bg-border shrink-0',
+      'shrink-0 bg-border-light',
       orientation === 'horizontal' ? 'h-[1px] w-full' : 'h-full w-[1px]',
       className,
     )}
diff --git a/client/src/components/ui/Slider.tsx b/client/src/components/ui/Slider.tsx
index c944a93a71d..36b3831c59e 100644
--- a/client/src/components/ui/Slider.tsx
+++ b/client/src/components/ui/Slider.tsx
@@ -1,35 +1,22 @@
 import * as React from 'react';
 import * as SliderPrimitive from '@radix-ui/react-slider';
-import { useDoubleClick } from '@zattoo/use-double-click';
-import type { clickEvent } from '@zattoo/use-double-click';
-import { cn } from '../../utils';
+import { cn } from '~/utils';
 
-interface SliderProps extends React.ComponentPropsWithoutRef<typeof SliderPrimitive.Root> {
-  doubleClickHandler?: clickEvent;
-}
-
-const Slider = React.forwardRef<React.ElementRef<typeof SliderPrimitive.Root>, SliderProps>(
-  ({ className, doubleClickHandler, ...props }, ref) => (
-    <SliderPrimitive.Root
-      ref={ref}
-      className={cn('relative flex w-full touch-none select-none items-center', className ?? '')}
-      {...props}
-    >
-      <SliderPrimitive.Track className="relative h-1 w-full grow overflow-hidden rounded-full bg-gray-200 dark:bg-gray-850">
-        <SliderPrimitive.Range className="absolute h-full bg-gray-850  dark:bg-white" />
-      </SliderPrimitive.Track>
-      <SliderPrimitive.Thumb
-        onClick={
-          useDoubleClick(doubleClickHandler as clickEvent) ??
-          (() => {
-            return;
-          })
-        }
-        className="block h-4 w-4 cursor-pointer rounded-full border border-border-medium-alt bg-white shadow ring-ring-primary transition-colors focus-visible:ring-1 focus-visible:ring-offset-1 disabled:pointer-events-none disabled:opacity-50 dark:border-none"
-      />
-    </SliderPrimitive.Root>
-  ),
-);
+const Slider = React.forwardRef<
+  React.ElementRef<typeof SliderPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof SliderPrimitive.Root>
+>(({ className, ...props }, ref) => (
+  <SliderPrimitive.Root
+    ref={ref}
+    className={cn('relative flex w-full touch-none select-none items-center', className)}
+    {...props}
+  >
+    <SliderPrimitive.Track className="relative h-2 w-full grow overflow-hidden rounded-full bg-secondary">
+      <SliderPrimitive.Range className="absolute h-full bg-primary" />
+    </SliderPrimitive.Track>
+    <SliderPrimitive.Thumb className="block h-5 w-5 rounded-full border-2 border-primary bg-background ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50" />
+  </SliderPrimitive.Root>
+));
 Slider.displayName = SliderPrimitive.Root.displayName;
 
 export { Slider };
diff --git a/client/src/components/ui/Switch.tsx b/client/src/components/ui/Switch.tsx
index 9c2e821efca..f24e7edd51e 100644
--- a/client/src/components/ui/Switch.tsx
+++ b/client/src/components/ui/Switch.tsx
@@ -1,15 +1,14 @@
 import * as React from 'react';
 import * as SwitchPrimitives from '@radix-ui/react-switch';
-
-import { cn } from '../../utils';
+import { cn } from '~/utils';
 
 const Switch = React.forwardRef<
   React.ElementRef<typeof SwitchPrimitives.Root>,
   React.ComponentPropsWithoutRef<typeof SwitchPrimitives.Root>
->(({ className = '', ...props }, ref) => (
+>(({ className, ...props }, ref) => (
   <SwitchPrimitives.Root
     className={cn(
-      'focus-visible:ring-ring focus-visible:ring-offset-background peer inline-flex h-[20px] w-[32px] shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-black data-[state=unchecked]:bg-gray-200 dark:data-[state=checked]:bg-sky-500 dark:data-[state=unchecked]:bg-gray-500',
+      'peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input',
       className,
     )}
     {...props}
@@ -17,7 +16,7 @@ const Switch = React.forwardRef<
   >
     <SwitchPrimitives.Thumb
       className={cn(
-        'pointer-events-none block h-4 w-4 -translate-x-0.5 rounded-full bg-white transition-transform data-[state=checked]:translate-x-3 data-[state=unchecked]:translate-x-0',
+        'pointer-events-none block h-5 w-5 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=unchecked]:translate-x-0',
       )}
     />
   </SwitchPrimitives.Root>
diff --git a/client/src/components/ui/Table.tsx b/client/src/components/ui/Table.tsx
index cc6a5ee5979..cf7a23389f1 100644
--- a/client/src/components/ui/Table.tsx
+++ b/client/src/components/ui/Table.tsx
@@ -1,10 +1,11 @@
 import * as React from 'react';
-
-import { cn } from '../../utils';
+import { cn } from '~/utils';
 
 const Table = React.forwardRef<HTMLTableElement, React.HTMLAttributes<HTMLTableElement>>(
-  ({ className = '', ...props }, ref) => (
-    <table ref={ref} className={cn('w-full caption-bottom text-sm', className)} {...props} />
+  ({ className, ...props }, ref) => (
+    <div className="relative w-full overflow-auto">
+      <table ref={ref} className={cn('w-full caption-bottom text-sm', className)} {...props} />
+    </div>
   ),
 );
 Table.displayName = 'Table';
@@ -12,7 +13,7 @@ Table.displayName = 'Table';
 const TableHeader = React.forwardRef<
   HTMLTableSectionElement,
   React.HTMLAttributes<HTMLTableSectionElement>
->(({ className = '', ...props }, ref) => (
+>(({ className, ...props }, ref) => (
   <thead ref={ref} className={cn('[&_tr]:border-b', className)} {...props} />
 ));
 TableHeader.displayName = 'TableHeader';
@@ -20,7 +21,7 @@ TableHeader.displayName = 'TableHeader';
 const TableBody = React.forwardRef<
   HTMLTableSectionElement,
   React.HTMLAttributes<HTMLTableSectionElement>
->(({ className = '', ...props }, ref) => (
+>(({ className, ...props }, ref) => (
   <tbody ref={ref} className={cn('[&_tr:last-child]:border-0', className)} {...props} />
 ));
 TableBody.displayName = 'TableBody';
@@ -28,21 +29,21 @@ TableBody.displayName = 'TableBody';
 const TableFooter = React.forwardRef<
   HTMLTableSectionElement,
   React.HTMLAttributes<HTMLTableSectionElement>
->(({ className = '', ...props }, ref) => (
+>(({ className, ...props }, ref) => (
   <tfoot
     ref={ref}
-    className={cn('bg-primary text-primary-foreground font-medium', className)}
+    className={cn('bg-muted/50 border-t font-medium [&>tr]:last:border-b-0', className)}
     {...props}
   />
 ));
 TableFooter.displayName = 'TableFooter';
 
 const TableRow = React.forwardRef<HTMLTableRowElement, React.HTMLAttributes<HTMLTableRowElement>>(
-  ({ className = '', ...props }, ref) => (
+  ({ className, ...props }, ref) => (
     <tr
       ref={ref}
       className={cn(
-        'hover:bg-muted/50 data-[state=selected]:bg-muted border-b transition-colors',
+        'hover:bg-muted/50 data-[state=selected]:bg-muted border-b border-border-light transition-colors',
         className,
       )}
       {...props}
@@ -54,7 +55,7 @@ TableRow.displayName = 'TableRow';
 const TableHead = React.forwardRef<
   HTMLTableCellElement,
   React.ThHTMLAttributes<HTMLTableCellElement>
->(({ className = '', ...props }, ref) => (
+>(({ className, ...props }, ref) => (
   <th
     ref={ref}
     className={cn(
@@ -69,10 +70,10 @@ TableHead.displayName = 'TableHead';
 const TableCell = React.forwardRef<
   HTMLTableCellElement,
   React.TdHTMLAttributes<HTMLTableCellElement>
->(({ className = '', ...props }, ref) => (
+>(({ className, ...props }, ref) => (
   <td
     ref={ref}
-    className={cn('align-middle [&:has([role=checkbox])]:pr-0', className)}
+    className={cn('p-4 align-middle [&:has([role=checkbox])]:pr-0', className)}
     {...props}
   />
 ));
@@ -81,7 +82,7 @@ TableCell.displayName = 'TableCell';
 const TableCaption = React.forwardRef<
   HTMLTableCaptionElement,
   React.HTMLAttributes<HTMLTableCaptionElement>
->(({ className = '', ...props }, ref) => (
+>(({ className, ...props }, ref) => (
   <caption ref={ref} className={cn('text-muted-foreground mt-4 text-sm', className)} {...props} />
 ));
 TableCaption.displayName = 'TableCaption';
diff --git a/client/src/components/ui/Tabs.tsx b/client/src/components/ui/Tabs.tsx
index 16a7edbbf50..b4bc2a901c4 100644
--- a/client/src/components/ui/Tabs.tsx
+++ b/client/src/components/ui/Tabs.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react';
 import * as TabsPrimitive from '@radix-ui/react-tabs';
-
-import { cn } from '../../utils';
+import { cn } from '~/utils';
 
 const Tabs = TabsPrimitive.Root;
 
@@ -12,7 +11,7 @@ const TabsList = React.forwardRef<
   <TabsPrimitive.List
     ref={ref}
     className={cn(
-      'inline-flex items-center justify-center rounded-md bg-gray-200 p-1 dark:bg-gray-800',
+      'inline-flex items-center justify-center rounded-md bg-surface-primary',
       className,
     )}
     {...props}
@@ -26,7 +25,7 @@ const TabsTrigger = React.forwardRef<
 >(({ className = '', ...props }, ref) => (
   <TabsPrimitive.Trigger
     className={cn(
-      'inline-flex min-w-[100px] items-center justify-center rounded-[0.185rem] px-3 py-1.5  text-sm font-medium text-gray-700 transition-all  disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-white data-[state=active]:text-gray-800 data-[state=active]:shadow-sm dark:text-gray-200 dark:data-[state=active]:bg-gray-700 dark:data-[state=active]:text-gray-200',
+      'inline-flex min-w-[100px] items-center justify-center rounded-[0.185rem] px-3 py-1.5 text-sm font-medium text-gray-700 transition-all disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-white data-[state=active]:text-gray-800 data-[state=active]:shadow-sm dark:data-[state=active]:bg-gray-700 dark:data-[state=active]:text-gray-200',
       className,
     )}
     {...props}
@@ -39,11 +38,7 @@ const TabsContent = React.forwardRef<
   React.ElementRef<typeof TabsPrimitive.Content>,
   React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
 >(({ className = '', ...props }, ref) => (
-  <TabsPrimitive.Content
-    className={cn('mt-2 rounded-md border border-gray-200 p-6 dark:border-gray-700', className)}
-    {...props}
-    ref={ref}
-  />
+  <TabsPrimitive.Content className={cn('mt-2 rounded-md p-6', className)} {...props} ref={ref} />
 ));
 TabsContent.displayName = TabsPrimitive.Content.displayName;
 
diff --git a/client/src/components/ui/TermsAndConditionsModal.tsx b/client/src/components/ui/TermsAndConditionsModal.tsx
index c9bc791261d..ec0d5c534ea 100644
--- a/client/src/components/ui/TermsAndConditionsModal.tsx
+++ b/client/src/components/ui/TermsAndConditionsModal.tsx
@@ -1,10 +1,9 @@
-import { useLocalize } from '~/hooks';
-import { OGDialog } from '~/components/ui';
+import MarkdownLite from '~/components/Chat/Messages/Content/MarkdownLite';
 import DialogTemplate from '~/components/ui/DialogTemplate';
-import { useAuthContext } from '~/hooks';
-import Markdown from '~/components/Chat/Messages/Content/Markdown';
-import { useToastContext } from '~/Providers';
 import { useAcceptTermsMutation } from '~/data-provider';
+import { useToastContext } from '~/Providers';
+import { OGDialog } from '~/components/ui';
+import { useLocalize } from '~/hooks';
 
 const TermsAndConditionsModal = ({
   open,
@@ -58,27 +57,33 @@ const TermsAndConditionsModal = ({
         showCloseButton={false}
         showCancelButton={false}
         main={
-          <div className="max-h-[60vh] overflow-y-auto p-4">
-            <div className="prose dark:prose-invert w-full max-w-none !text-black dark:!text-white">
-              {modalContent ? (
-                <Markdown content={modalContent} isLatestMessage={false} />
+          <section
+            // Motivation: This is a dialog, so its content should be focusable
+            // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
+            tabIndex={0}
+            className="max-h-[60vh] overflow-y-auto p-4"
+            aria-label={localize('com_ui_terms_and_conditions')}
+          >
+            <div className="prose dark:prose-invert w-full max-w-none !text-text-primary">
+              {modalContent != null && modalContent ? (
+                <MarkdownLite content={modalContent} />
               ) : (
                 <p>{localize('com_ui_no_terms_content')}</p>
               )}
             </div>
-          </div>
+          </section>
         }
         buttons={
           <>
             <button
               onClick={handleDecline}
-              className="border-border-none bg-surface-500 dark:hover:bg-surface-600 inline-flex h-10 items-center justify-center rounded-lg px-4 py-2 text-sm text-white hover:bg-gray-600"
+              className="inline-flex h-10 items-center justify-center rounded-lg border border-border-heavy bg-surface-secondary px-4 py-2 text-sm text-text-primary hover:bg-surface-active"
             >
               {localize('com_ui_decline')}
             </button>
             <button
               onClick={handleAccept}
-              className="border-border-none bg-surface-500 inline-flex h-10 items-center justify-center rounded-lg px-4 py-2 text-sm text-white hover:bg-green-600 dark:hover:bg-green-600"
+              className="inline-flex h-10 items-center justify-center rounded-lg border border-border-heavy bg-surface-secondary px-4 py-2 text-sm text-text-primary hover:bg-green-500 hover:text-white focus:bg-green-500 focus:text-white dark:hover:bg-green-600 dark:focus:bg-green-600"
             >
               {localize('com_ui_accept')}
             </button>
diff --git a/client/src/components/ui/ThemeSelector.tsx b/client/src/components/ui/ThemeSelector.tsx
index c28089abf97..30339bea8bb 100644
--- a/client/src/components/ui/ThemeSelector.tsx
+++ b/client/src/components/ui/ThemeSelector.tsx
@@ -1,25 +1,37 @@
-import React, { useContext, useCallback } from 'react';
-import { Sun, Moon } from 'lucide-react';
+import React, { useContext, useCallback, useEffect } from 'react';
+import { Sun, Moon, Monitor } from 'lucide-react';
 import { ThemeContext } from '~/hooks';
 
 const Theme = ({ theme, onChange }: { theme: string; onChange: (value: string) => void }) => {
   const themeIcons = {
-    system: <Sun />,
+    system: <Monitor />,
     dark: <Moon color="white" />,
     light: <Sun />,
   };
 
   return (
     <div className="flex items-center justify-between">
-      <div className="cursor-pointer" onClick={() => onChange(theme === 'dark' ? 'light' : 'dark')}>
+      <button
+        className="cursor-pointer"
+        onClick={() => onChange(theme === 'dark' ? 'light' : 'dark')}
+        onKeyDown={(e) => {
+          if (e.key === 'Enter' || e.key === ' ') {
+            onChange(theme === 'dark' ? 'light' : 'dark');
+          }
+        }}
+        role="switch"
+        aria-checked={theme === 'dark'}
+        tabIndex={0}
+      >
         {themeIcons[theme]}
-      </div>
+      </button>
     </div>
   );
 };
 
 const ThemeSelector = ({ returnThemeOnly }: { returnThemeOnly?: boolean }) => {
   const { theme, setTheme } = useContext(ThemeContext);
+
   const changeTheme = useCallback(
     (value: string) => {
       setTheme(value);
@@ -27,7 +39,14 @@ const ThemeSelector = ({ returnThemeOnly }: { returnThemeOnly?: boolean }) => {
     [setTheme],
   );
 
-  if (returnThemeOnly) {
+  useEffect(() => {
+    if (theme === 'system') {
+      const prefersDarkScheme = window.matchMedia('(prefers-color-scheme: dark)').matches;
+      setTheme(prefersDarkScheme ? 'dark' : 'light');
+    }
+  }, [theme, setTheme]);
+
+  if (returnThemeOnly === true) {
     return <Theme theme={theme} onChange={changeTheme} />;
   }
 
diff --git a/client/src/components/ui/Tooltip.tsx b/client/src/components/ui/Tooltip.tsx
index 9ec28585674..ec969095ec7 100644
--- a/client/src/components/ui/Tooltip.tsx
+++ b/client/src/components/ui/Tooltip.tsx
@@ -1,46 +1,74 @@
-import * as React from 'react';
-import * as TooltipPrimitive from '@radix-ui/react-tooltip';
+import * as Ariakit from '@ariakit/react';
+import { AnimatePresence, motion } from 'framer-motion';
+import { forwardRef, useMemo } from 'react';
 import { cn } from '~/utils';
 
-const Tooltip = TooltipPrimitive.Root;
+interface TooltipAnchorProps extends Ariakit.TooltipAnchorProps {
+  description: string;
+  side?: 'top' | 'bottom' | 'left' | 'right';
+  className?: string;
+  role?: string;
+}
 
-const TooltipTrigger = React.forwardRef<
-  React.ElementRef<typeof TooltipPrimitive.Trigger>,
-  React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Trigger>
->((props, ref) => <TooltipPrimitive.Trigger ref={ref} {...props} />);
-TooltipTrigger.displayName = TooltipPrimitive.Trigger.displayName;
+export const TooltipAnchor = forwardRef<HTMLDivElement, TooltipAnchorProps>(function TooltipAnchor(
+  { description, side = 'top', className, role, ...props },
+  ref,
+) {
+  const tooltip = Ariakit.useTooltipStore({ placement: side });
+  const mounted = Ariakit.useStoreState(tooltip, (state) => state.mounted);
+  const placement = Ariakit.useStoreState(tooltip, (state) => state.placement);
 
-const TooltipPortal = TooltipPrimitive.Portal;
+  const { x, y } = useMemo(() => {
+    const dir = placement.split('-')[0];
+    switch (dir) {
+      case 'top':
+        return { x: 0, y: -8 };
+      case 'bottom':
+        return { x: 0, y: 8 };
+      case 'left':
+        return { x: -8, y: 0 };
+      case 'right':
+        return { x: 8, y: 0 };
+      default:
+        return { x: 0, y: 0 };
+    }
+  }, [placement]);
 
-const TooltipArrow = React.forwardRef<
-  React.ElementRef<typeof TooltipPrimitive.Arrow>,
-  React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Arrow>
->((props, ref) => <TooltipPrimitive.Arrow ref={ref} {...props} />);
-TooltipArrow.displayName = TooltipPrimitive.Arrow.displayName;
+  const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
+    if (role === 'button' && event.key === 'Enter') {
+      event.preventDefault();
+      (event.target as HTMLDivElement).click();
+    }
+  };
 
-const TooltipContent = React.forwardRef<
-  React.ElementRef<typeof TooltipPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
->(({ className = '', forceMount, children, ...props }, ref) => (
-  <TooltipPortal forceMount={forceMount}>
-    <TooltipPrimitive.Content
-      className={cn(
-        'shadow-xs relative z-[1000] max-w-xs rounded-lg border border-gray-900/10 bg-gray-900 p-1 transition-opacity',
-        className,
-      )}
-      ref={ref}
-      {...props}
-      style={{ userSelect: 'none' }}
-    >
-      <span className="flex items-center whitespace-pre-wrap px-2 py-1 text-center text-sm font-medium normal-case text-white">
-        {children}
-        <TooltipArrow className="TooltipArrow" />
-      </span>
-    </TooltipPrimitive.Content>
-  </TooltipPortal>
-));
-TooltipContent.displayName = TooltipPrimitive.Content.displayName;
-
-const TooltipProvider = TooltipPrimitive.Provider;
-
-export { Tooltip, TooltipTrigger, TooltipPortal, TooltipContent, TooltipArrow, TooltipProvider };
+  return (
+    <Ariakit.TooltipProvider store={tooltip} hideTimeout={0}>
+      <Ariakit.TooltipAnchor
+        {...props}
+        ref={ref}
+        role={role}
+        onKeyDown={handleKeyDown}
+        className={cn('cursor-pointer', className)}
+      />
+      <AnimatePresence>
+        {mounted === true && (
+          <Ariakit.Tooltip
+            gutter={4}
+            alwaysVisible
+            className="tooltip"
+            render={
+              <motion.div
+                initial={{ opacity: 0, x, y }}
+                animate={{ opacity: 1, x: 0, y: 0 }}
+                exit={{ opacity: 0, x, y }}
+              />
+            }
+          >
+            <Ariakit.TooltipArrow />
+            {description}
+          </Ariakit.Tooltip>
+        )}
+      </AnimatePresence>
+    </Ariakit.TooltipProvider>
+  );
+});
diff --git a/client/src/components/ui/TooltipIcon.tsx b/client/src/components/ui/TooltipIcon.tsx
deleted file mode 100644
index 399458c1b7a..00000000000
--- a/client/src/components/ui/TooltipIcon.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import { ReactElement } from 'react';
-import {
-  OGDialog,
-  OGDialogTrigger,
-  Label,
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from '~/components/ui';
-import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
-import { CrossIcon } from '~/components/svg';
-import { useLocalize } from '~/hooks';
-
-export default function TooltipIcon({
-  disabled,
-  appendLabel = false,
-  title,
-  className = '',
-  confirm,
-  confirmMessage,
-  icon,
-  tabIndex,
-  onFocus,
-  onBlur,
-}: {
-  disabled: boolean;
-  title: string;
-  appendLabel?: boolean;
-  className?: string;
-  confirm?: () => void;
-  confirmMessage?: ReactElement;
-  icon?: ReactElement;
-  tabIndex?: number;
-  onFocus?: () => void;
-  onBlur?: () => void;
-}) {
-  const localize = useLocalize();
-
-  const renderDeleteButton = () => {
-    if (appendLabel) {
-      return (
-        <>
-          {icon} {localize('com_ui_delete')}
-        </>
-      );
-    }
-    return (
-      <TooltipProvider delayDuration={250}>
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <span>{icon}</span>
-          </TooltipTrigger>
-          <TooltipContent side="top" sideOffset={0}>
-            {localize('com_ui_delete')}
-          </TooltipContent>
-        </Tooltip>
-      </TooltipProvider>
-    );
-  };
-
-  if (!confirmMessage) {
-    return (
-      <button
-        className={className}
-        onClick={confirm}
-        tabIndex={tabIndex}
-        onFocus={onFocus}
-        onBlur={onBlur}
-      >
-        {disabled ? <CrossIcon /> : renderDeleteButton()}
-      </button>
-    );
-  }
-  return (
-    <OGDialog>
-      <OGDialogTrigger asChild>
-        <button className={className} tabIndex={tabIndex} onFocus={onFocus} onBlur={onBlur}>
-          {disabled ? <CrossIcon /> : renderDeleteButton()}
-        </button>
-      </OGDialogTrigger>
-      <OGDialogTemplate
-        showCloseButton={false}
-        title={title}
-        className="max-w-[450px]"
-        main={<Label className="text-left text-sm font-medium">{confirmMessage}</Label>}
-        selection={{
-          selectHandler: confirm,
-          selectClasses:
-            'bg-red-700 dark:bg-red-600 hover:bg-red-800 dark:hover:bg-red-800 text-white',
-          selectText: localize('com_ui_delete'),
-        }}
-      />
-    </OGDialog>
-  );
-}
diff --git a/client/src/components/ui/index.ts b/client/src/components/ui/index.ts
index 6d29875de8d..e49309486d0 100644
--- a/client/src/components/ui/index.ts
+++ b/client/src/components/ui/index.ts
@@ -23,6 +23,7 @@ export * from './Tag';
 export * from './Textarea';
 export * from './TextareaAutosize';
 export * from './Tooltip';
+export * from './Pagination';
 export { default as Combobox } from './Combobox';
 export { default as Dropdown } from './Dropdown';
 export { default as FileUpload } from './FileUpload';
diff --git a/client/src/data-provider/mutations.ts b/client/src/data-provider/mutations.ts
index 59ff1c90177..339d2694761 100644
--- a/client/src/data-provider/mutations.ts
+++ b/client/src/data-provider/mutations.ts
@@ -138,7 +138,8 @@ export const useArchiveConversationMutation = (
     (payload: t.TArchiveConversationRequest) => dataService.archiveConversation(payload),
     {
       onSuccess: (_data, vars) => {
-        if (vars.isArchived) {
+        const isArchived = vars.isArchived === true;
+        if (isArchived) {
           queryClient.setQueryData([QueryKeys.conversation, id], null);
         } else {
           queryClient.setQueryData([QueryKeys.conversation, id], _data);
@@ -151,17 +152,17 @@ export const useArchiveConversationMutation = (
           const pageSize = convoData.pages[0].pageSize as number;
 
           return normalizeData(
-            vars.isArchived ? deleteConversation(convoData, id) : addConversation(convoData, _data),
+            isArchived ? deleteConversation(convoData, id) : addConversation(convoData, _data),
             'conversations',
             pageSize,
           );
         });
 
-        if (vars.isArchived) {
+        if (isArchived) {
           const current = queryClient.getQueryData<t.ConversationData>([
             QueryKeys.allConversations,
           ]);
-          refetch({ refetchPage: (page, index) => index === (current?.pages.length || 1) - 1 });
+          refetch({ refetchPage: (page, index) => index === (current?.pages.length ?? 1) - 1 });
         }
 
         queryClient.setQueryData<t.ConversationData>(
@@ -172,21 +173,19 @@ export const useArchiveConversationMutation = (
             }
             const pageSize = convoData.pages[0].pageSize as number;
             return normalizeData(
-              vars.isArchived
-                ? addConversation(convoData, _data)
-                : deleteConversation(convoData, id),
+              isArchived ? addConversation(convoData, _data) : deleteConversation(convoData, id),
               'conversations',
               pageSize,
             );
           },
         );
 
-        if (!vars.isArchived) {
+        if (!isArchived) {
           const currentArchive = queryClient.getQueryData<t.ConversationData>([
             QueryKeys.archivedConversations,
           ]);
           archiveRefetch({
-            refetchPage: (page, index) => index === (currentArchive?.pages.length || 1) - 1,
+            refetchPage: (page, index) => index === (currentArchive?.pages.length ?? 1) - 1,
           });
         }
       },
@@ -194,6 +193,60 @@ export const useArchiveConversationMutation = (
   );
 };
 
+export const useArchiveConvoMutation = (options?: t.ArchiveConvoOptions) => {
+  const queryClient = useQueryClient();
+  const { onSuccess, ..._options } = options ?? {};
+
+  return useMutation<t.TArchiveConversationResponse, unknown, t.TArchiveConversationRequest>(
+    (payload: t.TArchiveConversationRequest) => dataService.archiveConversation(payload),
+    {
+      onSuccess: (_data, vars) => {
+        const { conversationId } = vars;
+        const isArchived = vars.isArchived === true;
+        if (isArchived) {
+          queryClient.setQueryData([QueryKeys.conversation, conversationId], null);
+        } else {
+          queryClient.setQueryData([QueryKeys.conversation, conversationId], _data);
+        }
+
+        queryClient.setQueryData<t.ConversationData>([QueryKeys.allConversations], (convoData) => {
+          if (!convoData) {
+            return convoData;
+          }
+          const pageSize = convoData.pages[0].pageSize as number;
+          return normalizeData(
+            isArchived
+              ? deleteConversation(convoData, conversationId)
+              : addConversation(convoData, _data),
+            'conversations',
+            pageSize,
+          );
+        });
+
+        queryClient.setQueryData<t.ConversationData>(
+          [QueryKeys.archivedConversations],
+          (convoData) => {
+            if (!convoData) {
+              return convoData;
+            }
+            const pageSize = convoData.pages[0].pageSize as number;
+            return normalizeData(
+              isArchived
+                ? addConversation(convoData, _data)
+                : deleteConversation(convoData, conversationId),
+              'conversations',
+              pageSize,
+            );
+          },
+        );
+
+        onSuccess?.(_data, vars);
+      },
+      ..._options,
+    },
+  );
+};
+
 export const useCreateSharedLinkMutation = (
   options?: t.CreateSharedLinkOptions,
 ): UseMutationResult<t.TSharedLinkResponse, unknown, t.TSharedLinkRequest, unknown> => {
@@ -863,7 +916,7 @@ export const useUpdateAssistantMutation = (
       const { endpoint } = data;
       const endpointsConfig = queryClient.getQueryData<t.TEndpointsConfig>([QueryKeys.endpoints]);
       const endpointConfig = endpointsConfig?.[endpoint];
-      const version = endpointConfig.version ?? defaultAssistantsVersion[endpoint];
+      const version = endpointConfig?.version ?? defaultAssistantsVersion[endpoint];
       return dataService.updateAssistant({
         data,
         version,
diff --git a/client/src/data-provider/queries.ts b/client/src/data-provider/queries.ts
index af7c1dacb25..84e8ab2111a 100644
--- a/client/src/data-provider/queries.ts
+++ b/client/src/data-provider/queries.ts
@@ -150,12 +150,12 @@ export const useConversationsInfiniteQuery = (
   config?: UseInfiniteQueryOptions<ConversationListResponse, unknown>,
 ) => {
   return useInfiniteQuery<ConversationListResponse, unknown>(
-    params?.isArchived ? [QueryKeys.archivedConversations] : [QueryKeys.allConversations],
+    params?.isArchived === true ? [QueryKeys.archivedConversations] : [QueryKeys.allConversations],
     ({ pageParam = '' }) =>
       dataService.listConversations({
         ...params,
         pageNumber: pageParam?.toString(),
-        isArchived: params?.isArchived || false,
+        isArchived: params?.isArchived ?? false,
         tags: params?.tags || [],
       }),
     {
@@ -509,13 +509,33 @@ export const useGetAgentByIdQuery = (
 /** STT/TTS */
 
 /* Text to speech voices */
-export const useVoicesQuery = (): UseQueryResult<t.VoiceResponse> => {
-  return useQuery([QueryKeys.voices], () => dataService.getVoices());
+export const useVoicesQuery = (
+  config?: UseQueryOptions<t.VoiceResponse>,
+): QueryObserverResult<t.VoiceResponse> => {
+  return useQuery<t.VoiceResponse>([QueryKeys.voices], () => dataService.getVoices(), {
+    refetchOnWindowFocus: false,
+    refetchOnReconnect: false,
+    refetchOnMount: false,
+    retry: false,
+    ...config,
+  });
 };
 
 /* Custom config speech */
-export const useCustomConfigSpeechQuery = () => {
-  return useQuery([QueryKeys.customConfigSpeech], () => dataService.getCustomConfigSpeech());
+export const useCustomConfigSpeechQuery = (
+  config?: UseQueryOptions<t.TCustomConfigSpeechResponse>,
+): QueryObserverResult<t.TCustomConfigSpeechResponse> => {
+  return useQuery<t.TCustomConfigSpeechResponse>(
+    [QueryKeys.customConfigSpeech],
+    () => dataService.getCustomConfigSpeech(),
+    {
+      refetchOnWindowFocus: false,
+      refetchOnReconnect: false,
+      refetchOnMount: false,
+      retry: false,
+      ...config,
+    },
+  );
 };
 
 /** Prompt */
diff --git a/client/src/hooks/AuthContext.tsx b/client/src/hooks/AuthContext.tsx
index 2b2ab210643..36dea258b9c 100644
--- a/client/src/hooks/AuthContext.tsx
+++ b/client/src/hooks/AuthContext.tsx
@@ -35,7 +35,10 @@ const AuthContextProvider = ({
   const [error, setError] = useState<string | undefined>(undefined);
   const [isAuthenticated, setIsAuthenticated] = useState<boolean>(false);
   const { data: userRole = null } = useGetRole(SystemRoles.USER, {
-    enabled: !!(isAuthenticated && user?.role),
+    enabled: !!(isAuthenticated && (user?.role ?? '')),
+  });
+  const { data: adminRole = null } = useGetRole(SystemRoles.ADMIN, {
+    enabled: !!(isAuthenticated && user?.role === SystemRoles.ADMIN),
   });
 
   const navigate = useNavigate();
@@ -130,7 +133,7 @@ const AuthContextProvider = ({
     if (userQuery.data) {
       setUser(userQuery.data);
     } else if (userQuery.isError) {
-      doSetError((userQuery?.error as Error).message);
+      doSetError((userQuery.error as Error).message);
       navigate('/login', { replace: true });
     }
     if (error && isAuthenticated) {
@@ -179,11 +182,12 @@ const AuthContextProvider = ({
       setError,
       roles: {
         [SystemRoles.USER]: userRole,
+        [SystemRoles.ADMIN]: adminRole,
       },
       isAuthenticated,
     }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [user, error, isAuthenticated, token, userRole],
+    [user, error, isAuthenticated, token, userRole, adminRole],
   );
 
   return <AuthContext.Provider value={memoedValue}>{children}</AuthContext.Provider>;
diff --git a/client/src/hooks/Chat/useChatFunctions.ts b/client/src/hooks/Chat/useChatFunctions.ts
index 419bf8a1d5f..43a7fcd5dae 100644
--- a/client/src/hooks/Chat/useChatFunctions.ts
+++ b/client/src/hooks/Chat/useChatFunctions.ts
@@ -241,6 +241,7 @@ export default function useChatFunctions({
           },
         },
       ];
+      setShowStopButton(true);
     } else {
       setShowStopButton(true);
     }
diff --git a/client/src/hooks/Config/useAppStartup.ts b/client/src/hooks/Config/useAppStartup.ts
index 79b6e986d5f..8074ee1d6f0 100644
--- a/client/src/hooks/Config/useAppStartup.ts
+++ b/client/src/hooks/Config/useAppStartup.ts
@@ -100,10 +100,12 @@ export default function useAppStartup({
     setAvailableTools({ pluginStore, ...mapPlugins(tools) });
   }, [allPlugins, user, setAvailableTools]);
 
-  if (startupConfig?.analyticsGtmId) {
-    const tagManagerArgs = {
-      gtmId: startupConfig?.analyticsGtmId,
-    };
-    TagManager.initialize(tagManagerArgs);
-  }
+  useEffect(() => {
+    if (startupConfig?.analyticsGtmId != null && typeof window.google_tag_manager === 'undefined') {
+      const tagManagerArgs = {
+        gtmId: startupConfig.analyticsGtmId,
+      };
+      TagManager.initialize(tagManagerArgs);
+    }
+  }, [startupConfig?.analyticsGtmId]);
 }
diff --git a/client/src/hooks/Conversations/index.ts b/client/src/hooks/Conversations/index.ts
index 42f278f9af2..4d14b42b9e5 100644
--- a/client/src/hooks/Conversations/index.ts
+++ b/client/src/hooks/Conversations/index.ts
@@ -5,6 +5,7 @@ export { default as useDefaultConvo } from './useDefaultConvo';
 export { default as useConversation } from './useConversation';
 export { default as useGenerateConvo } from './useGenerateConvo';
 export { default as useConversations } from './useConversations';
+export { default as useArchiveHandler } from './useArchiveHandler';
 export { default as useDebouncedInput } from './useDebouncedInput';
 export { default as useBookmarkSuccess } from './useBookmarkSuccess';
 export { default as useNavigateToConvo } from './useNavigateToConvo';
diff --git a/client/src/components/Conversations/ConvoOptions/ArchiveButton.tsx b/client/src/hooks/Conversations/useArchiveHandler.ts
similarity index 55%
rename from client/src/components/Conversations/ConvoOptions/ArchiveButton.tsx
rename to client/src/hooks/Conversations/useArchiveHandler.ts
index 3d6fe1dd4a3..88475547132 100644
--- a/client/src/components/Conversations/ConvoOptions/ArchiveButton.tsx
+++ b/client/src/hooks/Conversations/useArchiveHandler.ts
@@ -1,22 +1,13 @@
-import React from 'react';
 import { useParams, useNavigate } from 'react-router-dom';
 import type { MouseEvent, FocusEvent, KeyboardEvent } from 'react';
-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from '~/components/ui';
-import { useConversations, useLocalize, useNewConvo } from '~/hooks';
 import { useArchiveConversationMutation } from '~/data-provider';
+import useConversations from './useConversations';
 import { NotificationSeverity } from '~/common';
 import { useToastContext } from '~/Providers';
+import useLocalize from '../useLocalize';
+import useNewConvo from '../useNewConvo';
 
-type ArchiveButtonProps = {
-  children?: React.ReactNode;
-  conversationId: string;
-  retainView: () => void;
-  shouldArchive: boolean;
-  icon?: React.ReactNode;
-  className?: string;
-};
-
-export function useArchiveHandler(
+export default function useArchiveHandler(
   conversationId: string,
   shouldArchive: boolean,
   retainView: () => void,
@@ -57,31 +48,3 @@ export function useArchiveHandler(
     );
   };
 }
-
-export default function ArchiveButton({
-  conversationId,
-  retainView,
-  shouldArchive,
-  icon,
-  className = '',
-}: ArchiveButtonProps) {
-  const localize = useLocalize();
-  const archiveHandler = useArchiveHandler(conversationId, shouldArchive, retainView);
-
-  return (
-    <button type="button" className={className} onClick={archiveHandler}>
-      <TooltipProvider delayDuration={250}>
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <span className="h-5 w-5">{icon}</span>
-          </TooltipTrigger>
-          <TooltipContent side="top" sideOffset={0}>
-            {localize(`com_ui_${shouldArchive ? 'archive' : 'unarchive'}`)}
-          </TooltipContent>
-        </Tooltip>
-      </TooltipProvider>
-    </button>
-  );
-}
-
-export { useArchiveHandler as archiveHandler };
diff --git a/client/src/hooks/Conversations/useDebouncedInput.ts b/client/src/hooks/Conversations/useDebouncedInput.ts
index 5db075b7693..bae6ae0c7ec 100644
--- a/client/src/hooks/Conversations/useDebouncedInput.ts
+++ b/client/src/hooks/Conversations/useDebouncedInput.ts
@@ -41,7 +41,7 @@ function useDebouncedInput<T = unknown>({
       const newValue: T =
         typeof e !== 'object'
           ? e
-          : ((e as React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>)?.target
+          : ((e as React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>).target
             .value as unknown as T);
       setValue(newValue);
       setDebouncedOption(newValue);
diff --git a/client/src/hooks/Conversations/useExportConversation.ts b/client/src/hooks/Conversations/useExportConversation.ts
index 8cd2133d066..a1291f940b8 100644
--- a/client/src/hooks/Conversations/useExportConversation.ts
+++ b/client/src/hooks/Conversations/useExportConversation.ts
@@ -20,6 +20,12 @@ import { useScreenshot } from '~/hooks/ScreenshotContext';
 import { cleanupPreset, buildTree } from '~/utils';
 import { useParams } from 'react-router-dom';
 
+type ExportValues = {
+  fieldName: string;
+  fieldValues: string[];
+};
+type ExportEntries = ExportValues[];
+
 export default function useExportConversation({
   conversation,
   filename,
@@ -48,7 +54,7 @@ export default function useExportConversation({
     return dataTree?.length === 0 ? null : dataTree ?? null;
   }, [paramId, conversation?.conversationId, queryClient]);
 
-  const getMessageText = (message: TMessage, format = 'text') => {
+  const getMessageText = (message: TMessage | undefined, format = 'text') => {
     if (!message) {
       return '';
     }
@@ -77,7 +83,7 @@ export default function useExportConversation({
    * Currently, content whose type is `TOOL_CALL` basically returns JSON as is.
    * In the future, different formatted text may be returned for each type.
    */
-  const getMessageContent = (sender: string, content: TMessageContentParts): string[] => {
+  const getMessageContent = (sender: string, content?: TMessageContentParts): string[] => {
     if (!content) {
       return [];
     }
@@ -89,7 +95,9 @@ export default function useExportConversation({
 
     if (content.type === ContentTypes.TEXT) {
       // TEXT
-      return [sender, content[ContentTypes.TEXT].value];
+      const textPart = content[ContentTypes.TEXT];
+      const text = typeof textPart === 'string' ? textPart : textPart.value;
+      return [sender, text];
     }
 
     if (content.type === ContentTypes.TOOL_CALL) {
@@ -154,7 +162,7 @@ export default function useExportConversation({
       messageId: conversation?.conversationId,
       message: null,
       messages: getMessageTree(),
-      branches: !!exportBranches,
+      branches: Boolean(exportBranches),
       recursive: false,
     });
 
@@ -171,7 +179,7 @@ export default function useExportConversation({
       fileName: filename,
       extension: 'csv',
       exportType: exportFromJSON.types.csv,
-      beforeTableEncode: (entries) => [
+      beforeTableEncode: (entries: ExportEntries | undefined) => [
         {
           fieldName: 'sender',
           fieldValues: entries?.find((e) => e.fieldName == 'sender')?.fieldValues ?? [],
@@ -216,7 +224,7 @@ export default function useExportConversation({
       `- title: ${conversation?.title}\n` +
       `- exportAt: ${new Date().toTimeString()}\n`;
 
-    if (includeOptions) {
+    if (includeOptions === true) {
       data += '\n## Options\n';
       const options = cleanupPreset({ preset: conversation as TPreset });
 
@@ -240,7 +248,7 @@ export default function useExportConversation({
         if (message.error) {
           data += '*(This is an error message)*\n';
         }
-        if (message.unfinished) {
+        if (message.unfinished === true) {
           data += '*(This is an unfinished message)*\n';
         }
         data += '\n\n';
@@ -250,7 +258,7 @@ export default function useExportConversation({
       if (messages.error) {
         data += '*(This is an error message)*\n';
       }
-      if (messages.unfinished) {
+      if (messages.unfinished === true) {
         data += '*(This is an unfinished message)*\n';
       }
     }
@@ -272,7 +280,7 @@ export default function useExportConversation({
       `title: ${conversation?.title}\n` +
       `exportAt: ${new Date().toTimeString()}\n`;
 
-    if (includeOptions) {
+    if (includeOptions === true) {
       data += '\nOptions\n########################\n';
       const options = cleanupPreset({ preset: conversation as TPreset });
 
@@ -296,7 +304,7 @@ export default function useExportConversation({
         if (message.error) {
           data += '(This is an error message)\n';
         }
-        if (message.unfinished) {
+        if (message.unfinished === true) {
           data += '(This is an unfinished message)\n';
         }
         data += '\n\n';
@@ -306,7 +314,7 @@ export default function useExportConversation({
       if (messages.error) {
         data += '(This is an error message)\n';
       }
-      if (messages.unfinished) {
+      if (messages.unfinished === true) {
         data += '(This is an unfinished message)\n';
       }
     }
@@ -329,7 +337,7 @@ export default function useExportConversation({
       recursive: recursive,
     };
 
-    if (includeOptions) {
+    if (includeOptions === true) {
       data['options'] = cleanupPreset({ preset: conversation as TPreset });
     }
 
@@ -337,11 +345,11 @@ export default function useExportConversation({
       messageId: conversation?.conversationId,
       message: null,
       messages: getMessageTree(),
-      branches: !!exportBranches,
-      recursive: !!recursive,
+      branches: Boolean(exportBranches),
+      recursive: Boolean(recursive),
     });
 
-    if (recursive && !Array.isArray(messages)) {
+    if (recursive === true && !Array.isArray(messages)) {
       data['messagesTree'] = messages.children;
     } else {
       data['messages'] = messages;
diff --git a/client/src/hooks/Conversations/useParameterEffects.ts b/client/src/hooks/Conversations/useParameterEffects.ts
index a8fc0675802..ad45f522389 100644
--- a/client/src/hooks/Conversations/useParameterEffects.ts
+++ b/client/src/hooks/Conversations/useParameterEffects.ts
@@ -38,29 +38,31 @@ function useParameterEffects<T = unknown>({
 
   /** Resets the local state if conversationId changed */
   useEffect(() => {
-    if (!conversation?.conversationId) {
+    const conversationId = conversation?.conversationId ?? '';
+    if (!conversationId) {
       return;
     }
 
-    if (idRef.current === conversation?.conversationId) {
+    if (idRef.current === conversationId) {
       return;
     }
 
-    idRef.current = conversation?.conversationId;
+    idRef.current = conversationId;
     setInputValue(defaultValue as T);
   }, [setInputValue, conversation?.conversationId, defaultValue]);
 
   /** Resets the local state if presetId changed */
   useEffect(() => {
-    if (!preset?.presetId) {
+    const presetId = preset?.presetId ?? '';
+    if (!presetId) {
       return;
     }
 
-    if (presetIdRef.current === preset?.presetId) {
+    if (presetIdRef.current === presetId) {
       return;
     }
 
-    presetIdRef.current = preset?.presetId;
+    presetIdRef.current = presetId;
     setInputValue(defaultValue as T);
   }, [setInputValue, preset?.presetId, defaultValue]);
 }
diff --git a/client/src/hooks/Input/useHandleKeyUp.ts b/client/src/hooks/Input/useHandleKeyUp.ts
index 98f6e77eb6e..5990df2408d 100644
--- a/client/src/hooks/Input/useHandleKeyUp.ts
+++ b/client/src/hooks/Input/useHandleKeyUp.ts
@@ -46,10 +46,14 @@ const useHandleKeyUp = ({
   setShowPlusPopover: SetterOrUpdater<boolean>;
   setShowMentionPopover: SetterOrUpdater<boolean>;
 }) => {
-  const hasAccess = useHasAccess({
+  const hasPromptsAccess = useHasAccess({
     permissionType: PermissionTypes.PROMPTS,
     permission: Permissions.USE,
   });
+  const hasMultiConvoAccess = useHasAccess({
+    permissionType: PermissionTypes.MULTI_CONVO,
+    permission: Permissions.USE,
+  });
   const setShowPromptsPopover = useSetRecoilState(store.showPromptsPopoverFamily(index));
 
   // Get the current state of command toggles
@@ -64,19 +68,22 @@ const useHandleKeyUp = ({
   }, [textAreaRef, setShowMentionPopover, atCommandEnabled]);
 
   const handlePlusCommand = useCallback(() => {
-    if (plusCommandEnabled && shouldTriggerCommand(textAreaRef, '+')) {
+    if (!hasMultiConvoAccess || !plusCommandEnabled) {
+      return;
+    }
+    if (shouldTriggerCommand(textAreaRef, '+')) {
       setShowPlusPopover(true);
     }
-  }, [textAreaRef, setShowPlusPopover, plusCommandEnabled]);
+  }, [textAreaRef, setShowPlusPopover, plusCommandEnabled, hasMultiConvoAccess]);
 
   const handlePromptsCommand = useCallback(() => {
-    if (!hasAccess || !slashCommandEnabled) {
+    if (!hasPromptsAccess || !slashCommandEnabled) {
       return;
     }
     if (shouldTriggerCommand(textAreaRef, '/')) {
       setShowPromptsPopover(true);
     }
-  }, [textAreaRef, hasAccess, setShowPromptsPopover, slashCommandEnabled]);
+  }, [textAreaRef, hasPromptsAccess, setShowPromptsPopover, slashCommandEnabled]);
 
   const commandHandlers = useMemo(
     () => ({
diff --git a/client/src/hooks/Messages/useCopyToClipboard.ts b/client/src/hooks/Messages/useCopyToClipboard.ts
index 50111f68aa1..06f5e06c5e3 100644
--- a/client/src/hooks/Messages/useCopyToClipboard.ts
+++ b/client/src/hooks/Messages/useCopyToClipboard.ts
@@ -14,12 +14,13 @@ export default function useCopyToClipboard({
       if (content) {
         messageText = content.reduce((acc, curr, i) => {
           if (curr.type === ContentTypes.TEXT) {
-            return acc + curr.text.value + (i === content.length - 1 ? '' : '\n');
+            const text = typeof curr.text === 'string' ? curr.text : curr.text.value;
+            return acc + text + (i === content.length - 1 ? '' : '\n');
           }
           return acc;
         }, '');
       }
-      copy(messageText ?? '', { format: 'text/plain' });
+      copy(messageText, { format: 'text/plain' });
 
       setTimeout(() => {
         setIsCopied(false);
diff --git a/client/src/hooks/Messages/useMessageActions.tsx b/client/src/hooks/Messages/useMessageActions.tsx
index 3c481476dfc..3a7e1d59d33 100644
--- a/client/src/hooks/Messages/useMessageActions.tsx
+++ b/client/src/hooks/Messages/useMessageActions.tsx
@@ -1,8 +1,13 @@
 import { useRecoilValue } from 'recoil';
 import { useCallback, useMemo } from 'react';
-import { isAssistantsEndpoint } from 'librechat-data-provider';
+import { isAssistantsEndpoint, isAgentsEndpoint } from 'librechat-data-provider';
 import type { TMessageProps } from '~/common';
-import { useChatContext, useAddedChatContext, useAssistantsMapContext } from '~/Providers';
+import {
+  useChatContext,
+  useAddedChatContext,
+  useAssistantsMapContext,
+  useAgentsMapContext,
+} from '~/Providers';
 import useCopyToClipboard from './useCopyToClipboard';
 import { useAuthContext } from '~/hooks/AuthContext';
 import useLocalize from '~/hooks/useLocalize';
@@ -35,6 +40,8 @@ export default function useMessageActions(props: TMessageActions) {
     () => (isMultiMessage === true ? addedConvo : rootConvo),
     [isMultiMessage, addedConvo, rootConvo],
   );
+
+  const agentMap = useAgentsMapContext();
   const assistantMap = useAssistantsMapContext();
 
   const { text, content, messageId = null, isCreatedByUser } = message ?? {};
@@ -56,6 +63,26 @@ export default function useMessageActions(props: TMessageActions) {
     return assistantMap?.[endpointKey] ? assistantMap[endpointKey][modelKey] : undefined;
   }, [conversation?.endpoint, message?.model, assistantMap]);
 
+  const agent = useMemo(() => {
+    if (!isAgentsEndpoint(conversation?.endpoint)) {
+      return undefined;
+    }
+
+    if (!agentMap) {
+      return undefined;
+    }
+
+    const modelKey = message?.model ?? '';
+    if (modelKey) {
+      return agentMap[modelKey];
+    }
+
+    const agentId = conversation?.agent_id ?? '';
+    if (agentId) {
+      return agentMap[agentId];
+    }
+  }, [agentMap, conversation?.agent_id, conversation?.endpoint, message?.model]);
+
   const isSubmitting = useMemo(
     () => (isMultiMessage === true ? isSubmittingAdditional : isSubmittingRoot),
     [isMultiMessage, isSubmittingAdditional, isSubmittingRoot],
@@ -74,17 +101,20 @@ export default function useMessageActions(props: TMessageActions) {
   const messageLabel = useMemo(() => {
     if (message?.isCreatedByUser === true) {
       return UsernameDisplay ? (user?.name ?? '') || user?.username : localize('com_user_message');
+    } else if (agent) {
+      return agent.name ?? 'Assistant';
     } else if (assistant) {
       return assistant.name ?? 'Assistant';
     } else {
       return message?.sender;
     }
-  }, [message, assistant, UsernameDisplay, user, localize]);
+  }, [message, agent, assistant, UsernameDisplay, user, localize]);
 
   return {
     ask,
     edit,
     index,
+    agent,
     assistant,
     enterEdit,
     conversation,
diff --git a/client/src/hooks/Messages/useMessageHelpers.tsx b/client/src/hooks/Messages/useMessageHelpers.tsx
index 873dae9b33a..2db72031e42 100644
--- a/client/src/hooks/Messages/useMessageHelpers.tsx
+++ b/client/src/hooks/Messages/useMessageHelpers.tsx
@@ -103,7 +103,7 @@ export default function useMessageHelpers(props: TMessageProps) {
     const modelKey = message?.model ?? '';
 
     return agentMap ? agentMap[modelKey] : undefined;
-  }, [agentMap, conversation?.endpoint]);
+  }, [agentMap, conversation?.endpoint, message?.model]);
 
   const regenerateMessage = () => {
     if ((isSubmitting && isCreatedByUser === true) || !message) {
diff --git a/client/src/hooks/Nav/useSideNavLinks.ts b/client/src/hooks/Nav/useSideNavLinks.ts
index a8a09a39925..a59d933a933 100644
--- a/client/src/hooks/Nav/useSideNavLinks.ts
+++ b/client/src/hooks/Nav/useSideNavLinks.ts
@@ -1,15 +1,11 @@
 import { useMemo } from 'react';
+import { MessageSquareQuote, ArrowRightToLine, Settings2, Bookmark } from 'lucide-react';
 import {
-  ArrowRightToLine,
-  MessageSquareQuote,
-  Bookmark,
-  // Settings2,
-} from 'lucide-react';
-import {
-  EModelEndpoint,
   isAssistantsEndpoint,
   isAgentsEndpoint,
   PermissionTypes,
+  isParamEndpoint,
+  EModelEndpoint,
   Permissions,
 } from 'librechat-data-provider';
 import type { TConfig, TInterfaceConfig } from 'librechat-data-provider';
@@ -18,7 +14,7 @@ import BookmarkPanel from '~/components/SidePanel/Bookmarks/BookmarkPanel';
 import PanelSwitch from '~/components/SidePanel/Builder/PanelSwitch';
 import AgentPanelSwitch from '~/components/SidePanel/Agents/AgentPanelSwitch';
 import PromptsAccordion from '~/components/Prompts/PromptsAccordion';
-// import Parameters from '~/components/SidePanel/Parameters/Panel';
+import Parameters from '~/components/SidePanel/Parameters/Panel';
 import FilesPanel from '~/components/SidePanel/Files/Panel';
 import { Blocks, AttachmentIcon } from '~/components/svg';
 import { useHasAccess } from '~/hooks';
@@ -29,6 +25,7 @@ export default function useSideNavLinks({
   agents,
   keyProvided,
   endpoint,
+  endpointType,
   interfaceConfig,
 }: {
   hidePanel: () => void;
@@ -36,6 +33,7 @@ export default function useSideNavLinks({
   agents?: TConfig | null;
   keyProvided: boolean;
   endpoint?: EModelEndpoint | null;
+  endpointType?: EModelEndpoint | null;
   interfaceConfig: Partial<TInterfaceConfig>;
 }) {
   const hasAccessToPrompts = useHasAccess({
@@ -54,7 +52,7 @@ export default function useSideNavLinks({
       assistants &&
       assistants.disableBuilder !== true &&
       keyProvided &&
-      interfaceConfig.parameters
+      interfaceConfig.parameters === true
     ) {
       links.push({
         title: 'com_sidepanel_assistant_builder',
@@ -70,7 +68,7 @@ export default function useSideNavLinks({
       agents &&
       // agents.disableBuilder !== true &&
       keyProvided &&
-      interfaceConfig.parameters
+      interfaceConfig.parameters === true
     ) {
       links.push({
         title: 'com_sidepanel_agent_builder',
@@ -91,6 +89,20 @@ export default function useSideNavLinks({
       });
     }
 
+    if (
+      interfaceConfig.parameters === true &&
+      isParamEndpoint(endpoint ?? '', endpointType ?? '') === true &&
+      keyProvided
+    ) {
+      links.push({
+        title: 'com_sidepanel_parameters',
+        label: '',
+        icon: Settings2,
+        id: 'parameters',
+        Component: Parameters,
+      });
+    }
+
     links.push({
       title: 'com_sidepanel_attach_files',
       label: '',
@@ -119,13 +131,15 @@ export default function useSideNavLinks({
 
     return links;
   }, [
-    assistants,
-    agents,
+    interfaceConfig.parameters,
     keyProvided,
-    hidePanel,
+    assistants,
+    endpointType,
     endpoint,
-    interfaceConfig.parameters,
+    agents,
     hasAccessToPrompts,
+    hasAccessToBookmarks,
+    hidePanel,
   ]);
 
   return Links;
diff --git a/client/src/hooks/Roles/useHasAccess.ts b/client/src/hooks/Roles/useHasAccess.ts
index 24e6746d5a2..ecbffc2185a 100644
--- a/client/src/hooks/Roles/useHasAccess.ts
+++ b/client/src/hooks/Roles/useHasAccess.ts
@@ -1,5 +1,5 @@
 import { useMemo, useCallback } from 'react';
-import { SystemRoles, PermissionTypes, Permissions } from 'librechat-data-provider';
+import { PermissionTypes, Permissions } from 'librechat-data-provider';
 import { useAuthContext } from '~/hooks/AuthContext';
 
 const useHasAccess = ({
@@ -13,9 +13,7 @@ const useHasAccess = ({
 
   const checkAccess = useCallback(
     ({ user, permissionType, permission }) => {
-      if (isAuthenticated && user?.role === SystemRoles.ADMIN) {
-        return true;
-      } else if (isAuthenticated && user?.role != null && roles && roles[user.role]) {
+      if (isAuthenticated && user?.role != null && roles && roles[user.role]) {
         return roles[user.role]?.[permissionType]?.[permission] === true;
       }
       return false;
diff --git a/client/src/hooks/SSE/useEventHandlers.ts b/client/src/hooks/SSE/useEventHandlers.ts
index ea341c39b14..89f2e9af607 100644
--- a/client/src/hooks/SSE/useEventHandlers.ts
+++ b/client/src/hooks/SSE/useEventHandlers.ts
@@ -23,6 +23,7 @@ import type { TGenTitleMutation } from '~/data-provider';
 import {
   scrollToEnd,
   addConversation,
+  getAllContentText,
   deleteConversation,
   updateConversation,
   getConversationById,
@@ -30,6 +31,7 @@ import {
 import useContentHandler from '~/hooks/SSE/useContentHandler';
 import useStepHandler from '~/hooks/SSE/useStepHandler';
 import { useAuthContext } from '~/hooks/AuthContext';
+import { MESSAGE_UPDATE_INTERVAL } from '~/common';
 import { useLiveAnnouncer } from '~/Providers';
 import store from '~/store';
 
@@ -55,8 +57,6 @@ export type EventHandlerParams = {
   resetLatestMessage?: Resetter;
 };
 
-const MESSAGE_UPDATE_INTERVAL = 7000;
-
 export default function useEventHandlers({
   genTitle,
   setMessages,
@@ -78,7 +78,13 @@ export default function useEventHandlers({
   const { token } = useAuthContext();
 
   const contentHandler = useContentHandler({ setMessages, getMessages });
-  const stepHandler = useStepHandler({ setMessages, getMessages });
+  const stepHandler = useStepHandler({
+    setMessages,
+    getMessages,
+    announcePolite,
+    setIsSubmitting,
+    lastAnnouncementTimeRef,
+  });
 
   const messageHandler = useCallback(
     (data: string | undefined, submission: EventSubmission) => {
@@ -356,7 +362,7 @@ export default function useEventHandlers({
       });
 
       announcePolite({
-        message: responseMessage?.text ?? '',
+        message: getAllContentText(responseMessage),
       });
 
       /* Update messages; if assistants endpoint, client doesn't receive responseMessage */
diff --git a/client/src/hooks/SSE/useSSE.ts b/client/src/hooks/SSE/useSSE.ts
index 43ff45f1abc..75a97e7b3a8 100644
--- a/client/src/hooks/SSE/useSSE.ts
+++ b/client/src/hooks/SSE/useSSE.ts
@@ -117,8 +117,8 @@ export default function useSSE(
         };
 
         createdHandler(data, { ...submission, userMessage } as EventSubmission);
-      } else if (data.event) {
-        stepHandler(data);
+      } else if (data.event != null) {
+        stepHandler(data, { ...submission, userMessage } as EventSubmission);
       } else if (data.sync != null) {
         const runId = v4();
         setActiveRunId(runId);
diff --git a/client/src/hooks/SSE/useStepHandler.ts b/client/src/hooks/SSE/useStepHandler.ts
index 2fc987cf9c2..ae57e8daf6b 100644
--- a/client/src/hooks/SSE/useStepHandler.ts
+++ b/client/src/hooks/SSE/useStepHandler.ts
@@ -1,11 +1,22 @@
 import { useCallback, useRef } from 'react';
-import { StepTypes, ContentTypes, ToolCallTypes } from 'librechat-data-provider';
-import type { Agents, PartMetadata, TMessage } from 'librechat-data-provider';
-import { getNonEmptyValue } from 'librechat-data-provider';
+import { StepTypes, ContentTypes, ToolCallTypes, getNonEmptyValue } from 'librechat-data-provider';
+import type {
+  Agents,
+  TMessage,
+  PartMetadata,
+  EventSubmission,
+  TMessageContentParts,
+} from 'librechat-data-provider';
+import type { SetterOrUpdater } from 'recoil';
+import type { AnnounceOptions } from '~/common';
+import { MESSAGE_UPDATE_INTERVAL } from '~/common';
 
 type TUseStepHandler = {
+  announcePolite: (options: AnnounceOptions) => void;
   setMessages: (messages: TMessage[]) => void;
   getMessages: () => TMessage[] | undefined;
+  setIsSubmitting: SetterOrUpdater<boolean>;
+  lastAnnouncementTimeRef: React.MutableRefObject<number>;
 };
 
 type TStepEvent = {
@@ -13,8 +24,23 @@ type TStepEvent = {
   data: Agents.MessageDeltaEvent | Agents.RunStep | Agents.ToolEndEvent;
 };
 
-export default function useStepHandler({ setMessages, getMessages }: TUseStepHandler) {
-  const toolCallIdMap = useRef(new Map<string, string>());
+type MessageDeltaUpdate = { type: ContentTypes.TEXT; text: string; tool_call_ids?: string[] };
+
+type AllContentTypes =
+  | ContentTypes.TEXT
+  | ContentTypes.TOOL_CALL
+  | ContentTypes.IMAGE_FILE
+  | ContentTypes.IMAGE_URL
+  | ContentTypes.ERROR;
+
+export default function useStepHandler({
+  setMessages,
+  getMessages,
+  setIsSubmitting,
+  announcePolite,
+  lastAnnouncementTimeRef,
+}: TUseStepHandler) {
+  const toolCallIdMap = useRef(new Map<string, string | undefined>());
   const messageMap = useRef(new Map<string, TMessage>());
   const stepMap = useRef(new Map<string, Agents.RunStep>());
 
@@ -24,41 +50,53 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHan
     contentPart: Agents.MessageContentComplex,
     finalUpdate = false,
   ) => {
-    if (!contentPart.type) {
+    const contentType = contentPart.type ?? '';
+    if (!contentType) {
       console.warn('No content type found in content part');
       return message;
     }
 
-    const updatedContent = [...(message.content || [])];
+    const updatedContent = [...(message.content || [])] as Array<
+      Partial<TMessageContentParts> | undefined
+    >;
     if (!updatedContent[index]) {
-      updatedContent[index] = { type: contentPart.type };
+      updatedContent[index] = { type: contentPart.type as AllContentTypes };
     }
 
     if (
-      contentPart.type.startsWith(ContentTypes.TEXT) &&
+      contentType.startsWith(ContentTypes.TEXT) &&
       ContentTypes.TEXT in contentPart &&
       typeof contentPart.text === 'string'
     ) {
-      const currentContent = updatedContent[index] as { type: ContentTypes.TEXT; text: string };
-      updatedContent[index] = {
+      const currentContent = updatedContent[index] as MessageDeltaUpdate;
+      const update: MessageDeltaUpdate = {
         type: ContentTypes.TEXT,
         text: (currentContent.text || '') + contentPart.text,
       };
-    } else if (contentPart.type === 'image_url' && 'image_url' in contentPart) {
-      const currentContent = updatedContent[index] as { type: 'image_url'; image_url: string };
+
+      if (contentPart.tool_call_ids != null) {
+        update.tool_call_ids = contentPart.tool_call_ids;
+      }
+      updatedContent[index] = update;
+    } else if (contentType === ContentTypes.IMAGE_URL && 'image_url' in contentPart) {
+      const currentContent = updatedContent[index] as {
+        type: ContentTypes.IMAGE_URL;
+        image_url: string;
+      };
       updatedContent[index] = {
         ...currentContent,
       };
-    } else if (contentPart.type === ContentTypes.TOOL_CALL && 'tool_call' in contentPart) {
-      const existingContent = updatedContent[index] as Agents.ToolCallContent;
+    } else if (contentType === ContentTypes.TOOL_CALL && 'tool_call' in contentPart) {
+      const existingContent = updatedContent[index] as Agents.ToolCallContent | undefined;
+      const existingToolCall = existingContent?.tool_call;
+      const toolCallArgs = (contentPart.tool_call.args as unknown as string | undefined) ?? '';
 
       const args = finalUpdate
         ? contentPart.tool_call.args
-        : (existingContent?.tool_call?.args || '') + (contentPart.tool_call.args || '');
+        : (existingToolCall?.args ?? '') + toolCallArgs;
 
-      const id = getNonEmptyValue([contentPart.tool_call.id, existingContent?.tool_call?.id]) ?? '';
-      const name =
-        getNonEmptyValue([contentPart.tool_call.name, existingContent?.tool_call?.name]) ?? '';
+      const id = getNonEmptyValue([contentPart.tool_call.id, existingToolCall?.id]) ?? '';
+      const name = getNonEmptyValue([contentPart.tool_call.name, existingToolCall?.name]) ?? '';
 
       const newToolCall: Agents.ToolCall & PartMetadata = {
         id,
@@ -78,16 +116,24 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHan
       };
     }
 
-    return { ...message, content: updatedContent };
+    return { ...message, content: updatedContent as TMessageContentParts[] };
   };
 
   return useCallback(
-    ({ event, data }: TStepEvent) => {
+    ({ event, data }: TStepEvent, submission: EventSubmission) => {
       const messages = getMessages() || [];
+      const { userMessage } = submission;
+      setIsSubmitting(true);
+
+      const currentTime = Date.now();
+      if (currentTime - lastAnnouncementTimeRef.current > MESSAGE_UPDATE_INTERVAL) {
+        announcePolite({ message: 'composing', isStatus: true });
+        lastAnnouncementTimeRef.current = currentTime;
+      }
 
       if (event === 'on_run_step') {
         const runStep = data as Agents.RunStep;
-        const responseMessageId = runStep.runId;
+        const responseMessageId = runStep.runId ?? '';
         if (!responseMessageId) {
           console.warn('No message id found in run step event');
           return;
@@ -98,12 +144,11 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHan
 
         if (!response) {
           const responseMessage = messages[messages.length - 1] as TMessage;
-          const userMessage = messages[messages.length - 2];
 
           response = {
             ...responseMessage,
-            parentMessageId: userMessage?.messageId,
-            conversationId: userMessage?.conversationId,
+            parentMessageId: userMessage.messageId,
+            conversationId: userMessage.conversationId,
             messageId: responseMessageId,
             content: [],
           };
@@ -115,20 +160,23 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHan
         // Store tool call IDs if present
         if (runStep.stepDetails.type === StepTypes.TOOL_CALLS) {
           runStep.stepDetails.tool_calls.forEach((toolCall) => {
-            if ('id' in toolCall && toolCall.id) {
-              toolCallIdMap.current.set(runStep.id, toolCall.id);
+            const toolCallId = toolCall.id ?? '';
+            if ('id' in toolCall && toolCallId) {
+              toolCallIdMap.current.set(runStep.id, toolCallId);
             }
           });
         }
       } else if (event === 'on_message_delta') {
         const messageDelta = data as Agents.MessageDeltaEvent;
         const runStep = stepMap.current.get(messageDelta.id);
-        if (!runStep || !runStep.runId) {
+        const responseMessageId = runStep?.runId ?? '';
+
+        if (!runStep || !responseMessageId) {
           console.warn('No run step or runId found for message delta event');
           return;
         }
 
-        const response = messageMap.current.get(runStep.runId);
+        const response = messageMap.current.get(responseMessageId);
         if (response && messageDelta.delta.content) {
           const contentPart = Array.isArray(messageDelta.delta.content)
             ? messageDelta.delta.content[0]
@@ -136,19 +184,21 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHan
 
           const updatedResponse = updateContent(response, runStep.index, contentPart);
 
-          messageMap.current.set(runStep.runId, updatedResponse);
+          messageMap.current.set(responseMessageId, updatedResponse);
           const currentMessages = getMessages() || [];
           setMessages([...currentMessages.slice(0, -1), updatedResponse]);
         }
       } else if (event === 'on_run_step_delta') {
         const runStepDelta = data as Agents.RunStepDeltaEvent;
         const runStep = stepMap.current.get(runStepDelta.id);
-        if (!runStep || !runStep.runId) {
+        const responseMessageId = runStep?.runId ?? '';
+
+        if (!runStep || !responseMessageId) {
           console.warn('No run step or runId found for run step delta event');
           return;
         }
 
-        const response = messageMap.current.get(runStep.runId);
+        const response = messageMap.current.get(responseMessageId);
         if (
           response &&
           runStepDelta.delta.type === StepTypes.TOOL_CALLS &&
@@ -157,13 +207,13 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHan
           let updatedResponse = { ...response };
 
           runStepDelta.delta.tool_calls.forEach((toolCallDelta) => {
-            const toolCallId = toolCallIdMap.current.get(runStepDelta.id) || '';
+            const toolCallId = toolCallIdMap.current.get(runStepDelta.id) ?? '';
 
             const contentPart: Agents.MessageContentComplex = {
               type: ContentTypes.TOOL_CALL,
               tool_call: {
                 name: toolCallDelta.name ?? '',
-                args: toolCallDelta.args || '',
+                args: toolCallDelta.args ?? '',
                 id: toolCallId,
               },
             };
@@ -171,7 +221,7 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHan
             updatedResponse = updateContent(updatedResponse, runStep.index, contentPart);
           });
 
-          messageMap.current.set(runStep.runId, updatedResponse);
+          messageMap.current.set(responseMessageId, updatedResponse);
           const updatedMessages = messages.map((msg) =>
             msg.messageId === runStep.runId ? updatedResponse : msg,
           );
@@ -184,12 +234,14 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHan
         const { id: stepId } = result;
 
         const runStep = stepMap.current.get(stepId);
-        if (!runStep || !runStep.runId) {
+        const responseMessageId = runStep?.runId ?? '';
+
+        if (!runStep || !responseMessageId) {
           console.warn('No run step or runId found for completed tool call event');
           return;
         }
 
-        const response = messageMap.current.get(runStep.runId);
+        const response = messageMap.current.get(responseMessageId);
         if (response) {
           let updatedResponse = { ...response };
 
@@ -200,7 +252,7 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHan
 
           updatedResponse = updateContent(updatedResponse, runStep.index, contentPart, true);
 
-          messageMap.current.set(runStep.runId, updatedResponse);
+          messageMap.current.set(responseMessageId, updatedResponse);
           const updatedMessages = messages.map((msg) =>
             msg.messageId === runStep.runId ? updatedResponse : msg,
           );
@@ -215,6 +267,6 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHan
         stepMap.current.clear();
       };
     },
-    [getMessages, stepMap, messageMap, setMessages, toolCallIdMap],
+    [getMessages, setIsSubmitting, lastAnnouncementTimeRef, announcePolite, setMessages],
   );
 }
diff --git a/client/src/hooks/useGenerationsByLatest.ts b/client/src/hooks/useGenerationsByLatest.ts
index 8dc37062f26..47bb935129b 100644
--- a/client/src/hooks/useGenerationsByLatest.ts
+++ b/client/src/hooks/useGenerationsByLatest.ts
@@ -3,7 +3,7 @@ import { EModelEndpoint, isAssistantsEndpoint } from 'librechat-data-provider';
 
 type TUseGenerations = {
   endpoint?: string;
-  message: TMessage;
+  message?: TMessage;
   isSubmitting: boolean;
   isEditing?: boolean;
   latestMessage: TMessage | null;
@@ -16,15 +16,25 @@ export default function useGenerationsByLatest({
   isEditing = false,
   latestMessage,
 }: TUseGenerations) {
-  const { error, messageId, searchResult, finish_reason, isCreatedByUser } = message ?? {};
-  const isEditableEndpoint = !![
-    EModelEndpoint.openAI,
-    EModelEndpoint.custom,
-    EModelEndpoint.google,
-    EModelEndpoint.anthropic,
-    EModelEndpoint.gptPlugins,
-    EModelEndpoint.azureOpenAI,
-  ].find((e) => e === endpoint);
+  const {
+    messageId,
+    searchResult = false,
+    error = false,
+    finish_reason = '',
+    isCreatedByUser = false,
+  } = message ?? {};
+  const isEditableEndpoint = Boolean(
+    [
+      EModelEndpoint.openAI,
+      EModelEndpoint.custom,
+      EModelEndpoint.google,
+      EModelEndpoint.agents,
+      EModelEndpoint.bedrock,
+      EModelEndpoint.anthropic,
+      EModelEndpoint.gptPlugins,
+      EModelEndpoint.azureOpenAI,
+    ].find((e) => e === endpoint),
+  );
 
   const continueSupported =
     latestMessage?.messageId === messageId &&
@@ -34,18 +44,20 @@ export default function useGenerationsByLatest({
     !searchResult &&
     isEditableEndpoint;
 
-  const branchingSupported =
-    // 5/21/23: Bing is allowing editing and Message regenerating
-    !![
+  const branchingSupported = Boolean(
+    [
       EModelEndpoint.azureOpenAI,
       EModelEndpoint.openAI,
       EModelEndpoint.custom,
+      EModelEndpoint.agents,
+      EModelEndpoint.bedrock,
       EModelEndpoint.chatGPTBrowser,
       EModelEndpoint.google,
       EModelEndpoint.bingAI,
       EModelEndpoint.gptPlugins,
       EModelEndpoint.anthropic,
-    ].find((e) => e === endpoint);
+    ].find((e) => e === endpoint),
+  );
 
   const regenerateEnabled =
     !isCreatedByUser && !searchResult && !isEditing && !isSubmitting && branchingSupported;
diff --git a/client/src/hooks/useNewConvo.ts b/client/src/hooks/useNewConvo.ts
index 1d5dbeea393..120b0896d58 100644
--- a/client/src/hooks/useNewConvo.ts
+++ b/client/src/hooks/useNewConvo.ts
@@ -5,7 +5,12 @@ import {
   useGetEndpointsQuery,
 } from 'librechat-data-provider/react-query';
 import { useNavigate } from 'react-router-dom';
-import { FileSources, LocalStorageKeys, isAssistantsEndpoint } from 'librechat-data-provider';
+import {
+  FileSources,
+  isParamEndpoint,
+  LocalStorageKeys,
+  isAssistantsEndpoint,
+} from 'librechat-data-provider';
 import { useRecoilState, useRecoilValue, useSetRecoilState, useRecoilCallback } from 'recoil';
 import type {
   TPreset,
@@ -67,7 +72,7 @@ const useNewConvo = (index = 0) => {
       ) => {
         const modelsConfig = modelsData ?? modelsQuery.data;
         const { endpoint = null } = conversation;
-        const buildDefaultConversation = endpoint === null || buildDefault;
+        const buildDefaultConversation = (endpoint === null || buildDefault) ?? false;
         const activePreset =
           // use default preset only when it's defined,
           // preset is not provided,
@@ -95,27 +100,24 @@ const useNewConvo = (index = 0) => {
 
           const isAssistantEndpoint = isAssistantsEndpoint(defaultEndpoint);
           const assistants: AssistantListItem[] = assistantsListMap[defaultEndpoint] ?? [];
+          const currentAssistantId = conversation.assistant_id ?? '';
+          const currentAssistant = assistantsListMap[defaultEndpoint]?.[currentAssistantId] as
+            | AssistantListItem
+            | undefined;
 
-          if (
-            conversation.assistant_id &&
-            !assistantsListMap[defaultEndpoint]?.[conversation.assistant_id]
-          ) {
+          if (currentAssistantId && !currentAssistant) {
             conversation.assistant_id = undefined;
           }
 
-          if (!conversation.assistant_id && isAssistantEndpoint) {
+          if (!currentAssistantId && isAssistantEndpoint) {
             conversation.assistant_id =
               localStorage.getItem(
                 `${LocalStorageKeys.ASST_ID_PREFIX}${index}${defaultEndpoint}`,
               ) ?? assistants[0]?.id;
           }
 
-          if (
-            conversation.assistant_id &&
-            isAssistantEndpoint &&
-            conversation.conversationId === 'new'
-          ) {
-            const assistant = assistants.find((asst) => asst.id === conversation.assistant_id);
+          if (currentAssistantId && isAssistantEndpoint && conversation.conversationId === 'new') {
+            const assistant = assistants.find((asst) => asst.id === currentAssistantId);
             conversation.model = assistant?.model;
             updateLastSelectedModel({
               endpoint: defaultEndpoint,
@@ -123,7 +125,7 @@ const useNewConvo = (index = 0) => {
             });
           }
 
-          if (conversation.assistant_id && !isAssistantEndpoint) {
+          if (currentAssistantId && !isAssistantEndpoint) {
             conversation.assistant_id = undefined;
           }
 
@@ -136,17 +138,17 @@ const useNewConvo = (index = 0) => {
           });
         }
 
-        if (!keepAddedConvos) {
+        if (!(keepAddedConvos ?? false)) {
           clearAllConversations(true);
         }
         setConversation(conversation);
         setSubmission({} as TSubmission);
-        if (!keepLatestMessage) {
+        if (!(keepLatestMessage ?? false)) {
           clearAllLatestMessages();
         }
 
         if (conversation.conversationId === 'new' && !modelsData) {
-          const appTitle = localStorage.getItem(LocalStorageKeys.APP_TITLE);
+          const appTitle = localStorage.getItem(LocalStorageKeys.APP_TITLE) ?? '';
           if (appTitle) {
             document.title = appTitle;
           }
@@ -166,7 +168,7 @@ const useNewConvo = (index = 0) => {
 
   const newConversation = useCallback(
     ({
-      template = {},
+      template: _template = {},
       preset: _preset,
       modelsData,
       buildDefault = true,
@@ -182,6 +184,15 @@ const useNewConvo = (index = 0) => {
     } = {}) => {
       pauseGlobalAudio();
 
+      const templateConvoId = _template.conversationId ?? '';
+      const paramEndpoint =
+        isParamEndpoint(_template.endpoint ?? '', _template.endpointType ?? '') === true ||
+        isParamEndpoint(_preset?.endpoint ?? '', _preset?.endpointType ?? '');
+      const template =
+        paramEndpoint === true && templateConvoId && templateConvoId === 'new'
+          ? { endpoint: _template.endpoint }
+          : _template;
+
       const conversation = {
         conversationId: 'new',
         title: 'New Chat',
@@ -193,7 +204,12 @@ const useNewConvo = (index = 0) => {
 
       let preset = _preset;
       const defaultModelSpec = getDefaultModelSpec(startupConfig?.modelSpecs?.list);
-      if (!preset && startupConfig && startupConfig.modelSpecs?.prioritize && defaultModelSpec) {
+      if (
+        !preset &&
+        startupConfig &&
+        startupConfig.modelSpecs?.prioritize === true &&
+        defaultModelSpec
+      ) {
         preset = {
           ...defaultModelSpec.preset,
           iconURL: getModelSpecIconURL(defaultModelSpec),
@@ -203,10 +219,17 @@ const useNewConvo = (index = 0) => {
 
       if (conversation.conversationId === 'new' && !modelsData) {
         const filesToDelete = Array.from(files.values())
-          .filter((file) => file.filepath && file.source && !file.embedded && file.temp_file_id)
+          .filter(
+            (file) =>
+              file.filepath != null &&
+              file.filepath !== '' &&
+              file.source &&
+              !(file.embedded ?? false) &&
+              file.temp_file_id,
+          )
           .map((file) => ({
             file_id: file.file_id,
-            embedded: !!file.embedded,
+            embedded: !!(file.embedded ?? false),
             filepath: file.filepath as string,
             source: file.source as FileSources, // Ensure that the source is of type FileSources
           }));
diff --git a/client/src/localization/languages/Br.ts b/client/src/localization/languages/Br.ts
index 011ac2598b8..8f4bd4a6b92 100644
--- a/client/src/localization/languages/Br.ts
+++ b/client/src/localization/languages/Br.ts
@@ -3,71 +3,110 @@
 // file deepcode ignore HardcodedNonCryptoSecret: No hardcoded secrets present in this file
 
 export default {
+  com_nav_convo_menu_options: 'Opções do Menu de Conversa',
+  com_ui_artifacts: 'Artefatos',
+  com_ui_artifacts_toggle: 'Alternar UI de Artefatos',
+  com_nav_info_code_artifacts: 'Habilita a exibição de artefatos de código experimental ao lado do chat',
+  com_ui_include_shadcnui: 'Incluir instruções de componentes shadcn/ui',
+  com_nav_info_include_shadcnui: 'Quando habilitado, as instruções para usar componentes shadcn/ui serão incluídas. shadcn/ui é uma coleção de componentes reutilizáveis construídos usando Radix UI e Tailwind CSS. Nota: estas são instruções longas, você deve habilitar apenas se for importante informar o LLM sobre as importações e componentes corretos. Para mais informações sobre esses componentes, visite: https://ui.shadcn.com/',
+  com_ui_custom_prompt_mode: 'Modo de Prompt Personalizado',
+  com_nav_info_custom_prompt_mode: 'Quando habilitado, o prompt padrão do sistema de artefatos não será incluído. Todas as instruções de geração de artefatos devem ser fornecidas manualmente neste modo.',
+  com_ui_artifact_click: 'Clique para abrir',
+  com_a11y_start: 'A IA começou a responder.',
+  com_a11y_ai_composing: 'A IA ainda está compondo.',
+  com_a11y_end: 'A IA terminou de responder.',
+  com_error_moderation: 'Parece que o conteúdo enviado foi sinalizado pelo nosso sistema de moderação por não estar alinhado com nossas diretrizes da comunidade. Não podemos prosseguir com este tópico específico. Se você tiver outras perguntas ou tópicos que gostaria de explorar, edite sua mensagem ou crie uma nova conversa.',
+  com_error_no_user_key: 'Nenhuma chave encontrada. Por favor, forneça uma chave e tente novamente.',
+  com_error_no_base_url: 'Nenhuma URL base encontrada. Por favor, forneça uma e tente novamente.',
+  com_error_invalid_user_key: 'Chave fornecida inválida. Por favor, forneça uma chave válida e tente novamente.',
+  com_error_expired_user_key: 'A chave fornecida para {0} expirou em {1}. Por favor, forneça uma nova chave e tente novamente.',
+  com_error_input_length: 'A contagem de tokens da última mensagem é muito longa, excedendo o limite de tokens ({0} respectivamente). Por favor, encurte sua mensagem, ajuste o tamanho máximo do contexto nos parâmetros da conversa ou divida a conversa para continuar.',
   com_files_no_results: 'Nenhum resultado.',
   com_files_filter: 'Filtrar arquivos...',
   com_files_number_selected: '{0} de {1} arquivo(s) selecionado(s)',
   com_sidepanel_select_assistant: 'Selecionar um Assistente',
+  com_sidepanel_parameters: 'Parâmetros',
   com_sidepanel_assistant_builder: 'Construtor de Assistente',
   com_sidepanel_hide_panel: 'Ocultar Painel',
   com_sidepanel_attach_files: 'Anexar Arquivos',
   com_sidepanel_manage_files: 'Gerenciar Arquivos',
-  com_sidepanel_conversation_tags: 'Favoritos',
+  com_sidepanel_conversation_tags: 'Marcadores',
   com_assistants_capabilities: 'Capacidades',
+  com_assistants_file_search: 'Pesquisa de Arquivos',
+  com_assistants_file_search_info: 'A pesquisa de arquivos permite que o assistente tenha conhecimento dos arquivos que você ou seus usuários carregam. Uma vez que um arquivo é carregado, o assistente decide automaticamente quando recuperar o conteúdo com base nas solicitações do usuário. Anexar armazenamentos vetoriais para Pesquisa de Arquivos ainda não é suportado. Você pode anexá-los no Playground do Provedor ou anexar arquivos às mensagens para pesquisa de arquivos em uma base de thread.',
+  com_assistants_code_interpreter_info: 'O Interpretador de Código permite que o assistente escreva e execute código. Esta ferramenta pode processar arquivos com dados e formatações diversas, e gerar arquivos como gráficos.',
   com_assistants_knowledge: 'Conhecimento',
-  com_assistants_knowledge_info:
-    'Se você enviar arquivos de Conhecimento, as conversas com seu Assistente podem incluir o conteúdo dos arquivos.',
-  com_assistants_knowledge_disabled:
-    'O Assistente deve ser criado, e o Interpretador de Código ou Recuperação devem ser habilitados e salvos antes de enviar arquivos como Conhecimento.',
+  com_assistants_knowledge_info: 'Se você carregar arquivos em Conhecimento, as conversas com seu Assistente podem incluir o conteúdo dos arquivos.',
+  com_assistants_knowledge_disabled: 'O assistente deve ser criado, e o Interpretador de Código ou Recuperação deve ser habilitado e salvo antes de carregar arquivos como Conhecimento.',
   com_assistants_image_vision: 'Visão de Imagem',
   com_assistants_code_interpreter: 'Interpretador de Código',
-  com_assistants_code_interpreter_files:
-    'Os seguintes arquivos estão disponíveis apenas para o Interpretador de Código:',
+  com_assistants_code_interpreter_files: 'Os arquivos abaixo são apenas para o Interpretador de Código:',
   com_assistants_retrieval: 'Recuperação',
   com_assistants_search_name: 'Pesquisar assistentes por nome',
   com_assistants_tools: 'Ferramentas',
   com_assistants_actions: 'Ações',
   com_assistants_add_tools: 'Adicionar Ferramentas',
   com_assistants_add_actions: 'Adicionar Ações',
+  com_assistants_non_retrieval_model: 'A pesquisa de arquivos não está habilitada neste modelo. Por favor, selecione outro modelo.',
   com_assistants_available_actions: 'Ações Disponíveis',
   com_assistants_running_action: 'Executando ação',
-  com_assistants_completed_action: 'Falou com {0}',
+  com_assistants_completed_action: 'Conversou com {0}',
   com_assistants_completed_function: 'Executou {0}',
-  com_assistants_function_use: 'O Assistente usou {0}',
-  com_assistants_domain_info: 'O Assistente enviou esta informação para {0}',
-  com_assistants_delete_actions_success: 'Ação excluída do Assistente com sucesso',
+  com_assistants_function_use: 'Assistente usou {0}',
+  com_assistants_domain_info: 'Assistente enviou esta informação para {0}',
+  com_assistants_delete_actions_success: 'Ação excluída com sucesso do Assistente',
   com_assistants_update_actions_success: 'Ação criada ou atualizada com sucesso',
-  com_assistants_update_actions_error: 'Ocorreu um erro ao criar ou atualizar a ação.',
-  com_assistants_delete_actions_error: 'Ocorreu um erro ao excluir a ação.',
-  com_assistants_actions_info:
-    'Permita que seu Assistente recupere informações ou execute ações via APIs',
+  com_assistants_update_actions_error: 'Houve um erro ao criar ou atualizar a ação.',
+  com_assistants_delete_actions_error: 'Houve um erro ao excluir a ação.',
+  com_assistants_actions_info: 'Permita que seu Assistente recupere informações ou execute ações via API\'s',
   com_assistants_name_placeholder: 'Opcional: O nome do assistente',
   com_assistants_instructions_placeholder: 'As instruções do sistema que o assistente usa',
   com_assistants_description_placeholder: 'Opcional: Descreva seu Assistente aqui',
   com_assistants_actions_disabled: 'Você precisa criar um assistente antes de adicionar ações.',
   com_assistants_update_success: 'Atualizado com sucesso',
-  com_assistants_update_error: 'Ocorreu um erro ao atualizar seu assistente.',
+  com_assistants_update_error: 'Houve um erro ao atualizar seu assistente.',
   com_assistants_create_success: 'Criado com sucesso',
-  com_assistants_create_error: 'Ocorreu um erro ao criar seu assistente.',
-  com_ui_attach_error_type: 'Tipo de arquivo não suportado para endpoint:',
-  com_ui_attach_error_size: 'Limite de tamanho de arquivo excedido para endpoint:',
-  com_ui_attach_error:
-    'Não é possível anexar arquivo. Crie ou selecione uma conversa ou tente atualizar a página.',
+  com_assistants_create_error: 'Houve um erro ao criar seu assistente.',
+  com_assistants_conversation_starters: 'Iniciadores de Conversa',
+  com_assistants_conversation_starters_placeholder: 'Digite um iniciador de conversa',
+  com_sidepanel_agent_builder: 'Construtor de Agente',
+  com_agents_name_placeholder: 'Opcional: O nome do agente',
+  com_agents_description_placeholder: 'Opcional: Descreva seu Agente aqui',
+  com_agents_instructions_placeholder: 'As instruções do sistema que o agente usa',
+  com_agents_search_name: 'Pesquisar agentes por nome',
+  com_agents_update_error: 'Houve um erro ao atualizar seu agente.',
+  com_agents_create_error: 'Houve um erro ao criar seu agente.',
+  com_ui_date_today: 'Hoje',
+  com_ui_date_yesterday: 'Ontem',
+  com_ui_date_previous_7_days: 'Últimos 7 dias',
+  com_ui_date_previous_30_days: 'Últimos 30 dias',
+  com_ui_date_january: 'Janeiro',
+  com_ui_date_february: 'Fevereiro',
+  com_ui_date_march: 'Março',
+  com_ui_date_april: 'Abril',
+  com_ui_date_may: 'Maio',
+  com_ui_date_june: 'Junho',
+  com_ui_date_july: 'Julho',
+  com_ui_date_august: 'Agosto',
+  com_ui_date_september: 'Setembro',
+  com_ui_date_october: 'Outubro',
+  com_ui_date_november: 'Novembro',
+  com_ui_date_december: 'Dezembro',
+  com_ui_field_required: 'Este campo é obrigatório',
+  com_ui_download_error: 'Erro ao baixar o arquivo. O arquivo pode ter sido excluído.',
+  com_ui_attach_error_type: 'Tipo de arquivo não suportado para o endpoint:',
+  com_ui_attach_error_openai: 'Não é possível anexar arquivos de Assistente a outros endpoints',
+  com_ui_attach_warn_endpoint: 'Arquivos não compatíveis podem ser ignorados sem uma ferramenta compatível',
+  com_ui_attach_error_size: 'Limite de tamanho de arquivo excedido para o endpoint:',
+  com_ui_attach_error: 'Não é possível anexar o arquivo. Crie ou selecione uma conversa, ou tente atualizar a página.',
   com_ui_examples: 'Exemplos',
-  com_ui_new_chat: 'Nova Conversa',
+  com_ui_new_chat: 'Novo chat',
   com_ui_happy_birthday: 'É meu 1º aniversário!',
-  com_ui_example_quantum_computing: 'Explique computação quântica em termos simples',
-  com_ui_example_10_year_old_b_day: 'Tem alguma ideia criativa para o aniversário de 10 anos?',
-  com_ui_example_http_in_js: 'Como faço uma requisição HTTP em Javascript?',
-  com_ui_capabilities: 'Capacidades',
-  com_ui_capability_remember: 'Lembra o que o usuário disse anteriormente na conversa',
-  com_ui_capability_correction: 'Permite que o usuário forneça correções de acompanhamento',
-  com_ui_capability_decline_requests: 'Treinado para recusar solicitações inadequadas',
-  com_ui_limitations: 'Limitações',
-  com_ui_limitation_incorrect_info: 'Pode ocasionalmente gerar informações incorretas',
-  com_ui_limitation_harmful_biased:
-    'Pode ocasionalmente produzir instruções prejudiciais ou conteúdo enviesado',
-  com_ui_limitation_limited_2021: 'Conhecimento limitado do mundo e eventos após 2021',
   com_ui_experimental: 'Recursos Experimentais',
+  com_ui_on: 'Ligado',
+  com_ui_off: 'Desligado',
+  com_ui_yes: 'Sim',
+  com_ui_no: 'Não',
   com_ui_ascending: 'Asc',
   com_ui_descending: 'Desc',
   com_ui_show_all: 'Mostrar Todos',
@@ -82,95 +121,195 @@ export default {
   com_ui_instructions: 'Instruções',
   com_ui_description: 'Descrição',
   com_ui_error: 'Erro',
+  com_ui_error_connection: 'Erro ao conectar ao servidor, tente atualizar a página.',
   com_ui_select: 'Selecionar',
   com_ui_input: 'Entrada',
   com_ui_close: 'Fechar',
+  com_ui_endpoint: 'Endpoint',
+  com_ui_provider: 'Provedor',
   com_ui_model: 'Modelo',
+  com_ui_model_parameters: 'Parâmetros do Modelo',
+  com_ui_model_save_success: 'Parâmetros do modelo salvos com sucesso',
   com_ui_select_model: 'Selecionar um modelo',
+  com_ui_select_provider: 'Selecionar um provedor',
+  com_ui_select_provider_first: 'Selecione um provedor primeiro',
   com_ui_select_search_model: 'Pesquisar modelo por nome',
   com_ui_select_search_plugin: 'Pesquisar plugin por nome',
   com_ui_use_prompt: 'Usar prompt',
-  com_ui_prev: 'Ant',
-  com_ui_next: 'Próx',
+  com_ui_prev: 'Anterior',
+  com_ui_next: 'Próximo',
   com_ui_stop: 'Parar',
   com_ui_upload_files: 'Carregar arquivos',
-  com_ui_prompt_templates: 'Modelos de Prompt',
-  com_ui_hide_prompt_templates: 'Ocultar Modelos de Prompt',
+  com_ui_prompt: 'Prompt',
+  com_ui_prompts: 'Prompts',
+  com_ui_prompt_name: 'Nome do Prompt',
+  com_ui_delete_prompt: 'Excluir Prompt?',
+  com_ui_admin: 'Admin',
+  com_ui_simple: 'Simples',
+  com_ui_versions: 'Versões',
+  com_ui_version_var: 'Versão {0}',
+  com_ui_advanced: 'Avançado',
+  com_ui_admin_settings: 'Configurações de Admin',
+  com_ui_error_save_admin_settings: 'Houve um erro ao salvar suas configurações de admin.',
+  com_ui_prompt_preview_not_shared: 'O autor não permitiu colaboração para este prompt.',
+  com_ui_prompt_name_required: 'Nome do Prompt é obrigatório',
+  com_ui_prompt_text_required: 'Texto é obrigatório',
+  com_ui_prompt_text: 'Texto',
+  com_ui_back_to_chat: 'Voltar ao Chat',
+  com_ui_back_to_prompts: 'Voltar aos Prompts',
+  com_ui_categories: 'Categorias',
+  com_ui_filter_prompts_name: 'Filtrar prompts por nome',
+  com_ui_search_categories: 'Pesquisar Categorias',
+  com_ui_manage: 'Gerenciar',
+  com_ui_variables: 'Variáveis',
+  com_ui_variables_info: 'Use chaves duplas no seu texto para criar variáveis, por exemplo, `{{exemplo de variável}}`, para preencher posteriormente ao usar o prompt.',
+  com_ui_special_variables: 'Variáveis especiais:',
+  com_ui_special_variables_info: 'Use `{{current_date}}` para a data atual, e `{{current_user}}` para o nome da sua conta.',
+  com_ui_dropdown_variables: 'Variáveis de dropdown:',
+  com_ui_dropdown_variables_info: 'Crie menus dropdown personalizados para seus prompts: `{{nome_da_variável:opção1|opção2|opção3}}`',
   com_ui_showing: 'Mostrando',
   com_ui_of: 'de',
   com_ui_entries: 'Entradas',
   com_ui_pay_per_call: 'Todas as conversas de IA em um só lugar. Pague por chamada e não por mês',
   com_ui_new_footer: 'Todas as conversas de IA em um só lugar.',
+  com_ui_latest_footer: 'Toda IA para Todos.',
   com_ui_enter: 'Entrar',
   com_ui_submit: 'Enviar',
+  com_ui_none_selected: 'Nenhum selecionado',
   com_ui_upload_success: 'Arquivo carregado com sucesso',
-  com_ui_upload_error: 'Ocorreu um erro ao carregar seu arquivo',
+  com_ui_upload_error: 'Houve um erro ao carregar seu arquivo',
+  com_ui_upload_invalid: 'Arquivo inválido para upload. Deve ser uma imagem não excedendo o limite',
+  com_ui_upload_invalid_var: 'Arquivo inválido para upload. Deve ser uma imagem não excedendo {0} MB',
   com_ui_cancel: 'Cancelar',
   com_ui_save: 'Salvar',
+  com_ui_renaming_var: 'Renomeando "{0}"',
   com_ui_save_submit: 'Salvar & Enviar',
   com_user_message: 'Você',
+  com_ui_read_aloud: 'Ler em voz alta',
+  com_ui_copied: 'Copiado!',
+  com_ui_copy_code: 'Copiar código',
   com_ui_copy_to_clipboard: 'Copiar para a área de transferência',
   com_ui_copied_to_clipboard: 'Copiado para a área de transferência',
+  com_ui_fork: 'Bifurcar',
+  com_ui_fork_info_1: 'Use esta configuração para bifurcar mensagens com o comportamento desejado.',
+  com_ui_fork_info_2: '"Bifurcação" refere-se à criação de uma nova conversa que começa/termina a partir de mensagens específicas na conversa atual, criando uma cópia de acordo com as opções selecionadas.',
+  com_ui_fork_info_3: 'A "mensagem alvo" refere-se à mensagem da qual este popup foi aberto, ou, se você marcar "{0}", a última mensagem na conversa.',
+  com_ui_fork_info_visible: 'Esta opção bifurca apenas as mensagens visíveis; em outras palavras, o caminho direto para a mensagem alvo, sem quaisquer ramificações.',
+  com_ui_fork_info_branches: 'Esta opção bifurca as mensagens visíveis, junto com ramificações relacionadas; em outras palavras, o caminho direto para a mensagem alvo, incluindo ramificações ao longo do caminho.',
+  com_ui_fork_info_target: 'Esta opção bifurca todas as mensagens até a mensagem alvo, incluindo seus vizinhos; em outras palavras, todos os ramos de mensagens, estejam ou não visíveis ou ao longo do mesmo caminho, estão incluídos.',
+  com_ui_fork_info_start: 'Se marcado, a bifurcação começará desta mensagem até a última mensagem na conversa, de acordo com o comportamento selecionado acima.',
+  com_ui_fork_info_remember: 'Marque isto para lembrar as opções que você seleciona para uso futuro, tornando mais rápido bifurcar conversas conforme preferido.',
+  com_ui_fork_success: 'Conversa bifurcada com sucesso',
+  com_ui_fork_processing: 'Bifurcando conversa...',
+  com_ui_fork_error: 'Houve um erro ao bifurcar a conversa',
+  com_ui_fork_change_default: 'Opção de bifurcação padrão',
+  com_ui_fork_default: 'Usar opção de bifurcação padrão',
+  com_ui_fork_remember: 'Lembrar',
+  com_ui_fork_split_target_setting: 'Iniciar bifurcação a partir da mensagem alvo por padrão',
+  com_ui_fork_split_target: 'Iniciar bifurcação aqui',
+  com_ui_fork_remember_checked: 'Sua seleção será lembrada após o uso. Altere isso a qualquer momento nas configurações.',
+  com_ui_fork_all_target: 'Incluir todos para/de aqui',
+  com_ui_fork_branches: 'Incluir ramificações relacionadas',
+  com_ui_fork_visible: 'Apenas mensagens visíveis',
+  com_ui_fork_from_message: 'Selecione uma opção de bifurcação',
+  com_ui_mention: 'Mencione um endpoint, assistente ou predefinição para alternar rapidamente para ele',
+  com_ui_add_model_preset: 'Adicionar um modelo ou predefinição para uma resposta adicional',
+  com_assistants_max_starters_reached: 'Número máximo de iniciadores de conversa atingido',
   com_ui_regenerate: 'Regenerar',
   com_ui_continue: 'Continuar',
   com_ui_edit: 'Editar',
+  com_ui_loading: 'Carregando...',
   com_ui_success: 'Sucesso',
   com_ui_all: 'todos',
+  com_ui_all_proper: 'Todos',
   com_ui_clear: 'Limpar',
   com_ui_revoke: 'Revogar',
   com_ui_revoke_info: 'Revogar todas as credenciais fornecidas pelo usuário',
   com_ui_import_conversation: 'Importar',
-  com_ui_import_conversation_info: 'Importe conversas de um arquivo JSON',
+  com_ui_nothing_found: 'Nada encontrado',
+  com_ui_go_to_conversation: 'Ir para a conversa',
+  com_ui_import_conversation_info: 'Importar conversas de um arquivo JSON',
   com_ui_import_conversation_success: 'Conversas importadas com sucesso',
   com_ui_import_conversation_error: 'Houve um erro ao importar suas conversas',
+  com_ui_import_conversation_file_type_error: 'Tipo de importação não suportado',
   com_ui_confirm_action: 'Confirmar Ação',
-  com_ui_chats: 'conversas',
+  com_ui_chat: 'Chat',
+  com_ui_chat_history: 'Histórico de Chat',
+  com_ui_controls: 'Controles',
+  com_ui_dashboard: 'Painel',
+  com_ui_chats: 'chats',
   com_ui_avatar: 'Avatar',
   com_ui_unknown: 'Desconhecido',
   com_ui_result: 'Resultado',
   com_ui_image_gen: 'Geração de Imagem',
   com_ui_assistant: 'Assistente',
+  com_ui_assistant_deleted: 'Assistente excluído com sucesso',
+  com_ui_assistant_delete_error: 'Houve um erro ao excluir o assistente',
   com_ui_assistants: 'Assistentes',
   com_ui_attachment: 'Anexo',
   com_ui_assistants_output: 'Saída dos Assistentes',
+  com_ui_agent: 'Agente',
+  com_ui_agent_deleted: 'Agente excluído com sucesso',
+  com_ui_agent_delete_error: 'Houve um erro ao excluir o agente',
+  com_ui_agents: 'Agentes',
+  com_ui_delete_agent_confirm: 'Tem certeza de que deseja excluir este agente?',
   com_ui_delete: 'Excluir',
   com_ui_create: 'Criar',
+  com_ui_create_prompt: 'Criar Prompt',
   com_ui_share: 'Compartilhar',
+  com_ui_share_var: 'Compartilhar {0}',
+  com_ui_enter_var: 'Inserir {0}',
   com_ui_copy_link: 'Copiar link',
   com_ui_update_link: 'Atualizar link',
   com_ui_create_link: 'Criar link',
-  com_ui_share_link_to_chat: 'Compartilhar link no chat',
-  com_ui_share_error: 'Ocorreu um erro ao compartilhar o link do chat',
-  com_ui_share_retrieve_error: 'Ocorreu um erro ao excluir o link compartilhado.',
-  com_ui_share_delete_error: 'Ocorreu um erro ao excluir o link compartilhado.',
-  com_ui_share_create_message:
-    'Seu nome e quaisquer mensagens que você adicionar após o compartilhamento permanecem privadas.',
-  com_ui_share_created_message:
-    'Um link compartilhado para o seu chat foi criado. Gerencie conversas compartilhadas previamente a qualquer momento via Configurações.',
-  com_ui_share_update_message:
-    'Seu nome, instruções personalizadas e quaisquer mensagens que você adicionar após o compartilhamento permanecem privadas.',
-  com_ui_share_updated_message:
-    'Um link compartilhado para o seu chat foi atualizado. Gerencie conversas compartilhadas previamente a qualquer momento via Configurações.',
+  com_ui_share_to_all_users: 'Compartilhar com todos os usuários',
+  com_ui_my_prompts: 'Meus Prompts',
+  com_ui_no_category: 'Sem categoria',
+  com_ui_shared_prompts: 'Prompts Compartilhados',
+  com_ui_prompts_allow_use: 'Permitir uso de Prompts',
+  com_ui_prompts_allow_create: 'Permitir criação de Prompts',
+  com_ui_prompts_allow_share_global: 'Permitir compartilhamento de Prompts com todos os usuários',
+  com_ui_prompt_shared_to_all: 'Este prompt é compartilhado com todos os usuários',
+  com_ui_prompt_update_error: 'Houve um erro ao atualizar o prompt',
+  com_ui_prompt_already_shared_to_all: 'Este prompt já está compartilhado com todos os usuários',
+  com_ui_description_placeholder: 'Opcional: Insira uma descrição para exibir para o prompt',
+  com_ui_command_placeholder: 'Opcional: Insira um comando para o prompt ou o nome será usado.',
+  com_ui_command_usage_placeholder: 'Selecione um Prompt por comando ou nome',
+  com_ui_no_prompt_description: 'Nenhuma descrição encontrada.',
+  com_ui_share_link_to_chat: 'Compartilhar link para o chat',
+  com_ui_share_error: 'Houve um erro ao compartilhar o link do chat',
+  com_ui_share_retrieve_error: 'Houve um erro ao recuperar os links compartilhados',
+  com_ui_share_delete_error: 'Houve um erro ao excluir o link compartilhado',
+  com_ui_share_create_message: 'Seu nome e quaisquer mensagens que você adicionar após o compartilhamento permanecerão privadas.',
+  com_ui_share_created_message: 'Um link compartilhado para o seu chat foi criado. Gerencie chats compartilhados anteriormente a qualquer momento via Configurações.',
+  com_ui_share_update_message: 'Seu nome, instruções personalizadas e quaisquer mensagens que você adicionar após o compartilhamento permanecerão privadas.',
+  com_ui_share_updated_message: 'Um link compartilhado para o seu chat foi atualizado. Gerencie chats compartilhados anteriormente a qualquer momento via Configurações.',
   com_ui_shared_link_not_found: 'Link compartilhado não encontrado',
-  com_ui_delete_conversation: 'Excluir conversa?',
+  com_ui_delete_conversation: 'Excluir chat?',
   com_ui_delete_confirm: 'Isso excluirá',
-  com_ui_delete_assistant_confirm:
-    'Tem certeza de que deseja excluir este Assistente? Esta ação não pode ser desfeita.',
+  com_ui_delete_tool: 'Excluir Ferramenta',
+  com_ui_delete_tool_confirm: 'Tem certeza de que deseja excluir esta ferramenta?',
+  com_ui_delete_action: 'Excluir Ação',
+  com_ui_delete_action_confirm: 'Tem certeza de que deseja excluir esta ação?',
+  com_ui_delete_confirm_prompt_version_var: 'Isso excluirá a versão selecionada para "{0}". Se não houver outras versões, o prompt será excluído.',
+  com_ui_delete_assistant_confirm: 'Tem certeza de que deseja excluir este Assistente? Isso não pode ser desfeito.',
   com_ui_rename: 'Renomear',
   com_ui_archive: 'Arquivar',
-  com_ui_archive_error: 'Ocorreu um erro ao arquivar a conversa.',
+  com_ui_archive_error: 'Falha ao arquivar conversa',
   com_ui_unarchive: 'Desarquivar',
-  com_ui_unarchive_error: 'Ocorreu um erro ao desarquivar a conversa.',
+  com_ui_unarchive_error: 'Falha ao desarquivar conversa',
   com_ui_more_options: 'Mais',
-  com_ui_preview: 'Visualizar',
+  com_ui_preview: 'Pré-visualizar',
   com_ui_upload: 'Carregar',
   com_ui_connect: 'Conectar',
-  com_ui_upload_delay:
-    'O envio de "{0}" está levando mais tempo do que o esperado. Aguarde enquanto o arquivo é indexado para recuperação.',
-  com_ui_privacy_policy: 'Política de privacidade',
-  com_ui_terms_of_service: 'Termos de serviço',
+  com_ui_locked: 'Bloqueado',
+  com_ui_upload_delay: 'O upload de "{0}" está demorando mais do que o esperado. Por favor, aguarde enquanto o arquivo termina de ser indexado para recuperação.',
+  com_ui_privacy_policy: 'Política de Privacidade',
+  com_ui_terms_of_service: 'Termos de Serviço',
+  com_ui_use_micrphone: 'Usar microfone',
+  com_ui_min_tags: 'Não é possível remover mais valores, um mínimo de {0} é necessário.',
+  com_ui_max_tags: 'O número máximo permitido é {0}, usando os valores mais recentes.',
   com_ui_bookmarks: 'Favoritos',
-  com_ui_bookmarks_rebuild: 'Reconstruir',
   com_ui_bookmarks_new: 'Novo Favorito',
   com_ui_bookmark_delete_confirm: 'Tem certeza de que deseja excluir este favorito?',
   com_ui_bookmarks_title: 'Título',
@@ -179,84 +318,89 @@ export default {
   com_ui_bookmarks_create_success: 'Favorito criado com sucesso',
   com_ui_bookmarks_update_success: 'Favorito atualizado com sucesso',
   com_ui_bookmarks_delete_success: 'Favorito excluído com sucesso',
+  com_ui_bookmarks_create_exists: 'Este favorito já existe',
   com_ui_bookmarks_create_error: 'Houve um erro ao criar o favorito',
   com_ui_bookmarks_update_error: 'Houve um erro ao atualizar o favorito',
   com_ui_bookmarks_delete_error: 'Houve um erro ao excluir o favorito',
   com_ui_bookmarks_add_to_conversation: 'Adicionar à conversa atual',
-  com_ui_accept: 'Eu aceito',
-  com_ui_decline: 'Eu não aceito',
-  com_ui_terms_and_conditions: 'Termos e Condições',
-  com_ui_no_terms_content: 'Nenhum conteúdo de termos e condições para exibir',
-  com_auth_error_login:
-    'Não foi possível fazer login com as informações fornecidas. Por favor, verifique suas credenciais e tente novamente.',
-  com_auth_error_login_rl:
-    'Muitas tentativas de login em um curto período de tempo. Por favor, tente novamente mais tarde.',
-  com_auth_error_login_ban:
-    'Sua conta foi temporariamente banida devido a violações de nosso serviço.',
-  com_auth_error_login_server:
-    'Ocorreu um erro interno do servidor. Aguarde alguns instantes e tente novamente.',
+  com_ui_bookmarks_filter: 'Filtrar favoritos...',
+  com_ui_no_bookmarks: 'Parece que você ainda não tem favoritos. Clique em um chat e adicione um novo',
+  com_ui_no_conversation_id: 'Nenhum ID de conversa encontrado',
+  com_auth_error_login: 'Não foi possível fazer login com as informações fornecidas. Por favor, verifique suas credenciais e tente novamente.',
+  com_auth_error_login_rl: 'Muitas tentativas de login em um curto período de tempo. Por favor, tente novamente mais tarde.',
+  com_auth_error_login_ban: 'Sua conta foi temporariamente banida devido a violações do nosso serviço.',
+  com_auth_error_login_server: 'Houve um erro interno no servidor. Por favor, aguarde alguns momentos e tente novamente.',
+  com_auth_error_login_unverified: 'Sua conta não foi verificada. Por favor, verifique seu e-mail para um link de verificação.',
   com_auth_no_account: 'Não tem uma conta?',
   com_auth_sign_up: 'Inscrever-se',
   com_auth_sign_in: 'Entrar',
-  com_auth_google_login: 'Continuar com o Google',
-  com_auth_facebook_login: 'Continuar com o Facebook',
-  com_auth_github_login: 'Continuar com o Github',
-  com_auth_discord_login: 'Continuar com o Discord',
-  com_auth_email: 'Email',
-  com_auth_email_required: 'O email é obrigatório',
-  com_auth_email_min_length: 'O email deve ter pelo menos 6 caracteres',
-  com_auth_email_max_length: 'O email não deve ter mais de 120 caracteres',
-  com_auth_email_pattern: 'Você deve inserir um endereço de email válido',
-  com_auth_email_address: 'Endereço de email',
+  com_auth_google_login: 'Continuar com Google',
+  com_auth_facebook_login: 'Continuar com Facebook',
+  com_auth_github_login: 'Continuar com Github',
+  com_auth_discord_login: 'Continuar com Discord',
+  com_auth_email: 'E-mail',
+  com_auth_email_required: 'E-mail é obrigatório',
+  com_auth_email_min_length: 'O e-mail deve ter pelo menos 6 caracteres',
+  com_auth_email_max_length: 'O e-mail não deve ter mais de 120 caracteres',
+  com_auth_email_pattern: 'Você deve inserir um endereço de e-mail válido',
+  com_auth_email_address: 'Endereço de e-mail',
   com_auth_password: 'Senha',
-  com_auth_password_required: 'A senha é obrigatória',
+  com_auth_password_required: 'Senha é obrigatória',
   com_auth_password_min_length: 'A senha deve ter pelo menos 8 caracteres',
   com_auth_password_max_length: 'A senha deve ter menos de 128 caracteres',
-  com_auth_password_forgot: 'Esqueceu a Senha?',
+  com_auth_password_forgot: 'Esqueceu a senha?',
   com_auth_password_confirm: 'Confirmar senha',
-  com_auth_password_not_match: 'As senhas não correspondem',
+  com_auth_password_not_match: 'As senhas não coincidem',
   com_auth_continue: 'Continuar',
-  com_auth_create_account: 'Crie sua conta',
-  com_auth_error_create:
-    'Ocorreu um erro ao tentar registrar sua conta. Por favor, tente novamente.',
+  com_auth_create_account: 'Criar sua conta',
+  com_auth_error_create: 'Houve um erro ao tentar registrar sua conta. Por favor, tente novamente.',
   com_auth_full_name: 'Nome completo',
-  com_auth_name_required: 'O nome é obrigatório',
+  com_auth_name_required: 'Nome é obrigatório',
   com_auth_name_min_length: 'O nome deve ter pelo menos 3 caracteres',
   com_auth_name_max_length: 'O nome deve ter menos de 80 caracteres',
   com_auth_username: 'Nome de usuário (opcional)',
-  com_auth_username_required: 'O nome de usuário é obrigatório',
+  com_auth_username_required: 'Nome de usuário é obrigatório',
   com_auth_username_min_length: 'O nome de usuário deve ter pelo menos 2 caracteres',
   com_auth_username_max_length: 'O nome de usuário deve ter menos de 20 caracteres',
   com_auth_already_have_account: 'Já tem uma conta?',
   com_auth_login: 'Entrar',
+  com_auth_registration_success_insecure: 'Registro bem-sucedido.',
+  com_auth_registration_success_generic: 'Por favor, verifique seu e-mail para verificar seu endereço de e-mail.',
   com_auth_reset_password: 'Redefinir sua senha',
   com_auth_click: 'Clique',
   com_auth_here: 'AQUI',
   com_auth_to_reset_your_password: 'para redefinir sua senha.',
-  com_auth_reset_password_link_sent: 'Email Enviado',
-  com_auth_reset_password_email_sent:
-    'Um email foi enviado para você com mais instruções para redefinir sua senha.',
-  com_auth_error_reset_password:
-    'Houve um problema ao redefinir sua senha. Não foi encontrado nenhum usuário com o endereço de email fornecido. Por favor, tente novamente.',
-  com_auth_reset_password_success: 'Redefinição de Senha Bem-sucedida',
-  com_auth_login_with_new_password: 'Você pode agora fazer login com sua nova senha.',
+  com_auth_reset_password_link_sent: 'E-mail enviado',
+  com_auth_reset_password_if_email_exists: 'Se uma conta com esse e-mail existir, um e-mail com instruções para redefinir a senha foi enviado. Certifique-se de verificar sua pasta de spam.',
+  com_auth_reset_password_email_sent: 'Se o usuário estiver registrado, um e-mail será enviado para a caixa de entrada.',
+  com_auth_reset_password_success: 'Senha redefinida com sucesso',
+  com_auth_login_with_new_password: 'Agora você pode fazer login com sua nova senha.',
   com_auth_error_invalid_reset_token: 'Este token de redefinição de senha não é mais válido.',
   com_auth_click_here: 'Clique aqui',
   com_auth_to_try_again: 'para tentar novamente.',
   com_auth_submit_registration: 'Enviar registro',
   com_auth_welcome_back: 'Bem-vindo de volta',
   com_auth_back_to_login: 'Voltar para Login',
+  com_auth_email_verification_failed: 'Falha na verificação de e-mail',
+  com_auth_email_verification_rate_limited: 'Muitas solicitações. Por favor, tente novamente mais tarde',
+  com_auth_email_verification_success: 'E-mail verificado com sucesso',
+  com_auth_email_resent_success: 'E-mail de verificação reenviado com sucesso',
+  com_auth_email_resent_failed: 'Falha ao reenviar e-mail de verificação',
+  com_auth_email_verification_failed_token_missing: 'Falha na verificação, token ausente',
+  com_auth_email_verification_invalid: 'Verificação de e-mail inválida',
+  com_auth_email_verification_in_progress: 'Verificando seu e-mail, por favor, aguarde',
+  com_auth_email_verification_resend_prompt: 'Não recebeu o e-mail?',
+  com_auth_email_resend_link: 'Reenviar E-mail',
+  com_auth_email_verification_redirecting: 'Redirecionando em {0} segundos...',
   com_endpoint_open_menu: 'Abrir Menu',
   com_endpoint_bing_enable_sydney: 'Habilitar Sydney',
   com_endpoint_bing_to_enable_sydney: 'Para habilitar Sydney',
   com_endpoint_bing_jailbreak: 'Jailbreak',
-  com_endpoint_bing_context_placeholder:
-    'O Bing pode usar até 7k tokens para \'contexto\', que ele pode referenciar para a conversa. O limite específico não é conhecido, mas pode causar erros ao exceder 7k tokens',
-  com_endpoint_bing_system_message_placeholder:
-    'AVISO: O uso indevido deste recurso pode fazer com que você seja BANIDO de usar o Bing! Clique em \'Mensagem do Sistem\' para obter instruções completas e a mensagem padrão, caso omitida, que é a predefinição \'Sydney\', considerada segura.',
+  com_endpoint_bing_context_placeholder: 'O Bing pode usar até 7k tokens para "contexto", que pode referenciar para a conversa. O limite específico não é conhecido, mas pode ocorrer erros ao exceder 7k tokens',
+  com_endpoint_bing_system_message_placeholder: 'AVISO: O uso indevido deste recurso pode resultar em BANIMENTO do uso do Bing! Clique em "Mensagem do Sistema" para instruções completas e a mensagem padrão se omitida, que é o preset "Sydney" considerado seguro.',
   com_endpoint_system_message: 'Mensagem do Sistema',
-  com_endpoint_message: 'Conversar com',
-  com_endpoint_message_not_appendable: 'Edite sua mensagem ou Regenere.',
+  com_endpoint_message: 'Mensagem',
+  com_endpoint_message_not_appendable: 'Edite sua mensagem ou Regenerar.',
   com_endpoint_default_blank: 'padrão: em branco',
   com_endpoint_default_false: 'padrão: falso',
   com_endpoint_default_creative: 'padrão: criativo',
@@ -266,21 +410,16 @@ export default {
   com_endpoint_tone_style: 'Estilo de Tom',
   com_endpoint_token_count: 'Contagem de Tokens',
   com_endpoint_output: 'Saída',
-  com_endpoint_google_temp:
-    'Valores mais altos = mais aleatório, enquanto valores mais baixos = mais focado e determinístico. Recomendamos alterar este ou o Top P, mas não ambos.',
-  com_endpoint_google_topp:
-    'O Top-p altera a forma como o modelo seleciona tokens para a saída. Os tokens são selecionados do mais provável K (veja o parâmetro topK) para o menos provável até que a soma de suas probabilidades seja igual ao valor top-p.',
-  com_endpoint_google_topk:
-    'O Top-k altera a forma como o modelo seleciona tokens para a saída. Um top-k de 1 significa que o token selecionado é o mais provável entre todos os tokens no vocabulário do modelo (também chamado de decodificação gulosa), enquanto um top-k de 3 significa que o próximo token é selecionado entre os 3 tokens mais prováveis (usando temperatura).',
-  com_endpoint_google_maxoutputtokens:
-    'Número máximo de tokens que podem ser gerados na resposta. Especifique um valor menor para respostas mais curtas e um valor maior para respostas mais longas.',
+  com_endpoint_context_tokens: 'Máximo de Tokens de Contexto',
+  com_endpoint_context_info: 'O número máximo de tokens que podem ser usados para contexto. Use isso para controlar quantos tokens são enviados por solicitação. Se não especificado, usará os padrões do sistema com base no tamanho do contexto dos modelos conhecidos. Definir valores mais altos pode resultar em erros e/ou maior custo de tokens.',
+  com_endpoint_google_temp: 'Valores mais altos = mais aleatório, enquanto valores mais baixos = mais focado e determinístico. Recomendamos alterar isso ou Top P, mas não ambos.',
+  com_endpoint_google_topp: 'Top-p altera como o modelo seleciona tokens para saída. Os tokens são selecionados dos mais prováveis (veja o parâmetro topK) até os menos prováveis até que a soma de suas probabilidades atinja o valor top-p.',
+  com_endpoint_google_topk: 'Top-k altera como o modelo seleciona tokens para saída. Um top-k de 1 significa que o token selecionado é o mais provável entre todos os tokens no vocabulário do modelo (também chamado de decodificação gananciosa), enquanto um top-k de 3 significa que o próximo token é selecionado entre os 3 tokens mais prováveis (usando temperatura).',
+  com_endpoint_google_maxoutputtokens: 'Número máximo de tokens que podem ser gerados na resposta. Especifique um valor mais baixo para respostas mais curtas e um valor mais alto para respostas mais longas. Nota: os modelos podem parar antes de atingir esse máximo.',
   com_endpoint_google_custom_name_placeholder: 'Defina um nome personalizado para o Google',
-  com_endpoint_prompt_prefix_placeholder:
-    'Defina instruções ou contexto personalizados. Ignorado se vazio.',
-  com_endpoint_instructions_assistants_placeholder:
-    'Substitui as instruções do assistente. Isso é útil para modificar o comportamento em uma base por execução.',
-  com_endpoint_prompt_prefix_assistants_placeholder:
-    'Defina instruções ou contexto adicionais além das instruções principais do Assistente. Ignorado se vazio.',
+  com_endpoint_prompt_prefix_placeholder: 'Defina instruções ou contexto personalizados. Ignorado se vazio.',
+  com_endpoint_instructions_assistants_placeholder: 'Substitui as instruções do assistente. Isso é útil para modificar o comportamento em uma base por execução.',
+  com_endpoint_prompt_prefix_assistants_placeholder: 'Defina instruções ou contexto adicionais além das instruções principais do Assistente. Ignorado se vazio.',
   com_endpoint_custom_name: 'Nome Personalizado',
   com_endpoint_prompt_prefix: 'Instruções Personalizadas',
   com_endpoint_prompt_prefix_assistants: 'Instruções Adicionais',
@@ -289,34 +428,27 @@ export default {
   com_endpoint_default: 'padrão',
   com_endpoint_top_p: 'Top P',
   com_endpoint_top_k: 'Top K',
-  com_endpoint_max_output_tokens: 'Máx. Tokens de Saída',
-  com_endpoint_openai_temp:
-    'Valores mais altos = mais aleatório, enquanto valores mais baixos = mais focado e determinístico. Recomendamos alterar este ou o Top P, mas não ambos.',
-  com_endpoint_openai_max:
-    'O máximo de tokens a gerar. O comprimento total de tokens de entrada e tokens gerados é limitado pelo comprimento do contexto do modelo.',
-  com_endpoint_openai_topp:
-    'Uma alternativa à amostragem com temperatura, chamada amostragem de núcleo, onde o modelo considera os resultados dos tokens com massa de probabilidade top_p. Então, 0,1 significa que apenas os tokens que compõem os 10% superiores da massa de probabilidade são considerados. Recomendamos alterar este ou a temperatura, mas não ambos.',
-  com_endpoint_openai_freq:
-    'Número entre -2,0 e 2,0. Valores positivos penalizam novos tokens com base em sua frequência existente no texto até agora, diminuindo a probabilidade do modelo repetir a mesma linha literalmente.',
-  com_endpoint_openai_pres:
-    'Número entre -2,0 e 2,0. Valores positivos penalizam novos tokens com base em sua aparição no texto até o momento, aumentando a probabilidade do modelo falar sobre novos tópicos.',
-  com_endpoint_openai_resend:
-    'Reenviar todas as imagens anexadas anteriormente. Nota: isso pode aumentar significativamente o custo de tokens e você pode encontrar erros com muitos anexos de imagem.',
-  com_endpoint_openai_resend_files:
-    'Reenviar todos os arquivos anexados anteriormente. Nota: isso aumentará o custo de tokens e você pode encontrar erros com muitos anexos.',
-  com_endpoint_openai_detail:
-    'A resolução para solicitações de Visão. "Baixa" é mais barata e rápida, "Alta" é mais detalhada e cara, e "Automática" escolherá automaticamente entre as duas com base na resolução da imagem.',
-  com_endpoint_openai_custom_name_placeholder: 'Defina um nome personalizado para o ChatGPT',
-  com_endpoint_openai_prompt_prefix_placeholder:
-    'Defina instruções personalizadas para incluir na Mensagem do Sistema. Padrão: nenhuma',
-  com_endpoint_anthropic_temp:
-    'Varia de 0 a 1. Use temp mais próximo de 0 para tarefas analíticas/múltipla escolha e mais próximo de 1 para tarefas criativas e generativas. Recomendamos alterar este ou o Top P, mas não ambos.',
-  com_endpoint_anthropic_topp:
-    'O Top-p altera a forma como o modelo seleciona tokens para a saída. Os tokens são selecionados do mais provável K (veja o parâmetro topK) para o menos provável até que a soma de suas probabilidades seja igual ao valor top-p.',
-  com_endpoint_anthropic_topk:
-    'O Top-k altera a forma como o modelo seleciona tokens para a saída. Um top-k de 1 significa que o token selecionado é o mais provável entre todos os tokens no vocabulário do modelo (também chamado de decodificação gulosa), enquanto um top-k de 3 significa que o próximo token é selecionado entre os 3 tokens mais prováveis (usando temperatura).',
-  com_endpoint_anthropic_maxoutputtokens:
-    'Número máximo de tokens que podem ser gerados na resposta. Especifique um valor menor para respostas mais curtas e um valor maior para respostas mais longas.',
+  com_endpoint_max_output_tokens: 'Máximo de Tokens de Saída',
+  com_endpoint_stop: 'Sequências de Parada',
+  com_endpoint_stop_placeholder: 'Separe os valores pressionando `Enter`',
+  com_endpoint_openai_max_tokens: 'Campo opcional `max_tokens`, representando o número máximo de tokens que podem ser gerados na conclusão do chat. O comprimento total dos tokens de entrada e dos tokens gerados é limitado pelo comprimento do contexto dos modelos. Você pode experimentar erros se esse número exceder o máximo de tokens de contexto.',
+  com_endpoint_openai_temp: 'Valores mais altos = mais aleatório, enquanto valores mais baixos = mais focado e determinístico. Recomendamos alterar isso ou Top P, mas não ambos.',
+  com_endpoint_openai_max: 'O máximo de tokens para gerar. O comprimento total dos tokens de entrada e dos tokens gerados é limitado pelo comprimento do contexto do modelo.',
+  com_endpoint_openai_topp: 'Uma alternativa à amostragem com temperatura, chamada amostragem de núcleo, onde o modelo considera os resultados dos tokens com massa de probabilidade top_p. Então, 0.1 significa que apenas os tokens que compreendem os 10% principais da massa de probabilidade são considerados. Recomendamos alterar isso ou a temperatura, mas não ambos.',
+  com_endpoint_openai_freq: 'Número entre -2.0 e 2.0. Valores positivos penalizam novos tokens com base em sua frequência existente no texto até agora, diminuindo a probabilidade do modelo de repetir a mesma linha literalmente.',
+  com_endpoint_openai_pres: 'Número entre -2.0 e 2.0. Valores positivos penalizam novos tokens com base em sua presença no texto até agora, aumentando a probabilidade do modelo de falar sobre novos tópicos.',
+  com_endpoint_openai_resend: 'Reenviar todas as imagens anexadas anteriormente. Nota: isso pode aumentar significativamente o custo de tokens e você pode experimentar erros com muitos anexos de imagem.',
+  com_endpoint_openai_resend_files: 'Reenviar todos os arquivos anexados anteriormente. Nota: isso aumentará o custo de tokens e você pode experimentar erros com muitos anexos.',
+  com_endpoint_openai_detail: 'A resolução para solicitações de Visão. "Baixa" é mais barata e rápida, "Alta" é mais detalhada e cara, e "Auto" escolherá automaticamente entre as duas com base na resolução da imagem.',
+  com_endpoint_openai_stop: 'Até 4 sequências onde a API parará de gerar mais tokens.',
+  com_endpoint_openai_custom_name_placeholder: 'Defina um nome personalizado para a IA',
+  com_endpoint_openai_prompt_prefix_placeholder: 'Defina instruções personalizadas para incluir na Mensagem do Sistema. Padrão: nenhuma',
+  com_endpoint_anthropic_temp: 'Varia de 0 a 1. Use temperatura mais próxima de 0 para tarefas analíticas / de múltipla escolha, e mais próxima de 1 para tarefas criativas e generativas. Recomendamos alterar isso ou Top P, mas não ambos.',
+  com_endpoint_anthropic_topp: 'Top-p altera como o modelo seleciona tokens para saída. Os tokens são selecionados dos mais prováveis (veja o parâmetro topK) até os menos prováveis até que a soma de suas probabilidades atinja o valor top-p.',
+  com_endpoint_anthropic_topk: 'Top-k altera como o modelo seleciona tokens para saída. Um top-k de 1 significa que o token selecionado é o mais provável entre todos os tokens no vocabulário do modelo (também chamado de decodificação gananciosa), enquanto um top-k de 3 significa que o próximo token é selecionado entre os 3 tokens mais prováveis (usando temperatura).',
+  com_endpoint_anthropic_maxoutputtokens: 'Número máximo de tokens que podem ser gerados na resposta. Especifique um valor mais baixo para respostas mais curtas e um valor mais alto para respostas mais longas. Nota: os modelos podem parar antes de atingir esse máximo.',
+  com_endpoint_anthropic_prompt_cache: 'O cache de prompt permite reutilizar um grande contexto ou instruções em chamadas de API, reduzindo custos e latência',
+  com_endpoint_prompt_cache: 'Usar Cache de Prompt',
   com_endpoint_anthropic_custom_name_placeholder: 'Defina um nome personalizado para Anthropic',
   com_endpoint_frequency_penalty: 'Penalidade de Frequência',
   com_endpoint_presence_penalty: 'Penalidade de Presença',
@@ -324,124 +456,131 @@ export default {
   com_endpoint_plug_resend_files: 'Reenviar Arquivos',
   com_endpoint_plug_resend_images: 'Reenviar Imagens',
   com_endpoint_plug_image_detail: 'Detalhe da Imagem',
-  com_endpoint_plug_skip_completion: 'Ignorar Conclusão',
-  com_endpoint_disabled_with_tools: 'desabilitado com ferramentas',
-  com_endpoint_disabled_with_tools_placeholder: 'Desabilitado com Ferramentas Selecionadas',
-  com_endpoint_plug_set_custom_instructions_for_gpt_placeholder:
-    'Defina instruções personalizadas para incluir na Mensagem do Sistema. Padrão: nenhuma',
+  com_endpoint_plug_skip_completion: 'Pular Conclusão',
+  com_endpoint_disabled_with_tools: 'desativado com ferramentas',
+  com_endpoint_disabled_with_tools_placeholder: 'Desativado com Ferramentas Selecionadas',
+  com_endpoint_plug_set_custom_instructions_for_gpt_placeholder: 'Defina instruções personalizadas para incluir na Mensagem do Sistema. Padrão: nenhuma',
   com_endpoint_import: 'Importar',
-  com_endpoint_set_custom_name:
-    'Defina um nome personalizado, caso você encontre esta predefinição',
-  com_endpoint_preset_delete_confirm: 'Tem certeza de que deseja excluir esta predefinição?',
-  com_endpoint_preset_clear_all_confirm:
-    'Tem certeza de que deseja excluir todas as suas predefinições?',
-  com_endpoint_preset_import: 'Predefinição Importada!',
-  com_endpoint_preset_import_error:
-    'Ocorreu um erro ao importar sua predefinição. Por favor, tente novamente.',
-  com_endpoint_preset_save_error:
-    'Ocorreu um erro ao salvar sua predefinição. Por favor, tente novamente.',
-  com_endpoint_preset_delete_error:
-    'Ocorreu um erro ao excluir sua predefinição. Por favor, tente novamente.',
-  com_endpoint_preset_default_removed: 'não é mais a predefinição padrão.',
+  com_endpoint_set_custom_name: 'Defina um nome personalizado, caso você possa encontrar este preset',
+  com_endpoint_preset_delete_confirm: 'Tem certeza de que deseja excluir este preset?',
+  com_endpoint_preset_clear_all_confirm: 'Tem certeza de que deseja excluir todos os seus presets?',
+  com_endpoint_preset_import: 'Preset Importado!',
+  com_endpoint_preset_import_error: 'Houve um erro ao importar seu preset. Por favor, tente novamente.',
+  com_endpoint_preset_save_error: 'Houve um erro ao salvar seu preset. Por favor, tente novamente.',
+  com_endpoint_preset_delete_error: 'Houve um erro ao excluir seu preset. Por favor, tente novamente.',
+  com_endpoint_preset_default_removed: 'não é mais o preset padrão.',
   com_endpoint_preset_default_item: 'Padrão:',
-  com_endpoint_preset_default_none: 'Nenhuma predefinição padrão ativa.',
-  com_endpoint_preset_title: 'Predefinição',
+  com_endpoint_preset_default_none: 'Nenhum preset padrão ativo.',
+  com_endpoint_preset_title: 'Preset',
   com_endpoint_preset_saved: 'Salvo!',
-  com_endpoint_preset_default: 'é agora a predefinição padrão.',
-  com_endpoint_preset: 'predefinição',
-  com_endpoint_presets: 'predefinições',
-  com_endpoint_preset_selected: 'Predefinição Ativa!',
-  com_endpoint_preset_selected_title: 'Ativa!',
-  com_endpoint_preset_name: 'Nome da Predefinição',
+  com_endpoint_preset_default: 'é agora o preset padrão.',
+  com_endpoint_preset: 'preset',
+  com_endpoint_presets: 'presets',
+  com_endpoint_preset_selected: 'Preset Ativo!',
+  com_endpoint_preset_selected_title: 'Ativo!',
+  com_endpoint_preset_name: 'Nome do Preset',
   com_endpoint_new_topic: 'Novo Tópico',
   com_endpoint: 'Endpoint',
   com_endpoint_hide: 'Ocultar',
   com_endpoint_show: 'Mostrar',
-  com_endpoint_examples: ' Predefinições',
+  com_endpoint_examples: 'Presets',
   com_endpoint_completion: 'Conclusão',
   com_endpoint_agent: 'Agente',
   com_endpoint_show_what_settings: 'Mostrar Configurações de {0}',
   com_endpoint_export: 'Exportar',
+  com_endpoint_export_share: 'Exportar/Compartilhar',
   com_endpoint_assistant: 'Assistente',
   com_endpoint_use_active_assistant: 'Usar Assistente Ativo',
   com_endpoint_assistant_model: 'Modelo de Assistente',
-  com_endpoint_save_as_preset: 'Salvar como Predefinição',
-  com_endpoint_presets_clear_warning:
-    'Tem certeza de que deseja limpar todas as predefinições? Isso é irreversível.',
+  com_endpoint_save_as_preset: 'Salvar Como Preset',
+  com_endpoint_presets_clear_warning: 'Tem certeza de que deseja limpar todos os presets? Isso é irreversível.',
   com_endpoint_not_implemented: 'Não implementado',
-  com_endpoint_no_presets:
-    'Nenhuma predefinição ainda, use o botão de configurações para criar uma',
+  com_endpoint_no_presets: 'Ainda não há presets, use o botão de configurações para criar um',
   com_endpoint_not_available: 'Nenhum endpoint disponível',
-  com_endpoint_view_options: 'Opções de Visualização',
-  com_endpoint_save_convo_as_preset: 'Salvar Conversa como Predefinição',
-  com_endpoint_my_preset: 'Minha Predefinição',
+  com_endpoint_view_options: 'Ver Opções',
+  com_endpoint_save_convo_as_preset: 'Salvar Conversa como Preset',
+  com_endpoint_my_preset: 'Meu Preset',
   com_endpoint_agent_model: 'Modelo de Agente (Recomendado: GPT-3.5)',
   com_endpoint_completion_model: 'Modelo de Conclusão (Recomendado: GPT-4)',
-  com_endpoint_func_hover: 'Habilitar o uso de Plugins como Funções OpenAI',
-  com_endpoint_skip_hover:
-    'Habilitar a ignorância da etapa de conclusão, que revisa a resposta final e as etapas geradas',
+  com_endpoint_func_hover: 'Habilitar uso de Plugins como Funções OpenAI',
+  com_endpoint_skip_hover: 'Habilitar pular a etapa de conclusão, que revisa a resposta final e os passos gerados',
   com_endpoint_config_key: 'Definir Chave API',
-  com_endpoint_assistant_placeholder:
-    'Por favor, selecione um Assistente no Painel Lateral Direito',
-  com_endpoint_config_placeholder: 'Defina sua Chave no menu Cabeçalho para conversar.',
+  com_endpoint_assistant_placeholder: 'Por favor, selecione um Assistente no Painel Lateral Direito',
+  com_endpoint_config_placeholder: 'Defina sua Chave no menu do Cabeçalho para conversar.',
   com_endpoint_config_key_for: 'Definir Chave API para',
   com_endpoint_config_key_name: 'Chave',
-  com_endpoint_config_value: 'Digite o valor para',
+  com_endpoint_config_value: 'Insira o valor para',
   com_endpoint_config_key_name_placeholder: 'Defina a chave API primeiro',
   com_endpoint_config_key_encryption: 'Sua chave será criptografada e excluída em',
+  com_endpoint_config_key_never_expires: 'Sua chave nunca expira',
   com_endpoint_config_key_expiry: 'o tempo de expiração',
   com_endpoint_config_click_here: 'Clique Aqui',
   com_endpoint_config_google_service_key: 'Chave de Conta de Serviço do Google',
-  com_endpoint_config_google_cloud_platform: '(da Google Cloud Platform)',
+  com_endpoint_config_google_cloud_platform: '(do Google Cloud Platform)',
   com_endpoint_config_google_api_key: 'Chave API do Google',
   com_endpoint_config_google_gemini_api: '(API Gemini)',
-  com_endpoint_config_google_api_info:
-    'Para obter sua chave da API de Linguagem Generativa (para Gemini),',
+  com_endpoint_config_google_api_info: 'Para obter sua chave API de Linguagem Generativa (para Gemini),',
   com_endpoint_config_key_import_json_key: 'Importar Chave JSON da Conta de Serviço.',
-  com_endpoint_config_key_import_json_key_success:
-    'Chave JSON da Conta de Serviço Importada com Sucesso',
-  com_endpoint_config_key_import_json_key_invalid:
-    'Chave JSON da Conta de Serviço Inválida, Você importou o arquivo correto?',
-  com_endpoint_config_key_get_edge_key: 'Para obter seu Token de Acesso para o Bing, faça login em',
-  com_endpoint_config_key_get_edge_key_dev_tool:
-    'Use as ferramentas de desenvolvimento ou uma extensão enquanto estiver logado no site para copiar o conteúdo do cookie _U. Se isso falhar, siga estas',
+  com_endpoint_config_key_import_json_key_success: 'Chave JSON da Conta de Serviço Importada com Sucesso',
+  com_endpoint_config_key_import_json_key_invalid: 'Chave JSON da Conta de Serviço Inválida, Você importou o arquivo correto?',
+  com_endpoint_config_key_get_edge_key: 'Para obter seu token de acesso para o Bing, faça login em',
+  com_endpoint_config_key_get_edge_key_dev_tool: 'Use ferramentas de desenvolvedor ou uma extensão enquanto estiver logado no site para copiar o conteúdo do cookie _U. Se isso falhar, siga estas',
   com_endpoint_config_key_edge_instructions: 'instruções',
-  com_endpoint_config_key_edge_full_key_string: 'para fornecer as strings completas de cookies.',
-  com_endpoint_config_key_chatgpt:
-    'Para obter seu Token de Acesso para o ChatGPT \'Versão Gratuita\', faça login em',
-  com_endpoint_config_key_chatgpt_then_visit: 'então visite',
+  com_endpoint_config_key_edge_full_key_string: 'para fornecer as strings completas do cookie.',
+  com_endpoint_config_key_chatgpt: 'Para obter seu token de acesso para o ChatGPT "Versão Gratuita", faça login em',
+  com_endpoint_config_key_chatgpt_then_visit: 'depois visite',
   com_endpoint_config_key_chatgpt_copy_token: 'Copiar token de acesso.',
   com_endpoint_config_key_google_need_to: 'Você precisa',
-  com_endpoint_config_key_google_vertex_ai: 'Habilitar o Vertex AI',
+  com_endpoint_config_key_google_vertex_ai: 'Habilitar Vertex AI',
   com_endpoint_config_key_google_vertex_api: 'API no Google Cloud, então',
   com_endpoint_config_key_google_service_account: 'Criar uma Conta de Serviço',
-  com_endpoint_config_key_google_vertex_api_role:
-    'Certifique-se de clicar em \'Criar e Continuar\' para dar pelo menos a função \'Usuário do Vertex AI\'. Por último, crie uma chave JSON para importar aqui.',
+  com_endpoint_config_key_google_vertex_api_role: 'Certifique-se de clicar em "Criar e Continuar" para dar pelo menos o papel de "Usuário do Vertex AI". Por fim, crie uma chave JSON para importar aqui.',
+  com_nav_account_settings: 'Configurações da Conta',
+  com_nav_font_size: 'Tamanho da Fonte da Mensagem',
+  com_nav_font_size_xs: 'Extra Pequeno',
+  com_nav_font_size_sm: 'Pequeno',
+  com_nav_font_size_base: 'Médio',
+  com_nav_font_size_lg: 'Grande',
+  com_nav_font_size_xl: 'Extra Grande',
   com_nav_welcome_assistant: 'Por favor, Selecione um Assistente',
   com_nav_welcome_message: 'Como posso ajudar você hoje?',
-  com_nav_auto_scroll: 'Auto-rolagem para o mais recente ao abrir',
+  com_nav_auto_scroll: 'Rolagem Automática para a última mensagem ao abrir o chat',
   com_nav_hide_panel: 'Ocultar painel mais à direita',
-  com_nav_enter_to_send: 'Enviar Mensagem com a Tecla Enter',
-  com_nav_modular_chat: 'Habilitar troca de Endpoints durante a conversa',
-  com_nav_latex_parsing: 'Analisando LaTeX nas mensagens (pode afetar o desempenho)',
-  com_nav_profile_picture: 'Foto de perfil',
-  com_nav_change_picture: 'Alterar foto',
-  com_nav_plugin_store: 'Loja de plugins',
+  com_nav_modular_chat: 'Habilitar troca de Endpoints no meio da conversa',
+  com_nav_latex_parsing: 'Análise de LaTeX em mensagens (pode afetar o desempenho)',
+  com_nav_text_to_speech: 'Texto para Fala',
+  com_nav_automatic_playback: 'Reprodução Automática da Última Mensagem',
+  com_nav_speech_to_text: 'Fala para Texto',
+  com_nav_profile_picture: 'Foto de Perfil',
+  com_nav_change_picture: 'Mudar foto',
+  com_nav_plugin_store: 'Loja de Plugins',
   com_nav_plugin_install: 'Instalar',
   com_nav_plugin_uninstall: 'Desinstalar',
   com_ui_add: 'Adicionar',
   com_nav_tool_remove: 'Remover',
   com_nav_tool_dialog: 'Ferramentas do Assistente',
-  com_nav_tool_dialog_description:
-    'O Assistente deve ser salvo para persistir nas seleções de ferramentas.',
-  com_show_agent_settings: 'Mostrar configurações do agente',
-  com_show_completion_settings: 'Mostrar configurações de conclusão',
-  com_hide_examples: 'Ocultar exemplos',
-  com_show_examples: 'Mostrar exemplos',
-  com_nav_plugin_search: 'Pesquisar plugins',
-  com_nav_tool_search: 'Pesquisar ferramentas',
-  com_nav_plugin_auth_error:
-    'Houve um erro ao tentar autenticar este plugin. Por favor, tente novamente.',
+  com_ui_misc: 'Diversos',
+  com_ui_roleplay: 'Roleplay',
+  com_ui_write: 'Escrita',
+  com_ui_idea: 'Ideias',
+  com_ui_shop: 'Compras',
+  com_ui_finance: 'Finanças',
+  com_ui_code: 'Código',
+  com_ui_travel: 'Viagem',
+  com_ui_teach_or_explain: 'Aprendizado',
+  com_ui_select_file: 'Selecionar um arquivo',
+  com_ui_drag_drop_file: 'Arraste e solte um arquivo aqui',
+  com_ui_upload_image: 'Carregar uma imagem',
+  com_ui_select_a_category: 'Nenhuma categoria selecionada',
+  com_ui_clear_all: 'Limpar tudo',
+  com_nav_tool_dialog_description: 'O assistente deve ser salvo para persistir as seleções de ferramentas.',
+  com_show_agent_settings: 'Mostrar Configurações do Agente',
+  com_show_completion_settings: 'Mostrar Configurações de Conclusão',
+  com_hide_examples: 'Ocultar Exemplos',
+  com_show_examples: 'Mostrar Exemplos',
+  com_nav_plugin_search: 'Buscar plugins',
+  com_nav_tool_search: 'Buscar ferramentas',
+  com_nav_plugin_auth_error: 'Houve um erro ao tentar autenticar este plugin. Por favor, tente novamente.',
   com_nav_export_filename: 'Nome do arquivo',
   com_nav_export_filename_placeholder: 'Definir o nome do arquivo',
   com_nav_export_type: 'Tipo',
@@ -453,48 +592,105 @@ export default {
   com_nav_export_recursive: 'Recursivo',
   com_nav_export_conversation: 'Exportar conversa',
   com_nav_export: 'Exportar',
-  com_nav_shared_links: 'Links Compartilhados',
+  com_nav_shared_links: 'Links compartilhados',
   com_nav_shared_links_manage: 'Gerenciar',
-  com_nav_shared_links_empty: 'Você não tem nenhum link compartilhado.',
+  com_nav_shared_links_empty: 'Você não tem links compartilhados.',
   com_nav_shared_links_name: 'Nome',
-  com_nav_shared_links_date_shared: 'Data compartilhada',
-  com_nav_my_files: 'Meus arquivos',
+  com_nav_shared_links_date_shared: 'Data de compartilhamento',
+  com_nav_source_chat: 'Ver chat de origem',
+  com_nav_my_files: 'Meus Arquivos',
   com_nav_theme: 'Tema',
   com_nav_theme_system: 'Sistema',
   com_nav_theme_dark: 'Escuro',
   com_nav_theme_light: 'Claro',
+  com_nav_enter_to_send: 'Pressione Enter para enviar mensagens',
   com_nav_user_name_display: 'Exibir nome de usuário nas mensagens',
   com_nav_save_drafts: 'Salvar rascunhos localmente',
+  com_nav_chat_direction: 'Direção do chat',
   com_nav_show_code: 'Sempre mostrar código ao usar o interpretador de código',
-  com_nav_clear_all_chats: 'Limpar todas as conversas',
+  com_nav_auto_send_prompts: 'Enviar prompts automaticamente',
+  com_nav_always_make_prod: 'Sempre tornar novas versões produção',
+  com_nav_clear_all_chats: 'Limpar todos os chats',
   com_nav_confirm_clear: 'Confirmar Limpeza',
   com_nav_close_sidebar: 'Fechar barra lateral',
   com_nav_open_sidebar: 'Abrir barra lateral',
   com_nav_send_message: 'Enviar mensagem',
   com_nav_log_out: 'Sair',
   com_nav_user: 'USUÁRIO',
-  com_nav_archived_chats: 'Conversas Arquivadas',
+  com_nav_archived_chats: 'Chats Arquivados',
   com_nav_archived_chats_manage: 'Gerenciar',
-  com_nav_archived_chats_empty: 'Você não tem nenhuma conversa arquivada.',
-  com_nav_archive_all_chats: 'Arquivar todas as conversas',
-  com_nav_archive_all: 'Arquivar todas',
+  com_nav_archived_chats_empty: 'Você não tem conversas arquivadas.',
+  com_nav_archive_all_chats: 'Arquivar todos os chats',
+  com_nav_archive_all: 'Arquivar tudo',
   com_nav_archive_name: 'Nome',
-  com_nav_archive_created_at: 'CriadoEm',
+  com_nav_archive_created_at: 'Data de Arquivamento',
   com_nav_clear_conversation: 'Limpar conversas',
-  com_nav_clear_conversation_confirm_message:
-    'Tem certeza de que deseja limpar todas as conversas? Isso é irreversível.',
+  com_nav_clear_conversation_confirm_message: 'Tem certeza de que deseja limpar todas as conversas? Isso é irreversível.',
   com_nav_help_faq: 'Ajuda & FAQ',
   com_nav_settings: 'Configurações',
-  com_nav_search_placeholder: 'Pesquisar mensagens',
-  com_nav_info_bookmarks_rebuild:
-    'Se a contagem de favoritos estiver incorreta, por favor, reconstrua as informações de favoritos. A contagem de favoritos será recalculada e os dados serão restaurados ao estado correto.',
+  com_nav_search_placeholder: 'Buscar mensagens',
+  com_nav_delete_account: 'Excluir conta',
+  com_nav_delete_account_confirm: 'Excluir conta - você tem certeza?',
+  com_nav_delete_account_button: 'Excluir minha conta permanentemente',
+  com_nav_delete_account_email_placeholder: 'Por favor, insira o e-mail da sua conta',
+  com_nav_delete_account_confirm_placeholder: 'Para prosseguir, digite "EXCLUIR" no campo abaixo',
+  com_nav_delete_warning: 'AVISO: Isso excluirá permanentemente sua conta.',
+  com_nav_delete_data_info: 'Todos os seus dados serão excluídos.',
+  com_nav_conversation_mode: 'Modo de Conversa',
+  com_nav_auto_send_text: 'Enviar texto automaticamente',
+  com_nav_auto_send_text_disabled: 'definir -1 para desativar',
+  com_nav_auto_transcribe_audio: 'Transcrever áudio automaticamente',
+  com_nav_db_sensitivity: 'Sensibilidade de decibéis',
+  com_nav_playback_rate: 'Taxa de Reprodução de Áudio',
+  com_nav_audio_play_error: 'Erro ao reproduzir áudio: {0}',
+  com_nav_audio_process_error: 'Erro ao processar áudio: {0}',
+  com_nav_long_audio_warning: 'Textos mais longos levarão mais tempo para processar.',
+  com_nav_tts_init_error: 'Falha ao inicializar texto-para-fala: {0}',
+  com_nav_tts_unsupported_error: 'Texto-para-fala para o mecanismo selecionado não é suportado neste navegador.',
+  com_nav_source_buffer_error: 'Erro ao configurar a reprodução de áudio. Por favor, atualize a página.',
+  com_nav_media_source_init_error: 'Não foi possível preparar o reprodutor de áudio. Por favor, verifique as configurações do seu navegador.',
+  com_nav_buffer_append_error: 'Problema com o streaming de áudio. A reprodução pode ser interrompida.',
+  com_nav_speech_cancel_error: 'Não foi possível parar a reprodução de áudio. Você pode precisar atualizar a página.',
+  com_nav_voices_fetch_error: 'Não foi possível recuperar as opções de voz. Por favor, verifique sua conexão com a internet.',
+  com_nav_engine: 'Motor',
+  com_nav_browser: 'Navegador',
+  com_nav_edge: 'Edge',
+  com_nav_external: 'Externo',
+  com_nav_delete_cache_storage: 'Excluir armazenamento de cache TTS',
+  com_nav_enable_cache_tts: 'Habilitar cache TTS',
+  com_nav_voice_select: 'Voz',
+  com_nav_enable_cloud_browser_voice: 'Usar vozes baseadas na nuvem',
+  com_nav_info_enter_to_send: 'Quando habilitado, pressionar `ENTER` enviará sua mensagem. Quando desabilitado, pressionar Enter adicionará uma nova linha, e você precisará pressionar `CTRL + ENTER` para enviar sua mensagem.',
+  com_nav_info_save_draft: 'Quando habilitado, o texto e os anexos que você inserir no formulário de chat serão salvos automaticamente localmente como rascunhos. Esses rascunhos estarão disponíveis mesmo se você recarregar a página ou mudar para uma conversa diferente. Os rascunhos são armazenados localmente no seu dispositivo e são excluídos uma vez que a mensagem é enviada.',
+  com_nav_info_fork_change_default: '`Apenas mensagens visíveis` inclui apenas o caminho direto para a mensagem selecionada. `Incluir ramos relacionados` adiciona ramos ao longo do caminho. `Incluir tudo de/para aqui` inclui todas as mensagens e ramos conectados.',
+  com_nav_info_fork_split_target_setting: 'Quando habilitado, a bifurcação começará da mensagem alvo até a última mensagem na conversa, de acordo com o comportamento selecionado.',
+  com_nav_info_user_name_display: 'Quando habilitado, o nome de usuário do remetente será mostrado acima de cada mensagem que você enviar. Quando desabilitado, você verá apenas "Você" acima de suas mensagens.',
+  com_nav_info_latex_parsing: 'Quando habilitado, o código LaTeX nas mensagens será renderizado como equações matemáticas. Desabilitar isso pode melhorar o desempenho se você não precisar de renderização LaTeX.',
+  com_nav_info_revoke: 'Esta ação revogará e removerá todas as chaves de API que você forneceu. Você precisará reentrar essas credenciais para continuar usando esses endpoints.',
+  com_nav_info_delete_cache_storage: 'Esta ação excluirá todos os arquivos de áudio TTS (Texto-para-Fala) armazenados em cache no seu dispositivo. Arquivos de áudio em cache são usados para acelerar a reprodução de TTS gerado anteriormente, mas podem consumir espaço de armazenamento no seu dispositivo.',
+  com_nav_commands: 'Comandos',
+  com_nav_commands_tab: 'Configurações de Comando',
+  com_nav_at_command: 'Comando @',
+  com_nav_at_command_description: 'Alternar comando "@" para alternar endpoints, modelos, predefinições, etc.',
+  com_nav_plus_command: 'Comando +',
+  com_nav_plus_command_description: 'Alternar comando "+" para adicionar uma configuração de resposta múltipla',
+  com_nav_slash_command: 'Comando /',
+  com_nav_slash_command_description: 'Alternar comando "/" para selecionar um prompt via teclado',
+  com_nav_command_settings: 'Configurações de Comando',
+  com_nav_command_settings_description: 'Personalizar quais comandos estão disponíveis no chat',
   com_nav_setting_general: 'Geral',
+  com_nav_setting_chat: 'Chat',
   com_nav_setting_beta: 'Recursos beta',
   com_nav_setting_data: 'Controles de dados',
   com_nav_setting_account: 'Conta',
+  com_nav_setting_speech: 'Fala',
   com_nav_language: 'Idioma',
   com_nav_lang_auto: 'Detecção automática',
   com_nav_lang_brazilian_portuguese: 'Português Brasileiro',
+  com_ui_accept: 'Eu aceito',
+  com_ui_decline: 'Eu não aceito',
+  com_ui_terms_and_conditions: 'Termos e Condições',
+  com_ui_no_terms_content: 'Nenhum conteúdo de termos e condições para exibir',
 };
 
 export const comparisons = {
diff --git a/client/src/localization/languages/De.ts b/client/src/localization/languages/De.ts
index dab6031db7c..eeaa70b4507 100644
--- a/client/src/localization/languages/De.ts
+++ b/client/src/localization/languages/De.ts
@@ -155,8 +155,9 @@ export default {
   com_ui_variables: 'Variablen',
   com_ui_variables_info:
     'Verwende doppelte geschweifte Klammern in Ihrem Text, um Variablen zu erstellen, z.B. {{Beispielvariable}}, die du später beim Verwenden des Prompts ausfüllen kannst.',
-  com_ui_special_variables:
-    'Spezielle Variablen: Verwende {{current_date}} für das aktuelle Datum und {{current_user}} für deinen angegebenen Kontonamen.',
+  com_ui_special_variables: 'Spezielle Variablen:',
+  com_ui_special_variables_info:
+    'Verwende `{{current_date}}` für das aktuelle Datum und `{{current_user}}` für deinen angegebenen Kontonamen.',
   com_ui_showing: 'Anzeige von',
   com_ui_of: 'von',
   com_ui_entries: 'Einträgen',
@@ -227,7 +228,7 @@ export default {
   com_ui_all_proper: 'Alle',
   com_ui_clear: 'Löschen',
   com_ui_revoke: 'Widerrufen',
-  com_ui_revoke_info: 'Alle vom Benutzer angegebenen API-Keys widerrufen',
+  com_ui_revoke_info: 'Benutzer-API-Keys widerrufen',
   com_ui_import_conversation: 'Importieren',
   com_ui_nothing_found: 'Nichts gefunden',
   com_ui_go_to_conversation: 'Zur Konversation gehen',
@@ -415,7 +416,7 @@ export default {
   com_endpoint_bing_system_message_placeholder:
     'WARNUNG: Missbrauch dieser Funktion kann zu einer SPERRE für die Nutzung von Bing führen! Klicke auf \'Systemnachricht\' für vollständige Anweisungen und die Standardnachricht, wenn ausgelassen, was die \'Sydney\'-Voreinstellung ist, die als sicher gilt.',
   com_endpoint_system_message: 'Systemnachricht',
-  com_endpoint_message: 'Nachricht',
+  com_endpoint_message: 'Nachricht an',
   com_endpoint_message_not_appendable: 'Bearbeite deine Nachricht oder generiere neu.',
   com_endpoint_default_blank: 'Standard: leer',
   com_endpoint_default_false: 'Standard: falsch',
@@ -586,7 +587,7 @@ export default {
   com_nav_welcome_assistant: 'Bitte wähle einen Assistenten aus',
   com_nav_welcome_message: 'Wie kann ich dir heute helfen?',
   com_nav_auto_scroll: 'Automatisch zur neuesten Nachricht scrollen, wenn der Chat geöffnet wird',
-  com_nav_hide_panel: 'Rechtes Seitenpanel ausblenden',
+  com_nav_hide_panel: 'Rechte Seitenleiste verstecken',
   com_nav_modular_chat: 'Ermöglicht das Wechseln der Endpunkte mitten im Gespräch',
   com_nav_latex_parsing: 'LaTeX in Nachrichten parsen (kann die Leistung beeinflussen)',
   com_nav_text_to_speech: 'Text zu Sprache',
@@ -612,7 +613,7 @@ export default {
   com_ui_select_file: 'Datei auswählen',
   com_ui_drag_drop_file: 'Datei hier hinziehen und ablegen',
   com_ui_upload_image: 'Ein Bild hochladen',
-  com_ui_select_a_category: 'Keine Kategorie ausgewählt',
+  com_ui_select_a_category: 'Kategorie wählen',
   com_nav_tool_dialog_description:
     'Assistent muss gespeichert werden, um Werkzeugauswahlen zu speichern.',
   com_show_agent_settings: 'Agenteneinstellungen anzeigen',
@@ -723,6 +724,39 @@ export default {
   com_nav_setting_speech: 'Sprache',
   com_nav_language: 'Sprache',
   com_nav_lang_auto: 'Automatisch erkennen',
+  com_ui_clear_all: 'Auswahl löschen',
+  com_ui_dropdown_variables: 'Dropdown-Variablen:',
+  com_ui_dropdown_variables_info:
+    'Erstellen Sie benutzerdefinierte Dropdown-Menüs für Ihre Eingabeaufforderungen: `{{variable_name:option1|option2|option3}}`',
+  com_nav_plus_command: '+-Befehl',
+  com_nav_plus_command_description:
+    'Schaltet den Befehl "+" zum Hinzufügen einer Mehrfachantwort-Einstellung um',
+  com_nav_slash_command: '/-Befehl',
+  com_nav_slash_command_description:
+    'Schaltet den Befehl "/" zur Auswahl einer Eingabeaufforderung über die Tastatur um',
+  com_nav_command_settings: 'Befehlseinstellungen',
+  com_nav_convo_menu_options: 'Optionen des Gesprächsmenüs',
+  com_ui_artifacts: 'Artefakte',
+  com_ui_artifacts_toggle: 'Artefakte-Funktion einschalten',
+  com_nav_info_code_artifacts:
+    'Aktiviert die Anzeige experimenteller Code-Artefakte neben dem Chat',
+  com_ui_include_shadcnui: 'Anweisungen für shadcn/ui-Komponenten einschließen',
+  com_nav_info_include_shadcnui:
+    'Wenn aktiviert, werden Anweisungen zur Verwendung von shadcn/ui-Komponenten eingeschlossen. shadcn/ui ist eine Sammlung wiederverwendbarer Komponenten, die mit Radix UI und Tailwind CSS erstellt wurden. Hinweis: Dies sind umfangreiche Anweisungen, die Sie nur aktivieren sollten, wenn es Ihnen wichtig ist, das KI-Modell über die korrekten Importe und Komponenten zu informieren. Weitere Informationen zu diesen Komponenten finden Sie unter: https://ui.shadcn.com/',
+  com_ui_custom_prompt_mode: 'Benutzerdefinierter Promptmodus für Artefakte',
+  com_nav_info_custom_prompt_mode:
+    'Wenn aktiviert, wird die Standard-Systemaufforderung für Artefakte nicht eingeschlossen. Alle Anweisungen zur Erzeugung von Artefakten müssen in diesem Modus manuell bereitgestellt werden.',
+  com_ui_artifact_click: 'Zum Öffnen klicken',
+  com_a11y_start: 'Die KI hat mit ihrer Antwort begonnen.',
+  com_a11y_ai_composing: 'Die KI erstellt noch ihre Antwort.',
+  com_a11y_end: 'Die KI hat ihre Antwort beendet.',
+  com_nav_commands: 'Befehle',
+  com_nav_commands_tab: 'Befehlseinstellungen',
+  com_nav_at_command: '@-Befehl',
+  com_nav_at_command_description:
+    'Schaltet den Befehl "@" zum Wechseln von Endpunkten, Modellen, Voreinstellungen usw. um.',
+  com_nav_command_settings_description:
+    'Passen Sie an, welche Tastaturbefehle im Chat verfügbar sind',
 };
 
 export const comparisons = {
diff --git a/client/src/localization/languages/Eng.ts b/client/src/localization/languages/Eng.ts
index 69615a15048..6a6617cc52c 100644
--- a/client/src/localization/languages/Eng.ts
+++ b/client/src/localization/languages/Eng.ts
@@ -22,6 +22,12 @@ export default {
     'It appears that the content submitted has been flagged by our moderation system for not aligning with our community guidelines. We\'re unable to proceed with this specific topic. If you have any other questions or topics you\'d like to explore, please edit your message, or create a new conversation.',
   com_error_no_user_key: 'No key found. Please provide a key and try again.',
   com_error_no_base_url: 'No base URL found. Please provide one and try again.',
+  com_warning_resubmit_unsupported:
+    'Resubmitting the AI message is not supported for this endpoint.',
+  com_error_invalid_request_error:
+    'The AI service rejected the request due to an error. This could be caused by an invalid API key or an improperly formatted request.',
+  com_error_no_system_messages:
+    'The selected AI service or model does not support system messages. Try using prompts instead of custom instructions.',
   com_error_invalid_user_key: 'Invalid key provided. Please provide a valid key and try again.',
   com_error_expired_user_key:
     'Provided key for {0} expired at {1}. Please provide a new key and try again.',
@@ -140,12 +146,15 @@ export default {
   com_ui_endpoint: 'Endpoint',
   com_ui_provider: 'Provider',
   com_ui_model: 'Model',
+  com_ui_region: 'Region',
   com_ui_model_parameters: 'Model Parameters',
   com_ui_model_save_success: 'Model parameters saved successfully',
   com_ui_select_model: 'Select a model',
+  com_ui_select_region: 'Select a region',
   com_ui_select_provider: 'Select a provider',
   com_ui_select_provider_first: 'Select a provider first',
   com_ui_select_search_model: 'Search model by name',
+  com_ui_select_search_region: 'Search region by name',
   com_ui_select_search_plugin: 'Search plugin by name',
   com_ui_use_prompt: 'Use prompt',
   com_ui_prev: 'Prev',
@@ -353,8 +362,10 @@ export default {
   com_ui_bookmarks_delete_error: 'There was an error deleting the bookmark',
   com_ui_bookmarks_add_to_conversation: 'Add to current conversation',
   com_ui_bookmarks_filter: 'Filter bookmarks...',
+  com_ui_bookmarks_delete: 'Delete Bookmark',
   com_ui_no_bookmarks: 'it seems like you have no bookmarks yet. Click on a chat and add a new one',
   com_ui_no_conversation_id: 'No conversation ID found',
+  com_ui_add_multi_conversation: 'Add multi-conversation',
   com_auth_error_login:
     'Unable to login with the information provided. Please check your credentials and try again.',
   com_auth_error_login_rl:
@@ -553,6 +564,7 @@ export default {
   com_endpoint_export: 'Export',
   com_endpoint_export_share: 'Export/Share',
   com_endpoint_assistant: 'Assistant',
+  com_endpoint_search: 'Search endpoint by name',
   com_endpoint_use_active_assistant: 'Use Active Assistant',
   com_endpoint_assistant_model: 'Assistant Model',
   com_endpoint_save_as_preset: 'Save As Preset',
@@ -613,6 +625,7 @@ export default {
   com_nav_welcome_assistant: 'Please Select an Assistant',
   com_nav_welcome_message: 'How can I help you today?',
   com_nav_auto_scroll: 'Auto-Scroll to latest message on chat open',
+  com_nav_user_msg_markdown: 'Render user messages as markdown',
   com_nav_hide_panel: 'Hide right-most side panel',
   com_nav_modular_chat: 'Enable switching Endpoints mid-conversation',
   com_nav_latex_parsing: 'Parsing LaTeX in messages (may affect performance)',
@@ -750,6 +763,9 @@ export default {
   com_nav_info_delete_cache_storage:
     'This action will delete all cached TTS (Text-to-Speech) audio files stored on your device. Cached audio files are used to speed up playback of previously generated TTS audio, but they can consume storage space on your device.',
   // Command Settings Tab
+  com_nav_chat_commands: 'Chat Commands',
+  com_nav_chat_commands_info:
+    'These commands are activated by typing specific characters at the beginning of your message. Each command is triggered by its designated prefix. You can disable them if you frequently use these characters to start messages.',
   com_nav_commands: 'Commands',
   com_nav_commands_tab: 'Command Settings',
   com_nav_at_command: '@-Command',
@@ -761,6 +777,7 @@ export default {
   com_nav_slash_command_description: 'Toggle command "/" for selecting a prompt via keyboard',
   com_nav_command_settings: 'Command Settings',
   com_nav_command_settings_description: 'Customize which commands are available in the chat',
+  com_nav_no_search_results: 'No search results found',
   com_nav_setting_general: 'General',
   com_nav_setting_chat: 'Chat',
   com_nav_setting_beta: 'Beta features',
diff --git a/client/src/localization/languages/It.ts b/client/src/localization/languages/It.ts
index 88e5af0fedb..b23cbb5a59f 100644
--- a/client/src/localization/languages/It.ts
+++ b/client/src/localization/languages/It.ts
@@ -207,12 +207,12 @@ export default {
   com_ui_shared_link_not_found: 'Link condiviso non trovato',
   com_ui_delete_conversation: 'Eliminare la chat?',
   com_ui_delete_confirm: 'Questo eliminerà',
-  com_ui_rename: 'Rinominare',
-  com_ui_archive: 'Arsip',
+  com_ui_rename: 'Rinomina',
+  com_ui_archive: 'Archivia',
   com_ui_archive_error: 'Errore durante l\'archiviazione della conversazione',
   com_ui_unarchive: 'Disarchivia',
   com_ui_unarchive_error: 'Impossibile disarchiviare la conversazione',
-  com_ui_more_options: 'Pi',
+  com_ui_more_options: 'Più',
   com_ui_delete_assistant_confirm:
     'Sei sicuro di voler eliminare questo Assistente? Questa operazione non può essere annullata.',
   com_ui_preview: 'Anteprima',
@@ -1361,11 +1361,11 @@ export const comparisons = {
   },
   com_ui_rename: {
     english: 'Rename',
-    translated: 'Rinominare',
+    translated: 'Rinomina',
   },
   com_ui_archive: {
     english: 'Archive',
-    translated: 'Arsip',
+    translated: 'Archivia',
   },
   com_ui_archive_error: {
     english: 'Failed to archive conversation',
diff --git a/client/src/localization/languages/Jp.ts b/client/src/localization/languages/Jp.ts
index e515ced19ea..3c13aa8c43b 100644
--- a/client/src/localization/languages/Jp.ts
+++ b/client/src/localization/languages/Jp.ts
@@ -3,38 +3,63 @@
 // file deepcode ignore HardcodedNonCryptoSecret: No hardcoded secrets present in this file
 
 export default {
+  com_nav_convo_menu_options: '会話メニューオプション',
+  com_ui_artifacts: 'アーティファクト',
+  com_ui_artifacts_toggle: 'アーティファクト UI の切替',
+  com_nav_info_code_artifacts:
+    'チャットの横に実験的なコード アーティファクトの表示を有効にします',
+  com_ui_include_shadcnui: 'shadcn/uiコンポーネントの指示を含める',
+  com_nav_info_include_shadcnui:
+    '有効にすると、shadcn/uiコンポーネントを使用するための指示が含まれます。shadcn/uiはRadix UIとTailwind CSSを使用して構築された再利用可能なコンポーネントのコレクションです。注:これらの指示は長文ですので、LLM に正しいインポートとコンポーネントを知らせることが重要でない限り、有効にしないでください。これらのコンポーネントの詳細については、https://ui.shadcn.com/をご覧ください。',
+  com_ui_custom_prompt_mode: 'カスタムプロンプトモード',
+  com_nav_info_custom_prompt_mode:
+    '有効にすると、デフォルトのアーティファクト システム プロンプトは含まれません。このモードでは、アーティファクト生成指示をすべて手動で提供する必要があります。',
+  com_ui_artifact_click: 'クリックして開く',
+  com_a11y_start: 'AIが返信を開始しました。',
+  com_a11y_ai_composing: 'AIはまだ作成中です。',
+  com_a11y_end: 'AIは返信を完了しました。',
   com_error_moderation:
     '送信されたコンテンツは、コミュニティガイドラインに準拠していないとして、投稿監視システムによって検知されました。この特定のトピックについては処理を続行できません。他に質問や調べたいトピックがある場合は、メッセージを編集するか、新しい会話を作成してください。',
   com_error_no_user_key: 'キーが見つかりません。キーを入力して再試行してください。',
   com_error_no_base_url: 'ベースURLが見つかりません。ベースURLを入力して再試行してください。',
+  com_error_invalid_user_key: '無効なキーが提供されました。キーを入力して再試行してください。',
   com_error_expired_user_key:
     '{0}の提供されたキーは{1}で期限切れです。キーを入力して再試行してください。',
+  com_error_input_length:
+    '最新のメッセージトークン数は長すぎます。トークン制限 ({0}) を超えています。メッセージを短くするか、会話パラメーターから最大コンテキストサイズを調整するか、会話を分岐して続行してください。',
   com_files_no_results: '結果がありません。',
   com_files_filter: 'ファイルをフィルタリング...',
   com_files_number_selected: '{0} of {1} ファイルが選択されました',
-  com_sidepanel_select_assistant: 'Assistantを選択',
+  com_sidepanel_select_assistant: 'アシスタントを選択',
   com_sidepanel_parameters: 'パラメータ',
-  com_sidepanel_assistant_builder: 'Assistant Builder',
+  com_sidepanel_assistant_builder: 'アシスタントビルダー',
   com_sidepanel_hide_panel: 'パネルを隠す',
   com_sidepanel_attach_files: 'ファイルを添付する',
   com_sidepanel_manage_files: 'ファイルを管理',
   com_sidepanel_conversation_tags: 'ブックマーク',
-  com_assistants_capabilities: 'Capabilities',
+  com_assistants_capabilities: '機能',
+  com_assistants_file_search: 'ファイル検索',
+  com_assistants_file_search_info:
+    'ファイル検索用のベクトル ストアを添付することはまだサポートされていません。プロバイダ プレイグラウンドからそれらを添付するか、スレッド単位でメッセージにファイルを添付してファイル検索を行うことができます。',
+  com_assistants_code_interpreter_info:
+    'コードインタプリタは、アシスタントがコードを書いて実行できるようにします。このツールは、さまざまなデータとフォーマットを持つファイルを処理し、グラフなどのファイルを生成することができます。',
   com_assistants_knowledge: 'ナレッジ',
   com_assistants_knowledge_info:
     'ナレッジの下でファイルをアップロードする場合、アシスタントとの会話にファイルの内容が含まれる場合があります。',
   com_assistants_knowledge_disabled:
-    'ファイルをナレッジとしてアップロードする前に、アシスタントを作成し、Code InterpreterまたはRetrievalを有効にして保存する必要があります。',
-  com_assistants_image_vision: 'Image Vision',
-  com_assistants_code_interpreter: 'Code Interpreter',
-  com_assistants_code_interpreter_files: '次のファイルはCode Interpreterでのみ使用できます。',
-  com_assistants_retrieval: 'Retrieval',
-  com_assistants_search_name: 'Assistantの名前で検索',
-  com_assistants_tools: 'Tools',
-  com_assistants_actions: 'Actions',
-  com_assistants_add_tools: 'Toolsを追加',
+    'ファイルをナレッジとしてアップロードする前に、アシスタントを作成し、コードインタプリタまたは検索を有効にして保存する必要があります。',
+  com_assistants_image_vision: 'イメージビジョン',
+  com_assistants_code_interpreter: 'コードインタプリタ',
+  com_assistants_code_interpreter_files: '次のファイルはコードインタプリタでのみ使用できます。',
+  com_assistants_retrieval: '検索',
+  com_assistants_search_name: 'アシスタントの名前で検索',
+  com_assistants_tools: 'ツール',
+  com_assistants_actions: 'アクション',
+  com_assistants_add_tools: 'ツールを追加',
   com_assistants_add_actions: 'アクションを追加',
-  com_assistants_available_actions: '利用可能なActions',
+  com_assistants_non_retrieval_model:
+    'このモデルではファイル検索機能は有効になっていません。別のモデルを選択してください。',
+  com_assistants_available_actions: '利用可能なアクション',
   com_assistants_running_action: 'アクションを実行',
   com_assistants_completed_action: 'Talked to {0}',
   com_assistants_completed_function: 'Ran {0}',
@@ -44,8 +69,7 @@ export default {
   com_assistants_update_actions_success: 'アクションが作成または更新されました',
   com_assistants_update_actions_error: 'アクションの作成または更新中にエラーが発生しました。',
   com_assistants_delete_actions_error: 'アクションの削除中にエラーが発生しました。',
-  com_assistants_actions_info:
-    'アシスタントが API を介して情報を取得したり、アクションを実行したりできるようにします\'s',
+  com_assistants_actions_info: 'アシスタントが API を介して情報を取得したり、アクションを実行したりできるようにします\'s',
   com_assistants_name_placeholder: 'オプション: アシスタントの名前',
   com_assistants_instructions_placeholder: 'アシスタントが使用するシステム指示',
   com_assistants_description_placeholder: 'オプション: ここにアシスタントについて説明します',
@@ -54,30 +78,45 @@ export default {
   com_assistants_update_error: 'アシスタントの更新中にエラーが発生しました。',
   com_assistants_create_success: 'アシスタントが正常に作成されました。',
   com_assistants_create_error: 'アシスタントの作成中にエラーが発生しました。',
+  com_assistants_conversation_starters: '会話のきっかけ',
+  com_assistants_conversation_starters_placeholder: '会話のきっかけを入力してください',
+  com_sidepanel_agent_builder: 'エージェントビルダー',
+  com_agents_name_placeholder: 'オプション: エージェントの名前',
+  com_agents_description_placeholder: 'オプション: エージェントの説明を入力してください',
+  com_agents_instructions_placeholder: 'エージェントが使用するシステムの指示',
+  com_agents_search_name: '名前でエージェントを検索',
+  com_agents_update_error: 'エージェントの更新中にエラーが発生しました。',
+  com_agents_create_error: 'エージェントの作成中にエラーが発生しました。',
+  com_ui_date_today: '今日',
+  com_ui_date_yesterday: '昨日',
+  com_ui_date_previous_7_days: '過去7日間',
+  com_ui_date_previous_30_days: '過去30日間',
+  com_ui_date_january: '1月',
+  com_ui_date_february: '2月',
+  com_ui_date_march: '3月',
+  com_ui_date_april: '4月',
+  com_ui_date_may: '5月',
+  com_ui_date_june: '6月',
+  com_ui_date_july: '7月',
+  com_ui_date_august: '8月',
+  com_ui_date_september: '9月',
+  com_ui_date_october: '10月',
+  com_ui_date_november: '11月',
+  com_ui_date_december: '12月',
   com_ui_field_required: '必須入力項目です',
-  com_ui_download_error:
-    'ファイルのダウンロード中にエラーが発生しました。ファイルが削除された可能性があります。',
-  com_ui_attach_error_type: 'エンドポイントでサポートされていないファイル タイプ:',
-  com_ui_attach_error_size: 'エンドポイントのファイル サイズ制限を超えました:',
+  com_ui_download_error: 'ファイルのダウンロード中にエラーが発生しました。ファイルが削除された可能性があります。',
+  com_ui_attach_error_type: 'エンドポイントでサポートされていないファイルタイプ:',
+  com_ui_attach_error_openai: '他のエンドポイントにアシスタントファイルを添付することはできません',
+  com_ui_attach_warn_endpoint: '互換性のあるツールがない場合、非アシスタントのファイルは無視される可能性があります',
+  com_ui_attach_error_size: 'エンドポイントのファイルサイズ制限を超えました:',
   com_ui_attach_error:
     'ファイルを添付できません。会話を作成または選択するか、ページを更新してみてください。',
   com_ui_examples: '例',
   com_ui_new_chat: '新規チャット',
   com_ui_happy_birthday: '初めての誕生日です！',
-  com_ui_example_quantum_computing: '量子コンピュータを簡潔に説明してください',
-  com_ui_example_10_year_old_b_day: '10歳の誕生日で行うクリエイティブなアイデアはありますか？',
-  com_ui_example_http_in_js: 'JavascriptでHTTPリクエストを作成するにはどうすればよいですか？',
-  com_ui_capabilities: '能力(機能)',
-  com_ui_capability_remember: 'ユーザと話した以前の会話の内容を参照します',
-  com_ui_capability_correction: 'ユーザーの追加の質問を許可する',
-  com_ui_capability_decline_requests: '不適切な要求を拒否するように学習されています',
-  com_ui_limitations: '制限事項',
-  com_ui_limitation_incorrect_info: '誤った情報を生成することがあります',
-  com_ui_limitation_harmful_biased: '有害な指示や偏った内容を生成する可能性があります',
-  com_ui_limitation_limited_2021: '2021年以降の出来事に関しては知識に制限があります',
-  com_ui_experimental: 'Experimental',
-  com_ui_on: 'On',
-  com_ui_off: 'Off',
+  com_ui_experimental: '実験機能',
+  com_ui_on: 'オン',
+  com_ui_off: 'オフ',
   com_ui_yes: 'はい',
   com_ui_no: 'いいえ',
   com_ui_ascending: '昇順',
@@ -85,78 +124,186 @@ export default {
   com_ui_show_all: 'すべて表示',
   com_ui_name: '名前',
   com_ui_date: '日付',
-  com_ui_storage: 'Storage',
-  com_ui_context: 'Context',
+  com_ui_storage: 'ストレージ',
+  com_ui_context: 'コンテキスト',
   com_ui_size: 'サイズ',
   com_ui_host: 'ホスト',
-  com_ui_update: 'Update',
+  com_ui_update: '更新',
   com_ui_authentication: '認証',
   com_ui_instructions: '指示文',
   com_ui_description: '概要',
   com_ui_error: 'エラー',
+  com_ui_error_connection: 'サーバーへの接続中にエラーが発生しました。ページを更新してください。',
   com_ui_select: '選択',
   com_ui_input: '入力',
   com_ui_close: '閉じる',
+  com_ui_endpoint: 'エンドポイント',
+  com_ui_provider: 'プロバイダ',
   com_ui_model: 'モデル',
+  com_ui_model_parameters: 'モデルパラメータ',
+  com_ui_model_save_success: 'モデルパラメータが正常に保存されました',
   com_ui_select_model: 'モデル選択',
-  com_ui_select_search_model: 'モデル名で検索',
+  com_ui_select_provider: 'プロバイダーを選択してください',
+  com_ui_select_provider_first: '最初にプロバイダーを選択してください',
+  com_ui_select_search_model: '名前でモデルを検索',
   com_ui_select_search_plugin: 'プラグイン名で検索',
   com_ui_use_prompt: 'プロンプトの利用',
   com_ui_prev: '前',
   com_ui_next: '次',
   com_ui_stop: '止める',
   com_ui_upload_files: 'ファイルをアップロード',
-  com_ui_prompt_templates: 'プロンプトテンプレート',
-  com_ui_hide_prompt_templates: 'プロンプトテンプレートを非表示',
+  com_ui_prompt: 'プロンプト',
+  com_ui_prompts: 'プロンプト',
+  com_ui_prompt_name: 'プロンプト名',
+  com_ui_delete_prompt: 'プロンプトを消しますか?',
+  com_ui_admin: '管理者',
+  com_ui_simple: 'シンプル',
+  com_ui_versions: 'バージョン',
+  com_ui_version_var: 'バージョン {0}',
+  com_ui_advanced: '高度',
+  com_ui_admin_settings: '管理者設定',
+  com_ui_error_save_admin_settings: '管理者設定の保存にエラーが発生しました。',
+  com_ui_prompt_preview_not_shared: 'このプロンプトに対して共同作業が許可されていません。',
+  com_ui_prompt_name_required: 'プロンプト名は必須です',
+  com_ui_prompt_text_required: 'テキストは必須です',
+  com_ui_prompt_text: 'テキスト',
+  com_ui_back_to_chat: 'チャットに戻る',
+  com_ui_back_to_prompts: 'プロンプトに戻る',
+  com_ui_categories: 'カテゴリ',
+  com_ui_filter_prompts_name: '名前でプロンプトをフィルタ',
+  com_ui_search_categories: 'カテゴリを検索',
+  com_ui_manage: '管理',
+  com_ui_variables: '変数',
+  com_ui_variables_info:
+    'テキスト内で二重中括弧を使用して変数を定義します。例えば、`{{example variable}}`のようにすると、プロンプトを使用するときに後で値を埋め込むことができます。',
+  com_ui_special_variables: '特殊変数:',
+  com_ui_special_variables_info:
+    '`{{current_date}}`は現在の日付、`{{current_user}}`は指定されたアカウント名に使用します。',
+  com_ui_dropdown_variables: 'ドロップダウン変数:',
+  com_ui_dropdown_variables_info:
+    'プロンプトのカスタムドロップダウンメニューを作成します: `{{variable_name:option1|option2|option3}}`',
   com_ui_showing: '表示',
   com_ui_of: 'of',
   com_ui_entries: 'エントリー',
   com_ui_pay_per_call: 'すべてのAIモデルを1つの場所で。支払いは使った分だけ',
   com_ui_new_footer: 'すべてのAIモデルを1つの場所で。',
-  com_ui_enter: 'Enter',
+  com_ui_latest_footer: 'Every AI for Everyone.',
+  com_ui_enter: '入力',
   com_ui_submit: '送信する',
+  com_ui_none_selected: '選択されていません',
   com_ui_upload_success: 'アップロード成功',
   com_ui_upload_error: 'ファイルのアップロード中にエラーが発生しました。',
+  com_ui_upload_invalid: 'アップロードに無効なファイルです。制限を超えない画像である必要があります。',
+  com_ui_upload_invalid_var: 'アップロードに無効なファイルです。 {0} MBまでの画像である必要があります。',
   com_ui_cancel: 'キャンセル',
   com_ui_save: '保存',
+  com_ui_renaming_var: '改名 "{0}"',
   com_ui_save_submit: '保存 & 送信',
   com_user_message: 'あなた',
+  com_ui_read_aloud: '読み上げる',
+  com_ui_copied: 'コピーしました！',
+  com_ui_copy_code: 'コードをコピーする',
   com_ui_copy_to_clipboard: 'クリップボードへコピー',
   com_ui_copied_to_clipboard: 'コピーしました',
+  com_ui_fork: '分岐',
+  com_ui_fork_info_1: 'この設定を使うと、希望の動作でメッセージを分岐させることができます。',
+  com_ui_fork_info_2:
+    '「分岐」とは、現在の会話から特定のメッセージを開始/終了点として新しい会話を作成し、選択したオプションに従ってコピーを作成することを指します。',
+  com_ui_fork_info_3:
+    '「ターゲットメッセージ」とは、このポップアップを開いたメッセージか、"{0}"にチェックを入れた場合は会話の最新のメッセージを指します。',
+  com_ui_fork_info_visible:
+    'この設定は、ターゲットメッセージへの直接の経路のみを表示し、分岐は表示しません。つまり、表示メッセージのみを抽出して表示するということです。',
+  com_ui_fork_info_branches:
+    'この設定では、表示されているメッセージとそれに関連するブランチ（つまり、ターゲットメッセージに至る直接の経路上のブランチを含む）を分岐させます。',
+  com_ui_fork_info_target:
+    'この設定では、対象のメッセージとその近傍のメッセージを含む、すべてのメッセージの枝を分岐させます。つまり、表示されているかどうか、同じ経路上にあるかどうかに関係なく、すべてのメッセージの枝が含まれます。',
+  com_ui_fork_info_start:
+    'チェックを入れると、上記で選択した動作に従って、このメッセージから会話の最新のメッセージまで分岐が開始されます。',
+  com_ui_fork_info_remember:
+    'この設定を有効にすると、今後の会話で同じオプションを選択する手間が省けるようになります。お好みの設定を記憶させることで、会話の分岐をスムーズに行えるようになります。',
+  com_ui_fork_success: '会話の分岐に成功しました',
+  com_ui_fork_processing: '会話を分岐しています...',
+  com_ui_fork_error: '会話を分岐できませんでした。エラーが発生しました。',
+  com_ui_fork_change_default: 'デフォルトの分岐オプション',
+  com_ui_fork_default: 'デフォルトの分岐オプションを使用する',
+  com_ui_fork_remember: '以前の会話内容を記憶する',
+  com_ui_fork_split_target_setting: 'デフォルトで対象メッセージから分岐を開始する',
+  com_ui_fork_split_target: 'ここで分岐を開始',
+  com_ui_fork_remember_checked:
+    '選択した内容は、次回の利用時にも記憶されます。設定から変更できます。',
+  com_ui_fork_all_target: 'すべてを対象に含める',
+  com_ui_fork_branches: '関連ブランチを含める',
+  com_ui_fork_visible: '表示メッセージのみ',
+  com_ui_fork_from_message: '分岐オプションを選択する',
+  com_ui_mention: 'エンドポイント、アシスタント、またはプリセットを素早く切り替えるには、それらを言及してください。',
+  com_ui_add_model_preset: '追加の応答のためのモデルまたはプリセットを追加する',
+  com_assistants_max_starters_reached: '会話の開始が最大数に達しました',
   com_ui_regenerate: '再度 生成する',
   com_ui_continue: '続きを生成する',
   com_ui_edit: '編集',
+  com_ui_loading: '読み込み中...',
   com_ui_success: '成功',
   com_ui_all: 'すべて',
+  com_ui_all_proper: 'すべて',
   com_ui_clear: '削除する',
   com_ui_revoke: '無効にする',
   com_ui_revoke_info: 'ユーザへ発行した認証情報をすべて無効にする。',
   com_ui_import_conversation: 'インポート',
+  com_ui_nothing_found: '該当するものが見つかりませんでした',
+  com_ui_go_to_conversation: '会話に移動する',
   com_ui_import_conversation_info: 'JSONファイルから会話をインポートする',
   com_ui_import_conversation_success: '会話のインポートに成功しました',
   com_ui_import_conversation_error: '会話のインポート時にエラーが発生しました',
+  com_ui_import_conversation_file_type_error: 'サポートされていないインポート形式です',
   com_ui_confirm_action: '実行する',
+  com_ui_chat: 'チャット',
+  com_ui_chat_history: 'チャット履歴',
+  com_ui_controls: '管理',
+  com_ui_dashboard: 'ダッシュボード',
   com_ui_chats: 'チャット',
   com_ui_avatar: 'アバター',
   com_ui_unknown: '不明',
   com_ui_result: '結果',
   com_ui_image_gen: '画像生成',
-  com_ui_assistant: 'Assistant',
-  com_ui_assistants: 'Assistants',
+  com_ui_assistant: 'アシスタント',
+  com_ui_assistant_deleted: 'アシスタントが正常に削除されました',
+  com_ui_assistant_delete_error: 'アシスタントの削除中にエラーが発生しました。',
+  com_ui_assistants: 'アシスタント',
   com_ui_attachment: '添付ファイル',
   com_ui_assistants_output: 'Assistantsの出力',
+  com_ui_agent: 'エージェント',
+  com_ui_agent_deleted: 'エージェントを正常に削除しました',
+  com_ui_agent_delete_error: 'エージェントの削除中にエラーが発生しました',
+  com_ui_agents: 'エージェント',
+  com_ui_delete_agent_confirm: 'このエージェントを削除してもよろしいですか？',
   com_ui_delete: '削除',
   com_ui_create: '作成',
+  com_ui_create_prompt: 'プロンプトを作成する',
   com_ui_share: '共有',
+  com_ui_share_var: '{0} を共有',
+  com_ui_enter_var: '{0} を入力',
   com_ui_copy_link: 'リンクをコピー',
   com_ui_update_link: 'リンクを更新する',
   com_ui_create_link: 'リンクを作成する',
+  com_ui_share_to_all_users: '全ユーザーと共有',
+  com_ui_my_prompts: 'マイ プロンプト',
+  com_ui_no_category: 'カテゴリなし',
+  com_ui_shared_prompts: '共有されたプロンプト',
+  com_ui_prompts_allow_use: 'プロンプトの使用を許可',
+  com_ui_prompts_allow_create: 'プロンプトの作成を許可',
+  com_ui_prompts_allow_share_global: '全ユーザーとプロンプトを共有することを許可',
+  com_ui_prompt_shared_to_all: 'このプロンプトは全ユーザーと共有されています',
+  com_ui_prompt_update_error: 'プロンプトの更新中にエラーが発生しました',
+  com_ui_prompt_already_shared_to_all: 'このプロンプトはすでに全ユーザーと共有されています',
+  com_ui_description_placeholder: 'オプション:プロンプトを表示するときの説明を入力',
+  com_ui_command_placeholder: 'オプション:プロンプトのコマンドまたは名前を入力',
+  com_ui_command_usage_placeholder: 'コマンドまたは名前でプロンプトを選択してください',
+  com_ui_no_prompt_description: '説明が見つかりません。',
   com_ui_share_link_to_chat: 'チャットへの共有リンク',
   com_ui_share_error: 'チャットの共有リンクの共有中にエラーが発生しました',
   com_ui_share_retrieve_error: '共有リンクの削除中にエラーが発生しました。',
   com_ui_share_delete_error: '共有リンクの削除中にエラーが発生しました。',
-  com_ui_share_create_message:
-    'あなたの名前と共有リンクを作成した後のメッセージは、共有されません。',
+  com_ui_share_create_message: 'あなたの名前と共有リンクを作成した後のメッセージは、共有されません。',
   com_ui_share_created_message:
     'チャットの共有リンクが作成されました。設定から以前共有したチャットを管理できます。',
   com_ui_share_update_message:
@@ -166,7 +313,14 @@ export default {
   com_ui_shared_link_not_found: '共有リンクが見つかりません',
   com_ui_delete_conversation: 'チャットを削除しますか？',
   com_ui_delete_confirm: 'このチャットは削除されます。',
-  com_ui_delete_assistant_confirm: 'このアシスタントを削除しますか？ この操作は元に戻せません。',
+  com_ui_delete_tool: 'ツールを削除',
+  com_ui_delete_tool_confirm: 'このツールを削除してもよろしいですか？',
+  com_ui_delete_action: 'アクションを削除',
+  com_ui_delete_action_confirm: 'このアクションを削除してもよろしいですか？',
+  com_ui_delete_confirm_prompt_version_var:
+    'これは、選択されたバージョンを "{0}." から削除します。他のバージョンが存在しない場合、プロンプトが削除されます。',
+  com_ui_delete_assistant_confirm:
+    'このアシスタントを削除しますか？ この操作は元に戻せません。',
   com_ui_rename: 'タイトル変更',
   com_ui_archive: 'アーカイブ',
   com_ui_archive_error: 'アーカイブに失敗しました。',
@@ -176,14 +330,15 @@ export default {
   com_ui_preview: 'プレビュー',
   com_ui_upload: 'アップロード',
   com_ui_connect: '接続',
+  com_ui_locked: 'ロック',
   com_ui_upload_delay:
     'ファイル "{0}"のアップロードに時間がかかっています。ファイルの検索のためのインデックス作成が完了するまでお待ちください。',
   com_ui_privacy_policy: 'プライバシーポリシー',
   com_ui_terms_of_service: '利用規約',
+  com_ui_use_micrphone: 'マイクを使用する',
   com_ui_min_tags: 'これ以上の値を削除できません。少なくとも {0} が必要です。',
   com_ui_max_tags: '最新の値を使用した場合、許可される最大数は {0} です。',
   com_ui_bookmarks: 'ブックマーク',
-  com_ui_bookmarks_rebuild: '再構築',
   com_ui_bookmarks_new: '新しいブックマーク',
   com_ui_bookmark_delete_confirm: 'このブックマークを削除してもよろしいですか？',
   com_ui_bookmarks_title: 'タイトル',
@@ -192,21 +347,24 @@ export default {
   com_ui_bookmarks_create_success: 'ブックマークが正常に作成されました',
   com_ui_bookmarks_update_success: 'ブックマークが正常に更新されました',
   com_ui_bookmarks_delete_success: 'ブックマークが正常に削除されました',
+  com_ui_bookmarks_create_exists: 'このブックマークは既に存在します',
   com_ui_bookmarks_create_error: 'ブックマークの作成中にエラーが発生しました',
   com_ui_bookmarks_update_error: 'ブックマークの更新中にエラーが発生しました',
   com_ui_bookmarks_delete_error: 'ブックマークの削除中にエラーが発生しました',
   com_ui_bookmarks_add_to_conversation: '現在の会話に追加',
-  com_ui_accept: '同意します',
-  com_ui_decline: '同意しません',
-  com_ui_terms_and_conditions: '利用規約',
-  com_ui_no_terms_content: '利用規約の内容がありません',
+  com_ui_bookmarks_filter: 'ブックマークをフィルタリング...',
+  com_ui_no_bookmarks: 'ブックマークがまだないようです。チャットをクリックして新しいブックマークを追加してください',
+  com_ui_no_conversation_id: '会話 ID が見つかりません',
   com_auth_error_login:
     '入力された情報ではログインできませんでした。認証情報を確認した上で再度お試しください。',
   com_auth_error_login_rl:
     'お使いのIPアドレスから短時間に多数のログイン試行がありました。しばらくしてから再度お試しください。',
-  com_auth_error_login_ban: '本サービスの利用規約違反のため、一時的にアカウントを停止しました。',
+  com_auth_error_login_ban:
+    '本サービスの利用規約違反のため、一時的にアカウントを停止しました。',
   com_auth_error_login_server:
     'サーバーエラーが発生しています。。しばらくしてから再度お試しください。',
+  com_auth_error_login_unverified:
+    'アカウントはまだ確認されていません。確認リンクが記載されたメールを確認してください。',
   com_auth_no_account: 'アカウントをお持ちでない場合はこちら',
   com_auth_sign_up: '新規登録',
   com_auth_sign_in: 'ログイン',
@@ -229,7 +387,8 @@ export default {
   com_auth_password_not_match: 'パスワードが一致しません',
   com_auth_continue: '続ける',
   com_auth_create_account: 'アカウント登録',
-  com_auth_error_create: 'アカウント登録に失敗しました。もう一度お試しください。',
+  com_auth_error_create:
+    'アカウント登録に失敗しました。もう一度お試しください。',
   com_auth_full_name: 'フルネーム',
   com_auth_name_required: 'フルネームは必須です',
   com_auth_name_min_length: 'フルネームは最低3文字で入力してください',
@@ -240,14 +399,17 @@ export default {
   com_auth_username_max_length: 'ユーザ名は最大20文字で入力してください',
   com_auth_already_have_account: '既にアカウントがある場合はこちら',
   com_auth_login: 'ログイン',
+  com_auth_registration_success_insecure: '登録が完了しました。',
+  com_auth_registration_success_generic: 'メールアドレスを確認するために、メールをご確認ください。',
   com_auth_reset_password: 'パスワードをリセット',
   com_auth_click: 'クリック',
   com_auth_here: 'こちら',
-  com_auth_to_reset_your_password: 'to reset your password.',
+  com_auth_to_reset_your_password: 'パスワードをリセットします。',
   com_auth_reset_password_link_sent: 'メールを送信',
-  com_auth_reset_password_email_sent: 'パスワードのリセット方法を記載したメールを送信しました。',
-  com_auth_error_reset_password:
-    'パスワードのリセット中に問題が発生しました。指定されたメールアドレスのユーザは存在しません。別のメールアドレスでもう一度お試しください。',
+  com_auth_reset_password_if_email_exists:
+    'そのメールアドレスのアカウントが存在する場合は、パスワードリセット手順が記載されたメールが送信されています。スパムフォルダを必ず確認してください。',
+  com_auth_reset_password_email_sent:
+    'パスワードのリセット方法を記載したメールを送信しました。',
   com_auth_reset_password_success: 'パスワードのリセットに成功しました',
   com_auth_login_with_new_password: '新しいパスワードでログインをお試しください。',
   com_auth_error_invalid_reset_token: '無効なパスワードリセットトークンです。',
@@ -256,7 +418,18 @@ export default {
   com_auth_submit_registration: '登録をする',
   com_auth_welcome_back: 'おかえりなさい',
   com_auth_back_to_login: 'ログイン画面に戻る',
-  com_endpoint_open_menu: 'メニューを開く',
+  com_auth_email_verification_failed: 'メール検証に失敗しました',
+  com_auth_email_verification_rate_limited: 'リクエストが多すぎます。しばらくしてからもう一度お試しください',
+  com_auth_email_verification_success: 'メールが正常に検証されました',
+  com_auth_email_resent_success: '検証メールが正常に再送信されました',
+  com_auth_email_resent_failed: '検証メールの再送信に失敗しました',
+  com_auth_email_verification_failed_token_missing: '検証に失敗しました。トークンがありません',
+  com_auth_email_verification_invalid: '無効なメール検証です',
+  com_auth_email_verification_in_progress: 'メールを検証しています。しばらくお待ちください',
+  com_auth_email_verification_resend_prompt: 'メールが届きませんか？',
+  com_auth_email_resend_link: 'メールを再送信',
+  com_auth_email_verification_redirecting: '{0} 秒後にリダイレクトします...',
+  com_endpoint_open_menu: 'Open Menu',
   com_endpoint_bing_enable_sydney: 'Sydney有効化',
   com_endpoint_bing_to_enable_sydney: '(Sydneyを利用する)',
   com_endpoint_bing_jailbreak: 'ジェイルブレイク',
@@ -276,6 +449,9 @@ export default {
   com_endpoint_tone_style: 'トーンスタイル',
   com_endpoint_token_count: 'トークン数',
   com_endpoint_output: '出力',
+  com_endpoint_context_tokens: 'コンテキストトークン数の最大値',
+  com_endpoint_context_info: `コンテキストに使用できるトークンの最大数です。リクエストごとに送信されるトークン数を制御するために使用します。
+  指定しない場合は、既知のモデルのコンテキストサイズに基づいてシステムのデフォルト値が使用されます。高い値を設定すると、エラーが発生したり、トークンコストが高くなる可能性があります。`,
   com_endpoint_google_temp:
     '大きい値 = ランダム性が増します。低い値 = より決定論的になります。この値を変更するか、Top P の変更をおすすめしますが、両方を変更はおすすめしません。',
   com_endpoint_google_topp:
@@ -285,19 +461,25 @@ export default {
   com_endpoint_google_maxoutputtokens:
     ' 	生成されるレスポンスの最大トークン数。短いレスポンスには低い値を、長いレスポンスには高い値を指定します。',
   com_endpoint_google_custom_name_placeholder: 'Googleのカスタム名を設定する',
-  com_endpoint_prompt_prefix_placeholder:
-    'custom instructions か context を設定する。空の場合は無視されます。',
-  com_endpoint_custom_name: 'プリセット名',
-  com_endpoint_prompt_prefix: 'プロンプトの先頭',
+  com_endpoint_prompt_prefix_placeholder: 'custom instructions か context を設定する。空の場合は無視されます。',
   com_endpoint_instructions_assistants_placeholder:
     'アシスタントの指示を上書きします。これは、実行ごとに動作を変更する場合に便利です。',
   com_endpoint_prompt_prefix_assistants_placeholder:
     'アシスタントの主な指示に加えて、追加の指示やコンテキストを設定します。空欄の場合は無視されます。',
+  com_endpoint_custom_name: 'プリセット名',
+  com_endpoint_prompt_prefix: 'プロンプトの先頭',
+  com_endpoint_prompt_prefix_assistants: '追加の指示',
+  com_endpoint_instructions_assistants: '指示をオーバーライドする',
   com_endpoint_temperature: 'Temperature',
   com_endpoint_default: 'デフォルト',
   com_endpoint_top_p: 'Top P',
   com_endpoint_top_k: 'Top K',
   com_endpoint_max_output_tokens: '最大出力トークン数',
+  com_endpoint_stop: 'シーケンスを停止',
+  com_endpoint_stop_placeholder: 'Enterキー押下で値を区切ります',
+  com_endpoint_openai_max_tokens: `オプションの \`max_tokens\` フィールドで、チャット補完時に生成可能な最大トークン数を設定します。
+
+    入力トークンと生成されたトークンの合計長さは、モデルのコンテキスト長によって制限されています。この数値がコンテキストの最大トークン数を超えると、エラーが発生する可能性があります。`,
   com_endpoint_openai_temp:
     '大きい値 = ランダム性が増します。低い値 = より決定論的になります。この値を変更するか、Top P の変更をおすすめしますが、両方を変更はおすすめしません。',
   com_endpoint_openai_max:
@@ -314,6 +496,7 @@ export default {
     '以前に添付されたすべてのファイルを再送信します。注意：これにより、トークンのコストが増加し、多くの添付ファイルでエラーが発生する可能性があります。',
   com_endpoint_openai_detail:
     'Visionリクエストの解像度を選択します。"Low"はコストが安くて低解像度、"Highは"コストが高くて高解像度"、"Auto"は画像の解像度に基づいて自動的に選択します。',
+  com_endpoint_openai_stop: 'APIがさらにトークンを生成するのを止めるため、最大で4つのシーケンスを設定可能',
   com_endpoint_openai_custom_name_placeholder: 'ChatGPTのカスタム名を設定する',
   com_endpoint_openai_prompt_prefix_placeholder:
     'システムメッセージに含める Custom Instructions。デフォルト: none',
@@ -325,6 +508,9 @@ export default {
     'Top-k はモデルがトークンをどのように選択して出力するかを変更する。top-kが1の場合はモデルの語彙に含まれるすべてのトークンの中で最も確率が高い1つが選択される(greedy decodingと呼ばれている)。top-kが3の場合は上位3つのトークンの中から選択される。(temperatureを使用)',
   com_endpoint_anthropic_maxoutputtokens:
     '生成されるレスポンスの最大トークン数。短いレスポンスには低い値を、長いレスポンスには高い値を指定する。',
+  com_endpoint_anthropic_prompt_cache:
+    'プロンプトキャッシュを使用すると、API呼び出し間で大きなコンテキストや指示を再利用でき、コストとレイテンシを削減できます',
+  com_endpoint_prompt_cache: 'プロンプトキャッシュを使用する',
   com_endpoint_anthropic_custom_name_placeholder: 'Anthropicのカスタム名を設定する',
   com_endpoint_frequency_penalty: '頻度によるペナルティ',
   com_endpoint_presence_penalty: '既存性によるペナルティ',
@@ -332,9 +518,9 @@ export default {
   com_endpoint_plug_resend_files: 'ファイルを再送',
   com_endpoint_plug_resend_images: '画像の再送信',
   com_endpoint_plug_image_detail: '画像の詳細',
-  com_endpoint_plug_skip_completion: 'Skip Completion',
-  com_endpoint_disabled_with_tools: 'disabled with tools',
-  com_endpoint_disabled_with_tools_placeholder: 'Disabled with Tools Selected',
+  com_endpoint_plug_skip_completion: '完了をスキップ',
+  com_endpoint_disabled_with_tools: 'ツールで無効化',
+  com_endpoint_disabled_with_tools_placeholder: 'ツールが選択されていると無効化されます',
   com_endpoint_plug_set_custom_instructions_for_gpt_placeholder:
     'システムメッセージに含める Custom Instructions。デフォルト: none',
   com_endpoint_import: 'インポート',
@@ -364,12 +550,12 @@ export default {
   com_endpoint_completion: 'コンプリーション',
   com_endpoint_agent: 'エージェント',
   com_endpoint_show_what_settings: '設定 {0} を表示する',
-  com_endpoint_save: '保存',
   com_endpoint_export: 'エクスポート',
+  com_endpoint_export_share: 'エクスポート/共有',
   com_endpoint_assistant: 'アシスタント',
   com_endpoint_use_active_assistant: 'アクティブなアシスタントを使用',
   com_endpoint_assistant_model: 'アシスタント モデル',
-  com_endpoint_save_as_preset: 'プリセットとして保存する',
+  com_endpoint_save_as_preset: 'プリセット保存',
   com_endpoint_presets_clear_warning:
     '本当にすべてのプリセットを削除しますか？ この操作は元に戻せません。',
   com_endpoint_not_implemented: 'まだ実装されていません',
@@ -383,10 +569,6 @@ export default {
   com_endpoint_func_hover: 'プラグインをOpenAIの関数として使えるようにする',
   com_endpoint_skip_hover:
     'コンプリーションのステップをスキップする。(最終的な回答と生成されたステップをレビューする機能)',
-  com_endpoint_stop: 'シーケンスを停止',
-  com_endpoint_stop_placeholder: 'Enterキー押下で値を区切ります',
-  com_endpoint_openai_stop:
-    'APIがさらにトークンを生成するのを止めるため、最大で4つのシーケンスを設定可能',
   com_endpoint_config_key: 'API Keyを設定',
   com_endpoint_assistant_placeholder: '右側のサイドパネルからアシスタントを選択してください',
   com_endpoint_config_placeholder: 'ヘッダーメニューからAPI Keyを設定してください。',
@@ -395,26 +577,24 @@ export default {
   com_endpoint_config_value: '値を入力してください',
   com_endpoint_config_key_name_placeholder: 'API key を入力してください',
   com_endpoint_config_key_encryption: '鍵は暗号化されます。削除予定日:',
+  com_endpoint_config_key_never_expires: 'キーの有効期限はありません',
   com_endpoint_config_key_expiry: 'すでに有効期限切れです',
   com_endpoint_config_click_here: 'ここをクリック',
-  com_endpoint_config_google_service_key: 'Google Service Account Key',
-  com_endpoint_config_google_cloud_platform: '(from Google Cloud Platform)',
-  com_endpoint_config_google_api_key: 'Google API Key',
+  com_endpoint_config_google_service_key: 'Googleサービスアカウントキー',
+  com_endpoint_config_google_cloud_platform: '(Google Cloud Platformから)',
+  com_endpoint_config_google_api_key: 'Google APIキー',
   com_endpoint_config_google_gemini_api: '(Gemini API)',
   com_endpoint_config_google_api_info: 'Gemeni用のGenerative Language API keyを取得するには',
   com_endpoint_config_key_import_json_key: 'Service Account JSON Key をインポートする。',
-  com_endpoint_config_key_import_json_key_success:
-    'Service Account JSON Keyのインポートに成功しました。',
+  com_endpoint_config_key_import_json_key_success: 'Service Account JSON Keyのインポートに成功しました。',
   com_endpoint_config_key_import_json_key_invalid:
     '無効なService Account JSON Keyです。正しいファイルかどうか確認してください。',
-  com_endpoint_config_key_get_edge_key:
-    'Bing用のアクセストークンを取得するためにログインをしてください: ',
+  com_endpoint_config_key_get_edge_key: 'Bing用のアクセストークンを取得するためにログインをしてください: ',
   com_endpoint_config_key_get_edge_key_dev_tool:
     'サイトにログインした状態で、開発ツールまたは拡張機能を使用して、_U クッキーの内容をコピーします。もし失敗する場合は次の手順に従ってください。',
   com_endpoint_config_key_edge_instructions: '手順',
   com_endpoint_config_key_edge_full_key_string: 'to provide the full cookie strings.',
-  com_endpoint_config_key_chatgpt:
-    'ChatGPTの「無料版」のアクセストークンを入手するためにへログインをしてください:',
+  com_endpoint_config_key_chatgpt: 'ChatGPTの「無料版」のアクセストークンを入手するためにへログインをしてください:',
   com_endpoint_config_key_chatgpt_then_visit: 'つぎに、ここへアクセスしてください:',
   com_endpoint_config_key_chatgpt_copy_token: 'トークンをコピーしてください。',
   com_endpoint_config_key_google_need_to: 'こちらを有効化する必要があります:',
@@ -423,28 +603,51 @@ export default {
   com_endpoint_config_key_google_service_account: 'サービスアカウントを作成する',
   com_endpoint_config_key_google_vertex_api_role:
     '必ず「作成して続行」をクリックして、少なくとも「Vertex AI ユーザー」権限を与えてください。最後にここにインポートするJSONキーを作成してください。',
-  com_nav_welcome_message: 'How can I help you today?',
+  com_nav_account_settings: 'アカウント設定',
+  com_nav_font_size: 'メッセージフォントサイズ',
+  com_nav_font_size_xs: '極小',
+  com_nav_font_size_sm: '小',
+  com_nav_font_size_base: '中',
+  com_nav_font_size_lg: '大',
+  com_nav_font_size_xl: '極大',
+  com_nav_welcome_assistant: 'アシスタントを選択してください',
+  com_nav_welcome_message: '今日はどのようなご用件でしょうか？',
   com_nav_auto_scroll: 'チャットを開いたときに最新まで自動でスクロール',
   com_nav_hide_panel: '右側のパネルを非表示',
   com_nav_modular_chat: '会話の途中でのエンドポイント切替を有効化',
-  com_nav_latex_parsing:
-    'メッセージ内の LaTeX の構文解析 (パフォーマンスに影響する可能性があります。)',
+  com_nav_latex_parsing: 'メッセージ内の LaTeX の構文解析 (パフォーマンスに影響する可能性があります)',
+  com_nav_text_to_speech: 'テキスト読み上げ',
+  com_nav_automatic_playback: '最新メッセージを自動再生',
+  com_nav_speech_to_text: '音声テキスト変換',
   com_nav_profile_picture: 'プロフィール画像',
   com_nav_change_picture: '画像を変更',
-  com_nav_plugin_search: 'プラグイン検索',
   com_nav_plugin_store: 'プラグインストア',
   com_nav_plugin_install: 'インストール',
   com_nav_plugin_uninstall: 'アンインストール',
   com_ui_add: '追加',
+  com_nav_tool_remove: '取り除く',
   com_nav_tool_dialog: 'アシスタントツール',
-  com_nav_tool_dialog_description:
-    'ツールの選択を維持するには、アシスタントを保存する必要があります。',
-  com_nav_tool_remove: '削除',
-  com_nav_tool_search: 'ツールを検索',
+  com_ui_misc: 'その他',
+  com_ui_roleplay: 'ロールプレイ',
+  com_ui_write: '執筆',
+  com_ui_idea: 'アイデア',
+  com_ui_shop: 'ショッピング',
+  com_ui_finance: '金融',
+  com_ui_code: 'コード',
+  com_ui_travel: '旅行',
+  com_ui_teach_or_explain: '学習',
+  com_ui_select_file: 'ファイルを選択',
+  com_ui_drag_drop_file: 'ファイルをここにドラッグアンドドロップ',
+  com_ui_upload_image: '画像をアップロード',
+  com_ui_select_a_category: 'カテゴリ未選択',
+  com_ui_clear_all: 'すべてクリア',
+  com_nav_tool_dialog_description: 'ツールの選択を維持するには、アシスタントを保存する必要があります。',
   com_show_agent_settings: 'エージェント設定を表示',
   com_show_completion_settings: 'コンプリーション設定を表示',
   com_hide_examples: '例を非表示',
   com_show_examples: '例を表示',
+  com_nav_plugin_search: 'プラグインを検索',
+  com_nav_tool_search: 'ツールを検索',
   com_nav_plugin_auth_error:
     'このプラグインの認証中にエラーが発生しました。もう一度お試しください。',
   com_nav_export_filename: 'ファイル名',
@@ -463,16 +666,19 @@ export default {
   com_nav_shared_links_empty: '共有リンクはありません。',
   com_nav_shared_links_name: 'タイトル',
   com_nav_shared_links_date_shared: '共有日',
-  com_nav_my_files: 'My Files',
+  com_nav_source_chat: 'ソースチャットを表示する',
+  com_nav_my_files: '自分のファイル',
   com_nav_theme: 'テーマ',
   com_nav_theme_system: 'システム',
   com_nav_theme_dark: 'ダーク',
   com_nav_theme_light: 'ライト',
-  com_nav_font_size: 'フォントサイズ',
   com_nav_enter_to_send: 'Enterキーでメッセージを送信する',
   com_nav_user_name_display: 'メッセージにユーザー名を表示する',
   com_nav_save_drafts: 'ローカルにドラフトを保存する',
+  com_nav_chat_direction: 'チャットの方向',
   com_nav_show_code: 'Code Interpreter を使用する際は常にコードを表示する',
+  com_nav_auto_send_prompts: 'プロンプト自動送信',
+  com_nav_always_make_prod: '常に新しいバージョンを制作する',
   com_nav_clear_all_chats: 'すべてのチャットを削除する',
   com_nav_confirm_clear: '削除を確定',
   com_nav_close_sidebar: 'サイドバーを閉じる',
@@ -493,87 +699,74 @@ export default {
   com_nav_help_faq: 'ヘルプ & FAQ',
   com_nav_settings: '設定',
   com_nav_search_placeholder: 'メッセージ検索',
-  com_nav_info_bookmarks_rebuild:
-    'ブックマークのカウントが正しくない場合は、ブックマークの情報を再構築してください。ブックマークのカウントが再計算され、データが正しい状態に復元されます。',
+  com_nav_delete_account: 'アカウントを削除',
+  com_nav_delete_account_confirm: 'アカウントを削除しますか?',
+  com_nav_delete_account_button: 'アカウントを完全に削除する',
+  com_nav_delete_account_email_placeholder: 'アカウントのメールアドレスを入力してください',
+  com_nav_delete_account_confirm_placeholder: '続行するには、以下の入力フィールドに「DELETE」と入力してください',
+  com_nav_delete_warning: '警告: この操作により、アカウントが完全に削除されます。',
+  com_nav_delete_data_info: 'すべてのデータが削除されます。',
+  com_nav_conversation_mode: '会話モード',
+  com_nav_auto_send_text: 'テキストを自動送信',
+  com_nav_auto_send_text_disabled: '無効にするには-1を設定',
+  com_nav_auto_transcribe_audio: 'オーディオを自動で書き起こす',
+  com_nav_db_sensitivity: 'デシベル感度',
+  com_nav_playback_rate: 'オーディオ再生速度',
+  com_nav_audio_play_error: 'オーディオの再生エラー: {0}',
+  com_nav_audio_process_error: 'オーディオの処理エラー: {0}',
+  com_nav_long_audio_warning: '長いテキストの処理には時間がかかります。',
+  com_nav_tts_init_error: 'テキスト読み上げの初期化に失敗しました: {0}',
+  com_nav_tts_unsupported_error:
+    '選択したエンジンでのテキスト読み上げはこのブラウザではサポートされていません。',
+  com_nav_source_buffer_error: 'オーディオ再生の設定エラーが発生しました。ページを更新してください。',
+  com_nav_media_source_init_error:
+    'オーディオプレーヤーを準備できませんでした。ブラウザの設定を確認してください。',
+  com_nav_buffer_append_error: 'オーディオストリーミングに問題が発生しました。再生が中断される可能性があります。',
+  com_nav_speech_cancel_error: 'オーディオ再生を停止できません。ページを更新する必要があるかもしれません。',
+  com_nav_voices_fetch_error:
+    '音声オプションを取得できませんでした。インターネット接続を確認してください。',
+  com_nav_engine: 'エンジン',
+  com_nav_browser: 'ブラウザ',
+  com_nav_edge: 'Edge',
+  com_nav_external: '外部',
+  com_nav_delete_cache_storage: 'TTSキャッシュストレージを削除',
+  com_nav_enable_cache_tts: 'キャッシュTTSを有効化',
+  com_nav_voice_select: '音声',
+  com_nav_enable_cloud_browser_voice: 'クラウドベースの音声を使用',
+  com_nav_info_enter_to_send:
+    '有効になっている場合、 `ENTER` キーを押すとメッセージが送信されます。無効になっている場合、Enterキーを押すと新しい行が追加され、 `CTRL + ENTER` キーを押してメッセージを送信する必要があります。',
+  com_nav_info_save_draft:
+    '有効になっている場合、チャットフォームに入力したテキストと添付ファイルがドラフトとしてローカルに自動保存されます。これらのドラフトは、ページをリロードしたり、別の会話に切り替えても利用できます。ドラフトはデバイスにローカルに保存され、メッセージが送信されると削除されます。',
+  com_nav_info_fork_change_default:
+    '`表示メッセージのみ` は、選択したメッセージへの直接パスのみが含まれます。 `関連ブランチを含める` は、パスに沿ったブランチを追加します。 `すべてを対象に含める` は、接続されているすべてのメッセージとブランチを含みます。',
+  com_nav_info_fork_split_target_setting:
+    '有効になっている場合、選択した動作に従って、対象メッセージから会話内の最新メッセージまで分岐が開始されます。',
+  com_nav_info_user_name_display:
+    '有効になっている場合、送信者のユーザー名が送信するメッセージの上に表示されます。無効になっている場合、メッセージの上に「あなた」のみが表示されます。',
+  com_nav_info_latex_parsing:
+    '有効になっている場合、メッセージ内のLaTeXコードが数式としてレンダリングされます。LaTeXレンダリングが必要ない場合は、これを無効にするとパフォーマンスが向上する場合があります。',
+  com_nav_info_revoke:
+    'この操作により、提供したすべてのAPIキーが取り消され、削除されます。これらのエンドポイントを引き続き使用するには、資格情報を再入力する必要があります。',
+  com_nav_info_delete_cache_storage:
+    'この操作により、デバイスに保存されているすべてのキャッシュされたTTS（テキスト読み上げ）オーディオファイルが削除されます。キャッシュされたオーディオファイルは、以前生成されたTTSオーディオの再生を高速化するために使用されますが、デバイスのストレージ容量を消費する可能性があります。',
+  // Command Settings Tab
+  com_nav_commands: 'Commands',
+  com_nav_commands_tab: 'コマンド設定',
+  com_nav_at_command: '@-Command',
+  com_nav_at_command_description:
+    'コマンド"@"でエンドポイント、モデル、プリセットを切り替える',
+  com_nav_plus_command: '+-Command',
+  com_nav_plus_command_description: 'コマンド"+"で複数応答設定を追加する',
+  com_nav_slash_command: '/-Command',
+  com_nav_slash_command_description: 'コマンド"/"でキーボードでプロンプトを選択する',
+  com_nav_command_settings: 'コマンド設定',
+  com_nav_command_settings_description: 'チャットで使用できるコマンドをカスタマイズします。',
   com_nav_setting_general: '一般',
+  com_nav_setting_chat: 'チャット',
   com_nav_setting_beta: 'ベータ版の機能',
   com_nav_setting_data: 'データ管理',
   com_nav_setting_account: 'アカウント',
-  /* The following are AI translated */
-  com_assistants_file_search: 'ファイル検索',
-  com_assistants_file_search_info:
-    'ファイル検索用のベクトル ストアを添付することはまだサポートされていません。Provider Playgroundからそれらを添付するか、スレッド単位でメッセージにファイルを添付してファイル検索を行うことができます。',
-  com_assistants_non_retrieval_model:
-    'このモデルではファイル検索機能は有効になっていません。別のモデルを選択してください。',
-  com_ui_attach_error_openai: '他のエンドポイントにAssistantファイルを添付することはできません',
-  com_ui_attach_warn_endpoint:
-    '互換性のあるツールがない場合、非アシスタントのファイルは無視される可能性があります',
-  com_ui_assistant_deleted: 'アシスタントが正常に削除されました',
-  com_ui_assistant_delete_error: 'アシスタントの削除中にエラーが発生しました。',
-  com_ui_copied: 'コピーしました',
-  com_ui_copy_code: 'コードをコピーする',
-  com_nav_source_chat: 'ソースチャットを表示する',
-  com_ui_date_today: '今日',
-  com_ui_date_yesterday: '昨日',
-  com_ui_date_previous_7_days: '過去7日間',
-  com_ui_date_previous_30_days: '過去30日間',
-  com_ui_date_january: '1月',
-  com_ui_date_february: '2月',
-  com_ui_date_march: '3月',
-  com_ui_date_april: '4月',
-  com_ui_date_may: '5月',
-  com_ui_date_june: '6月',
-  com_ui_date_july: '7月',
-  com_ui_date_august: '8月',
-  com_ui_date_september: '9月',
-  com_ui_date_october: '10月',
-  com_ui_date_november: '11月',
-  com_ui_date_december: '12月',
-  com_ui_nothing_found: '該当するものが見つかりませんでした',
-  com_ui_go_to_conversation: '会話に移動する',
-  com_error_invalid_user_key: '無効なキーが提供されました。キーを入力して再試行してください。',
-  com_ui_none_selected: '選択されていません',
-  com_ui_fork: '分岐',
-  com_ui_fork_info_1: 'この設定を使うと、希望の動作でメッセージを分岐させることができます。',
-  com_ui_fork_info_2:
-    '「フォーク」とは、現在の会話から特定のメッセージを開始/終了点として新しい会話を作成し、選択したオプションに従ってコピーを作成することを指します。',
-  com_ui_fork_info_3:
-    '「ターゲットメッセージ」とは、このポップアップを開いたメッセージか、"{0}"にチェックを入れた場合は会話の最新のメッセージを指します。',
-  com_ui_fork_info_visible:
-    'この設定は、ターゲットメッセージへの直接の経路のみを表示し、分岐は表示しません。つまり、可視メッセージのみを抽出して表示するということです。',
-  com_ui_fork_info_branches:
-    'この設定では、表示されているメッセージとそれに関連するブランチ（つまり、ターゲットメッセージに至る直接の経路上のブランチを含む）を分岐させます。',
-  com_ui_fork_info_target:
-    'この設定では、対象のメッセージとその近傍のメッセージを含む、すべてのメッセージの枝を分岐させます。つまり、表示されているかどうか、同じ経路上にあるかどうかに関係なく、すべてのメッセージ枝が含まれます。',
-  com_ui_fork_info_start:
-    'チェックを入れると、上記で選択した動作に従って、このメッセージから会話の最新のメッセージまでフォークが開始されます。',
-  com_ui_fork_info_remember:
-    'この設定を有効にすると、今後の会話で同じオプションを選択する手間が省けるようになります。お好みの設定を記憶させることで、会話の分岐をスムーズに行えるようになります。',
-  com_ui_fork_success: '会話のフォークに成功しました',
-  com_ui_fork_processing: '会話をフォークしています...',
-  com_ui_fork_error: '会話を分岐できませんでした。エラーが発生しました。',
-  com_ui_fork_change_default: 'デフォルトのフォークオプション',
-  com_ui_fork_default: 'デフォルトのフォークオプションを使用する',
-  com_ui_fork_remember: '以前の会話内容を記憶する',
-  com_ui_fork_split_target_setting: 'デフォルトで対象メッセージからフォークを開始する',
-  com_ui_fork_split_target: 'ここでフォークを開始',
-  com_ui_fork_remember_checked:
-    '選択した内容は、次回の利用時にも記憶されます。設定から変更できます。',
-  com_ui_fork_all_target: 'すべてを対象に含める',
-  com_ui_fork_branches: '関連ブランチを含める',
-  com_ui_fork_visible: 'メッセージを表示のみ',
-  com_ui_fork_from_message: 'フォークオプションを選択する',
-  com_ui_mention:
-    'エンドポイント、アシスタント、またはプリセットを素早く切り替えるには、それらを言及してください。',
-  com_ui_import_conversation_file_type_error: 'サポートされていないインポート形式です',
-  com_endpoint_context_tokens: 'コンテキストトークン数の最大値',
-  com_endpoint_context_info:
-    'コンテキストに使用できるトークンの最大数です。リクエストごとに送信されるトークン数を制御するために使用します。指定しない場合は、既知のモデルのコンテキストサイズに基づいてシステムのデフォルト値が使用されます。高い値を設定すると、エラーが発生したり、トークンコストが高くなる可能性があります。',
-  com_endpoint_prompt_prefix_assistants: '追加の指示',
-  com_endpoint_instructions_assistants: '指示をオーバーライドする',
-  com_endpoint_openai_max_tokens:
-    'オプションの `max_tokens` フィールドで、チャット補完時に生成可能な最大トークン数を設定します。入力トークンと生成されたトークンの合計長さは、モデルのコンテキスト長によって制限されています。この数値がコンテキストの最大トークン数を超えると、エラーが発生する可能性があります。',
-  com_nav_welcome_assistant: 'アシスタントを選択してください',
+  com_nav_setting_speech: 'スピーチ',
   com_nav_language: '言語',
   com_nav_lang_auto: '自動検出',
   com_nav_lang_english: '英語',
@@ -589,12 +782,17 @@ export default {
   com_nav_lang_swedish: 'スウェーデン語',
   com_nav_lang_korean: '韓国語',
   com_nav_lang_vietnamese: 'ベトナム語',
-  com_nav_lang_traditionalchinese: '繁體中文',
+  com_nav_lang_traditionalchinese: '繁体字中国語',
   com_nav_lang_arabic: 'アラビア語',
   com_nav_lang_turkish: 'トルコ語',
   com_nav_lang_dutch: 'オランダ語',
   com_nav_lang_indonesia: 'インドネシア語',
   com_nav_lang_hebrew: 'ヘブライ語',
+  com_nav_lang_finnish: 'フィンランド語',
+  com_ui_accept: '同意します',
+  com_ui_decline: '同意しません',
+  com_ui_terms_and_conditions: '利用規約',
+  com_ui_no_terms_content: '表示する利用規約の内容はありません',
 };
 
 export const comparisons = {
diff --git a/client/src/localization/languages/Zh.ts b/client/src/localization/languages/Zh.ts
index 9a0a0e18c7a..db72f101c99 100644
--- a/client/src/localization/languages/Zh.ts
+++ b/client/src/localization/languages/Zh.ts
@@ -3,29 +3,62 @@
 // file deepcode ignore HardcodedNonCryptoSecret: No hardcoded secrets present in this file
 
 export default {
+  com_nav_convo_menu_options: '对话菜单选项',
+  com_ui_artifacts: 'Artifacts',
+  com_ui_artifacts_toggle: '切换至 Artifacts UI',
+  com_nav_info_code_artifacts:
+    '启用在对话旁显示的实验性代码工件',
+  com_ui_include_shadcnui: '包含 shadcn/ui 组件指令',
+  com_nav_info_include_shadcnui:
+    '启用后，将包含使用 shadcn/ui 组件的指令。shadcn/ui 是一组使用 Radix UI 和 Tailwind CSS 构建的可重复使用的组件。注意：这些指令较长，仅在您需要向 LLM 提供正确的导入和组件信息时才应启用。有关这些组件的更多信息，请访问：https://ui.shadcn.com/',
+  com_ui_custom_prompt_mode: '自定义提示词模式',
+  com_nav_info_custom_prompt_mode:
+    '启用后，默认的工件系统提示将不会包含在内。在此模式下，必须手动提供所有生成工件的指令。',
+  com_ui_artifact_click: '点击以打开',
+  com_a11y_start: 'AI 已开始回复。',
+  com_a11y_ai_composing: 'AI 仍在撰写中。',
+  com_a11y_end: 'AI 已完成回复。',
+  com_error_moderation:
+    '很抱歉，您提交的内容被我们的审核系统标记为不符合社区指引。我们无法就此特定主题继续交流。如果您有任何其他问题或想探讨的话题，请编辑您的消息或开启新的对话。',
+  com_error_no_user_key: '没有找到密钥。请提供密钥后重试。',
+  com_error_no_base_url: '未找到基础 URL，请提供一个后重试。',
+  com_error_invalid_user_key: '提供的密钥无效。请提供有效的密钥后重试。',
+  com_error_expired_user_key:
+    '您提供的 {0} 密钥已于 {1} 过期。请提供新的密钥并重试。',
+  com_error_input_length:
+    '最新消息的令牌数过长，超出了令牌限制（分别为 {0}）。请缩短您的消息、调整对话参数中的最大上下文大小，或分叉对话以继续。',
   com_files_no_results: '无结果。',
   com_files_filter: '筛选文件...',
   com_files_number_selected: '已选择 {0} 个文件（共 {1} 个文件）',
   com_sidepanel_select_assistant: '选择助手',
+  com_sidepanel_parameters: '参数',
   com_sidepanel_assistant_builder: '助手生成器',
   com_sidepanel_hide_panel: '隐藏侧边栏',
   com_sidepanel_attach_files: '附加文件',
   com_sidepanel_manage_files: '管理文件',
   com_sidepanel_conversation_tags: '书签',
   com_assistants_capabilities: '功能',
+  com_assistants_file_search: '文件搜索',
+  com_assistants_file_search_info:
+    '暂不支持为文件搜索附加向量存储。您可以从提供程序游乐场附加它们，或者在线程基础上为文件搜索附加文件。',
+  com_assistants_code_interpreter_info:
+    '代码解释器使助手能够编写和运行代码。该工具可以处理具有多种数据和格式的文件，并生成图表等文件。',
   com_assistants_knowledge: '知识',
-  com_assistants_knowledge_info: '如果您在“知识”中上传文件，与助手的对话可能包括文件内容。',
+  com_assistants_knowledge_info:
+    '如果您在 “知识” 中上传文件，与助手的对话可能包括文件内容。',
   com_assistants_knowledge_disabled:
     '必须创建助手，且启用并保存代码解释器或检索，才能将文件作为知识上传。',
   com_assistants_image_vision: '识图',
   com_assistants_code_interpreter: '代码解释器',
   com_assistants_code_interpreter_files: '以下文件仅适用于代码解释器：',
   com_assistants_retrieval: '检索',
-  com_assistants_search_name: '按名称搜索助手',
+  com_assistants_search_name: '根据名称搜索助手',
   com_assistants_tools: '工具',
   com_assistants_actions: '操作',
   com_assistants_add_tools: '添加工具',
   com_assistants_add_actions: '添加操作',
+  com_assistants_non_retrieval_model:
+    '此模型未启用文件搜索功能。请选择其他模型。',
   com_assistants_available_actions: '可用操作',
   com_assistants_running_action: '正在运行操作',
   com_assistants_completed_action: '与 {0} 聊天',
@@ -34,37 +67,58 @@ export default {
   com_assistants_domain_info: '助手将此信息发送到了 {0}',
   com_assistants_delete_actions_success: '已成功从助手删除操作',
   com_assistants_update_actions_success: '已成功创建或更新操作',
-  com_assistants_update_actions_error: '创建或更新操作时出错。',
-  com_assistants_delete_actions_error: '删除操作时出错。',
+  com_assistants_update_actions_error: '创建或更新操作时出现错误。',
+  com_assistants_delete_actions_error: '删除操作时出现错误。',
   com_assistants_actions_info: '让您的助手通过 API 检索信息或执行操作',
   com_assistants_name_placeholder: '（选填）助手的名称',
   com_assistants_instructions_placeholder: '助手使用的系统指令',
   com_assistants_description_placeholder: '（选填）在此处描述您的助手',
   com_assistants_actions_disabled: '您需要先创建助手，然后才能添加操作。',
   com_assistants_update_success: '更新成功',
-  com_assistants_update_error: '更新助手时出错。',
+  com_assistants_update_error: '更新助手时出现错误。',
   com_assistants_create_success: '已成功创建',
-  com_assistants_create_error: '创建助手时出错。',
+  com_assistants_create_error: '创建助手时出现错误。',
+  com_assistants_conversation_starters: '对话启动器',
+  com_assistants_conversation_starters_placeholder: '输入对话启动器',
+  com_sidepanel_agent_builder: '代理构建器',
+  com_agents_name_placeholder: '可选：代理名称',
+  com_agents_description_placeholder: '可选：在此描述您的代理',
+  com_agents_instructions_placeholder: '代理使用的系统指令',
+  com_agents_search_name: '根据名称搜索代理',
+  com_agents_update_error: '更新代理时出现错误。',
+  com_agents_create_error: '更新代理时出现错误。',
+  com_ui_date_today: '今天',
+  com_ui_date_yesterday: '昨天',
+  com_ui_date_previous_7_days: '过去 7 天',
+  com_ui_date_previous_30_days: '过去 30 天',
+  com_ui_date_january: '一月',
+  com_ui_date_february: '二月',
+  com_ui_date_march: '三月',
+  com_ui_date_april: '四月',
+  com_ui_date_may: '五月',
+  com_ui_date_june: '六月',
+  com_ui_date_july: '七月',
+  com_ui_date_august: '八月',
+  com_ui_date_september: '九月',
+  com_ui_date_october: '十月',
+  com_ui_date_november: '十一月',
+  com_ui_date_december: '十二月',
   com_ui_field_required: '此字段为必填项',
-  com_ui_download_error: '下载文件时出错，该文件可能已被删除。',
-  com_ui_attach_error_type: '渠道不支持的文件类型:',
-  com_ui_attach_error_size: '超出渠道规定的文件大小:',
-  com_ui_attach_error: '无法附加文件，请创建或选择一个对话，或尝试刷新页面。',
+  com_ui_download_error: '下载文件时出现错误，该文件可能已被删除。',
+  com_ui_attach_error_type: '渠道不支持的文件类型：',
+  com_ui_attach_error_openai: '无法将助手文件附加到其他渠道',
+  com_ui_attach_warn_endpoint: '不兼容的工具可能会忽略非助手文件',
+  com_ui_attach_error_size: '超出渠道规定的文件大小：',
+  com_ui_attach_error:
+    '无法附加文件，请创建或选择一个对话，或尝试刷新页面。',
   com_ui_examples: '示例',
   com_ui_new_chat: '创建新对话',
   com_ui_happy_birthday: '这是我的第一个生日！',
-  com_ui_example_quantum_computing: '如何给7岁小孩讲解量子计算？',
-  com_ui_example_10_year_old_b_day: '如何举办生日宴才能耳目一新？',
-  com_ui_example_http_in_js: '如何在Python中实现HTTP请求？',
-  com_ui_capabilities: '功能',
-  com_ui_capability_remember: '记忆历史对话',
-  com_ui_capability_correction: '允许更正内容',
-  com_ui_capability_decline_requests: '限制不当信息',
-  com_ui_limitations: '局限性',
-  com_ui_limitation_incorrect_info: '可能会不时出现错误信息',
-  com_ui_limitation_harmful_biased: '可能会提供有害指示或者偏见',
-  com_ui_limitation_limited_2021: '基于2021年以前信息训练',
   com_ui_experimental: '实验性',
+  com_ui_on: '开启',
+  com_ui_off: '关闭',
+  com_ui_yes: '是的',
+  com_ui_no: '否',
   com_ui_ascending: '升序',
   com_ui_descending: '降序',
   com_ui_show_all: '展开全部',
@@ -79,75 +133,194 @@ export default {
   com_ui_instructions: '指令',
   com_ui_description: '描述',
   com_ui_error: '错误',
+  com_ui_error_connection: '连接服务器出现错误，请尝试刷新页面。',
   com_ui_select: '选择',
   com_ui_input: '输入',
   com_ui_close: '关闭',
+  com_ui_endpoint: '渠道',
+  com_ui_provider: '提供商',
   com_ui_model: '模型',
+  com_ui_model_parameters: '模型参数',
+  com_ui_model_save_success: '已成功保存模型参数',
   com_ui_select_model: '模型选择',
-  com_ui_select_search_model: '以名称搜索模型',
-  com_ui_select_search_plugin: '以名称搜索插件',
+  com_ui_select_provider: '选择提供商',
+  com_ui_select_provider_first: '首先选择提供商',
+  com_ui_select_search_model: '根据名称搜索模型',
+  com_ui_select_search_plugin: '根据名称搜索插件',
   com_ui_use_prompt: '使用提示词',
   com_ui_prev: '上一页',
   com_ui_next: '下一页',
   com_ui_stop: '停止',
   com_ui_upload_files: '上传文件',
-  com_ui_prompt_templates: '对话模板',
-  com_ui_hide_prompt_templates: '隐藏对话模板',
+  com_ui_prompt: '提示词',
+  com_ui_prompts: '提示词',
+  com_ui_prompt_name: '提示词名称',
+  com_ui_delete_prompt: '删除提示词？',
+  com_ui_admin: '管理',
+  com_ui_simple: '基本',
+  com_ui_versions: '版本',
+  com_ui_version_var: '版本 {0}',
+  com_ui_advanced: '进阶',
+  com_ui_admin_settings: '管理员设置',
+  com_ui_error_save_admin_settings: '保存您的管理员设置时出现错误。',
+  com_ui_prompt_preview_not_shared: '作者未允许对此提示词进行协作。',
+  com_ui_prompt_name_required: '提示词名称为必填项',
+  com_ui_prompt_text_required: '文本为必填项',
+  com_ui_prompt_text: '文本',
+  com_ui_back_to_chat: '返回对话',
+  com_ui_back_to_prompts: '返回提示词',
+  com_ui_categories: '类别',
+  com_ui_filter_prompts_name: '根据名称筛选提示词',
+  com_ui_search_categories: '搜索类别',
+  com_ui_manage: '管理',
+  com_ui_variables: '变量',
+  com_ui_variables_info:
+    '在您的文本中使用双大括号创建变量，例如 `{{example variable}}`，以便在使用提示词时填充。',
+  com_ui_special_variables: '特殊变量：',
+  com_ui_special_variables_info:
+    '使用 `{{current_date}}` 获取当前日期，使用 `{{current_user}}` 获取您的账户名称。',
+  com_ui_dropdown_variables: '下拉变量：',
+  com_ui_dropdown_variables_info:
+    '为您的提示词创建自定义下拉菜单：`{{variable_name:option1|option2|option3}}`',
   com_ui_showing: '显示',
   com_ui_of: '/',
   com_ui_entries: '项',
   com_ui_pay_per_call: '所有对话都将集中在一处。按会话次数计费，而不是按月付费',
   com_ui_new_footer: '所有对话都将集中在一处。',
+  com_ui_latest_footer: 'Every AI for Everyone.',
   com_ui_enter: '进入',
   com_ui_submit: '提交',
+  com_ui_none_selected: '未选择任何项目',
   com_ui_upload_success: '上传文件成功',
   com_ui_upload_error: '上传文件错误',
+  com_ui_upload_invalid: '上传的文件无效。必须是图像，且不得超过大小限制',
+  com_ui_upload_invalid_var: '上传的文件无效。必须是图像，且不得超过 {0} MB。',
   com_ui_cancel: '取消',
   com_ui_save: '保存',
+  com_ui_renaming_var: '重命名 “{0}”',
   com_ui_save_submit: '保存并提交',
-  com_user_message: 'You',
+  com_user_message: '您',
+  com_ui_read_aloud: '大声朗读',
+  com_ui_copied: '已复制！',
+  com_ui_copy_code: '复制代码',
   com_ui_copy_to_clipboard: '复制到剪贴板',
   com_ui_copied_to_clipboard: '已复制到剪贴板',
+  com_ui_fork: '分叉',
+  com_ui_fork_info_1: '使用此设置可以分叉消息，以获得所需的行为。',
+  com_ui_fork_info_2:
+    '“分叉” 是指从当前对话中选择特定消息作为起点/终点，根据所选选项创建一个新的对话副本。',
+  com_ui_fork_info_3:
+    '“目标消息” 是指此弹出窗口所打开的消息，或者如果您选中 “{0}”，则是对话中最新的消息。',
+  com_ui_fork_info_visible:
+    '此选项仅分叉可见的消息；换句话说，是直接路径到目标消息，没有任何分支。',
+  com_ui_fork_info_branches:
+    '此选项会分叉可见消息及相关分支；换句话说，包括沿路径的直接路线到目标消息，以及路径上的分支。',
+  com_ui_fork_info_target:
+    '此选项会分叉所有导向目标消息的消息分支，包括其相邻消息；换句话说，无论是否可见或在同一路径上，所有消息分支都会被包含在内。',
+  com_ui_fork_info_start:
+    '如果勾选，则根据上述选择的行为，从此消息开始到对话中最新的消息将被分叉。',
+  com_ui_fork_info_remember:
+    '选中此项可记住您的选择，以便下次分叉对话时更快捷地使用您偏好的选项。',
+  com_ui_fork_success: '对话分叉成功',
+  com_ui_fork_processing: '正在分叉对话...',
+  com_ui_fork_error: '分叉对话时出现错误',
+  com_ui_fork_change_default: '默认分叉选项',
+  com_ui_fork_default: '使用默认分叉选项',
+  com_ui_fork_remember: '记住',
+  com_ui_fork_split_target_setting: '默认以目标消息开始分叉',
+  com_ui_fork_split_target: '在此分叉',
+  com_ui_fork_remember_checked:
+    '您的选择将在使用后被记住。您可以随时在设置中更改。',
+  com_ui_fork_all_target: '包含所有目标',
+  com_ui_fork_branches: '包含相关分支',
+  com_ui_fork_visible: '仅可见消息',
+  com_ui_fork_from_message: '选择分叉选项',
+  com_ui_mention: '提及一个端点、助手或预设以快速切换到它',
+  com_ui_add_model_preset: '添加一个模型或预设以获得额外的回复',
+  com_assistants_max_starters_reached: '已达到对话启动器的最大数量',
   com_ui_regenerate: '重新生成',
   com_ui_continue: '继续',
   com_ui_edit: '编辑',
+  com_ui_loading: '加载中...',
   com_ui_success: '成功',
   com_ui_all: '所有',
+  com_ui_all_proper: '所有',
   com_ui_clear: '清除',
   com_ui_revoke: '撤销',
   com_ui_revoke_info: '撤销所有用户提供的凭据',
   com_ui_import_conversation: '导入',
-  com_ui_import_conversation_info: '从JSON文件导入对话',
+  com_ui_nothing_found: '未找到任何内容',
+  com_ui_go_to_conversation: '转到对话',
+  com_ui_import_conversation_info: '从 JSON 文件导入对话',
   com_ui_import_conversation_success: '对话导入成功',
   com_ui_import_conversation_error: '导入对话时发生错误',
+  com_ui_import_conversation_file_type_error: '不支持的导入类型',
   com_ui_confirm_action: '确认执行',
+  com_ui_chat: '对话',
+  com_ui_chat_history: '对话历史',
+  com_ui_controls: '管理',
+  com_ui_dashboard: '仪表板',
   com_ui_chats: '聊天',
   com_ui_avatar: '头像',
   com_ui_unknown: '未知',
   com_ui_result: '结果',
   com_ui_image_gen: '图片生成',
   com_ui_assistant: '助手',
+  com_ui_assistant_deleted: '助手已成功删除',
+  com_ui_assistant_delete_error: '删除助手时出现错误',
   com_ui_assistants: '助手',
   com_ui_attachment: '附件',
   com_ui_assistants_output: '助手输出',
+  com_ui_agent: '代理',
+  com_ui_agent_deleted: '代理已成功删除',
+  com_ui_agent_delete_error: '删除代理时出现错误',
+  com_ui_agents: '代理',
+  com_ui_delete_agent_confirm: '您确定要删除此代理吗？',
   com_ui_delete: '删除',
   com_ui_create: '创建',
-  com_ui_share: '分享',
+  com_ui_create_prompt: '创建提示词',
+  com_ui_share: '共享',
+  com_ui_share_var: '共享 {0}',
+  com_ui_enter_var: '输入 {0}',
   com_ui_copy_link: '复制链接',
   com_ui_update_link: '更新链接',
   com_ui_create_link: '创建链接',
-  com_ui_share_link_to_chat: '分享链接到聊天',
-  com_ui_share_error: '分享聊天链接时发生错误',
-  com_ui_share_retrieve_error: '删除共享链接时出错。',
-  com_ui_share_delete_error: '删除共享链接时出错。',
-  com_ui_share_create_message: '您的名字及您在分享后添加的任何消息将保持私密。',
-  com_ui_share_created_message: '已创建到您聊天的共享链接。可以通过设置随时管理以前共享的聊天。',
-  com_ui_share_update_message: '您的名字、定制指令及您在分享后添加的任何消息将保持私密。',
-  com_ui_share_updated_message: '已更新到您聊天的共享链接。可以通过设置随时管理以前共享的聊天。',
+  com_ui_share_to_all_users: '共享给所有用户',
+  com_ui_my_prompts: '我的提示词',
+  com_ui_no_category: '无类别',
+  com_ui_shared_prompts: '共享提示词',
+  com_ui_prompts_allow_use: '允许使用提示词',
+  com_ui_prompts_allow_create: '允许创建提示词',
+  com_ui_prompts_allow_share_global: '允许向所有用户共享提示词',
+  com_ui_prompt_shared_to_all: '此提示词已共享给所有用户',
+  com_ui_prompt_update_error: '更新提示词时出现错误',
+  com_ui_prompt_already_shared_to_all: '此提示词已共享给所有用户',
+  com_ui_description_placeholder: '可选：输入要显示的提示词描述',
+  com_ui_command_placeholder: '可选：输入提示词的命令，否则将使用名称',
+  com_ui_command_usage_placeholder: '通过命令或名称选择提示词',
+  com_ui_no_prompt_description: '未找到描述。',
+  com_ui_share_link_to_chat: '共享链接到聊天',
+  com_ui_share_error: '共享聊天链接时发生错误',
+  com_ui_share_retrieve_error: '检索共享链接时出现错误',
+  com_ui_share_delete_error: '删除共享链接时出现错误',
+  com_ui_share_create_message: '您的姓名以及您在共享后添加的任何消息将保持私密。',
+  com_ui_share_created_message:
+    '已创建到您聊天的共享链接。可以通过设置随时管理以前共享的聊天。',
+  com_ui_share_update_message:
+    '您的姓名、自定义指令以及您在共享后添加的任何消息将保持私密。',
+  com_ui_share_updated_message:
+    '已更新到您聊天的共享链接。可以通过设置随时管理以前共享的聊天。',
   com_ui_shared_link_not_found: '未找到共享链接',
   com_ui_delete_conversation: '删除对话？',
   com_ui_delete_confirm: '这将删除',
-  com_ui_delete_assistant_confirm: '确定要删除此助手吗？该操作无法撤销。',
+  com_ui_delete_tool: '删除工具',
+  com_ui_delete_tool_confirm: '您确定要删除此工具吗？',
+  com_ui_delete_action: '删除操作',
+  com_ui_delete_action_confirm: '您确定要删除此操作吗？',
+  com_ui_delete_confirm_prompt_version_var:
+    '这将删除选中版本的 “{0}”。如果没有其他版本，该提示词将被删除。',
+  com_ui_delete_assistant_confirm:
+    '您确定要删除此助手吗？该操作无法撤销。',
   com_ui_rename: '重命名',
   com_ui_archive: '归档',
   com_ui_archive_error: '归档对话失败',
@@ -157,71 +330,86 @@ export default {
   com_ui_preview: '预览',
   com_ui_upload: '上传',
   com_ui_connect: '连接',
-  com_ui_upload_delay: '上传 "{0}" 时比预期花了更长时间。 文件正在进行检索索引，请稍候。',
+  com_ui_locked: '已锁定',
+  com_ui_upload_delay:
+    '上传 “{0}” 时比预期花了更长时间。文件正在进行检索索引，请稍候。',
   com_ui_privacy_policy: '隐私政策',
   com_ui_terms_of_service: '服务政策',
+  com_ui_use_micrphone: '使用麦克风',
+  com_ui_min_tags: '无法再移除更多值，至少需要保留 {0} 个。',
+  com_ui_max_tags: '最多允许 {0} 个，用最新值。',
   com_ui_bookmarks: '书签',
-  com_ui_bookmarks_rebuild: '重建',
   com_ui_bookmarks_new: '新书签',
-  com_ui_bookmark_delete_confirm: '你确定要删除这个书签吗？',
+  com_ui_bookmark_delete_confirm: '您确定要删除此书签吗？',
   com_ui_bookmarks_title: '标题',
   com_ui_bookmarks_count: '计数',
   com_ui_bookmarks_description: '描述',
   com_ui_bookmarks_create_success: '书签创建成功',
   com_ui_bookmarks_update_success: '书签更新成功',
   com_ui_bookmarks_delete_success: '书签删除成功',
-  com_ui_bookmarks_create_error: '创建书签时出错',
-  com_ui_bookmarks_update_error: '更新书签时出错',
-  com_ui_bookmarks_delete_error: '删除书签时出错',
+  com_ui_bookmarks_create_exists: '书签已存在',
+  com_ui_bookmarks_create_error: '创建书签时出现错误',
+  com_ui_bookmarks_update_error: '更新书签时出现错误',
+  com_ui_bookmarks_delete_error: '删除书签时出现错误',
   com_ui_bookmarks_add_to_conversation: '添加到当前对话',
-  com_ui_accept: '我接受',
-  com_ui_decline: '我不接受',
-  com_ui_terms_and_conditions: '条款和条件',
-  com_ui_no_terms_content: '没有条款和条件内容显示',
-  com_auth_error_login: '无法登录，请确认提供的账户密码正确，并重新尝试。',
-  com_auth_error_login_rl: '尝试登录次数过多，请稍后再试。',
-  com_auth_error_login_ban: '根据我们的服务规则，您的帐号被暂时禁用。',
-  com_auth_error_login_server: '内部服务器错误，请稍后再试。',
-  com_auth_no_account: '新用户注册',
+  com_ui_bookmarks_filter: '筛选书签...',
+  com_ui_no_bookmarks: '似乎您还没有书签。点击一个对话并添加一个新的书签',
+  com_ui_no_conversation_id: '未找到对话 ID',
+  com_auth_error_login:
+    '无法登录，请确认提供的账户密码正确，并重新尝试。',
+  com_auth_error_login_rl:
+    '尝试登录次数过多，请稍后再试。',
+  com_auth_error_login_ban:
+    '根据我们的服务规则，您的帐号被暂时禁用。',
+  com_auth_error_login_server:
+    '内部服务器错误，请稍后再试。',
+  com_auth_error_login_unverified:
+    '您的账户尚未验证。请检查您的邮件以获取验证链接。',
+  com_auth_no_account: '还没有账户？',
   com_auth_sign_up: '注册',
   com_auth_sign_in: '登录',
   com_auth_google_login: '使用 Google 登录',
   com_auth_facebook_login: '使用 Facebook 登录',
   com_auth_github_login: '使用 GitHub 登录',
   com_auth_discord_login: '使用 Discord 登录',
-  com_auth_email: '电子邮箱',
+  com_auth_email: '邮箱',
   com_auth_email_required: '邮箱为必填项',
-  com_auth_email_min_length: '邮箱地址至少6个字符',
-  com_auth_email_max_length: '邮箱地址最多120个字符',
-  com_auth_email_pattern: '请输入正确的电子邮箱格式',
-  com_auth_email_address: '电子邮箱地址',
+  com_auth_email_min_length: '邮箱地址至少 6 个字符',
+  com_auth_email_max_length: '邮箱地址最多 120 个字符',
+  com_auth_email_pattern: '请输入正确的邮箱地址',
+  com_auth_email_address: '邮箱',
   com_auth_password: '密码',
   com_auth_password_required: '密码为必填项',
-  com_auth_password_min_length: '密码至少8个字符',
-  com_auth_password_max_length: '密码最多128个字符',
-  com_auth_password_forgot: '忘记密码?',
+  com_auth_password_min_length: '密码至少 8 个字符',
+  com_auth_password_max_length: '密码最多 128 个字符',
+  com_auth_password_forgot: '忘记密码？',
   com_auth_password_confirm: '确认密码',
   com_auth_password_not_match: '密码不一致',
   com_auth_continue: '继续',
-  com_auth_create_account: '创建账号',
-  com_auth_error_create: '注册账户过程中出现错误，请重试。',
+  com_auth_create_account: '创建账户',
+  com_auth_error_create:
+    '注册账户过程中出现错误，请重试。',
   com_auth_full_name: '姓名',
   com_auth_name_required: '姓名为必填项',
-  com_auth_name_min_length: '姓名至少3个字符',
-  com_auth_name_max_length: '姓名最多80个字符',
+  com_auth_name_min_length: '姓名至少 3 个字符',
+  com_auth_name_max_length: '姓名最多 80 个字符',
   com_auth_username: '用户名（可选）',
   com_auth_username_required: '用户名为必填项',
-  com_auth_username_min_length: '用户名至少3个字符',
-  com_auth_username_max_length: '用户名最多20个字符',
-  com_auth_already_have_account: '已有账号',
+  com_auth_username_min_length: '用户名至少 2 个字符',
+  com_auth_username_max_length: '用户名最多 20 个字符',
+  com_auth_already_have_account: '已有账户？',
   com_auth_login: '登录',
+  com_auth_registration_success_insecure: '注册成功。',
+  com_auth_registration_success_generic: '请检查您的邮件以验证您的邮件地址。',
   com_auth_reset_password: '重置密码',
   com_auth_click: '点击',
   com_auth_here: '这里',
   com_auth_to_reset_your_password: '重置密码。',
-  com_auth_reset_password_link_sent: '重置密码链接已发送至邮箱',
-  com_auth_reset_password_email_sent: '重置密码邮件已发送至邮箱',
-  com_auth_error_reset_password: '重置密码出现错误，未找到对应的邮箱地址，请重新输入。',
+  com_auth_reset_password_link_sent: '密码重置链接已发送',
+  com_auth_reset_password_if_email_exists:
+    '如果存在使用该邮件地址的帐户，则会发送一封包含密码重置说明的邮件。请务必检查您的垃圾邮件文件夹。',
+  com_auth_reset_password_email_sent:
+    '如果用户已注册，将会发送一封邮件到收件箱。',
   com_auth_reset_password_success: '密码重置成功',
   com_auth_login_with_new_password: '现在你可以使用你的新密码登录。',
   com_auth_error_invalid_reset_token: '重置密码的密钥已失效。',
@@ -230,75 +418,100 @@ export default {
   com_auth_submit_registration: '注册提交',
   com_auth_welcome_back: '欢迎',
   com_auth_back_to_login: '返回登录',
+  com_auth_email_verification_failed: '邮箱验证失败',
+  com_auth_email_verification_rate_limited: '请求过多。请稍后再试',
+  com_auth_email_verification_success: '邮箱验证成功',
+  com_auth_email_resent_success: '验证邮件重新发送成功',
+  com_auth_email_resent_failed: '验证邮件重新发送失败',
+  com_auth_email_verification_failed_token_missing: '验证失败，令牌失效',
+  com_auth_email_verification_invalid: '无效的邮箱验证',
+  com_auth_email_verification_in_progress: '正在验证您的邮箱，请稍候',
+  com_auth_email_verification_resend_prompt: '未收到邮件？',
+  com_auth_email_resend_link: '重新发送邮件',
+  com_auth_email_verification_redirecting: '在 {0} 秒后重定向...',
   com_endpoint_open_menu: '打开菜单',
   com_endpoint_bing_enable_sydney: '启用 Sydney',
   com_endpoint_bing_to_enable_sydney: '启用 Sydney',
   com_endpoint_bing_jailbreak: '越狱',
   com_endpoint_bing_context_placeholder:
-    '必应可以使用多达7000个词元作为“上下文（context）”，参照这些内容进行对话。其具体限制并不清楚，但可能会在超过7000个词元时出现错误',
+    '必应可以使用多达 7000 个词元作为 “上下文（context）”，参照这些内容进行对话。其具体限制并不清楚，但可能会在超过 7000 个词元时出现错误',
   com_endpoint_bing_system_message_placeholder:
-    '警告：滥用此功能可能导致你被禁止使用必应！点击“系统消息”查看完整的使用指南，如果你忽略了默认消息，那么将会使用被视为安全的“Sydney”预设。',
+    '警告：滥用此功能可能导致你被禁止使用必应！点击 “系统消息” 查看完整的使用指南，如果你忽略了默认消息，那么将会使用被视为安全的 “Sydney” 预设。',
   com_endpoint_system_message: '系统消息',
   com_endpoint_message: '发送消息给',
-  com_endpoint_message_not_appendable: '编辑您的消息内容或重新生成',
-  com_endpoint_default_blank: '初始值: 空白',
-  com_endpoint_default_false: '初始值: 否',
-  com_endpoint_default_creative: '初始值: 创意',
-  com_endpoint_default_empty: '初始值: 空',
-  com_endpoint_default_with_num: '初始值: {0}',
+  com_endpoint_message_not_appendable: '编辑您的消息内容或重新生成。',
+  com_endpoint_default_blank: '初始值：空白',
+  com_endpoint_default_false: '初始值：否',
+  com_endpoint_default_creative: '初始值：创意',
+  com_endpoint_default_empty: '初始值：空',
+  com_endpoint_default_with_num: '初始值：{0}',
   com_endpoint_context: '上下文',
   com_endpoint_tone_style: '语气',
   com_endpoint_token_count: '词元数',
   com_endpoint_output: '输出',
+  com_endpoint_context_tokens: '最大上下文词元数',
+  com_endpoint_context_info: `可用于上下文的最大词元数。用于控制每个请求发送的词元数量。
+  如果未指定，将根据已知模型的上下文大小使用系统默认值。设置较高的值可能会导致错误和/或更高的词元成本。`,
   com_endpoint_google_temp:
-    '值越高表示输出越随机，值越低表示输出越确定。建议不要同时改变此值和Top-p。',
+    '值越高表示输出越随机，值越低表示输出越确定。建议不要同时改变此值和 Top-p。',
   com_endpoint_google_topp:
-    'Top-p（核采样）会改变模型选择输出词的方式。从概率最大的K（参见topK参数）向最小的K选择，直到它们的概率之和等于top-p值',
+    'top-p（核采样）会改变模型选择输出词的方式。从概率最大的 K（参见topK参数）向最小的 K 选择，直到它们的概率之和等于 top-p 值。',
   com_endpoint_google_topk:
-    'Top-k 会改变模型选择输出词的方式。top-k为1意味着所选词是模型词汇中概率最大的（也称为贪心解码），而top-k为3意味着下一个词是从3个概率最大的词中选出的（使用随机性）。',
+    'top-k 会改变模型选择输出词的方式。top-k 为 1 意味着所选词是模型词汇中概率最大的（也称为贪心解码），而 top-k 为 3 意味着下一个词是从 3 个概率最大的词中选出的（使用随机性）。',
   com_endpoint_google_maxoutputtokens:
-    ' 	响应生成中可以使用的最大词元数。指定较低的值会得到更短的响应，而指定较高的值则会得到更长的响应。',
-  com_endpoint_google_custom_name_placeholder: '为Google设置一个名称',
-  com_endpoint_prompt_prefix_placeholder: '自定义提示词和上下文，默认为空',
+    '响应中可以生成的最大令牌数。指定较低的值以获得较短的响应，指定较高的值以获得较长的响应。注意：模型可能会在达到此最大值之前停止。',
+  com_endpoint_google_custom_name_placeholder: '为 Google 设置一个名称',
+  com_endpoint_prompt_prefix_placeholder: '自定义指令和上下文，默认为空。',
   com_endpoint_instructions_assistants_placeholder:
     '覆盖助手的指令。这对于需要逐次修改行为非常有用。',
   com_endpoint_prompt_prefix_assistants_placeholder:
     '在助手的主要指令之上设置额外的指令或上下文。如果为空，则忽略。',
   com_endpoint_custom_name: '自定义名称',
   com_endpoint_prompt_prefix: '自定义指令',
-  com_endpoint_prompt_prefix_assistants: '额外命令',
-  com_endpoint_instructions_assistants: '覆写命令',
-  com_endpoint_temperature: '温度',
+  com_endpoint_prompt_prefix_assistants: '额外指令',
+  com_endpoint_instructions_assistants: '覆写指令',
+  com_endpoint_temperature: '随机性',
   com_endpoint_default: '初始值',
   com_endpoint_top_p: 'Top P',
   com_endpoint_top_k: 'Top K',
   com_endpoint_max_output_tokens: '最大输出词元数',
+  com_endpoint_stop: '停止序列',
+  com_endpoint_stop_placeholder: '按 `Enter` 键分隔多个值',
+  com_endpoint_openai_max_tokens: `可选的 \`max_tokens\` 字段，表示在聊天补全中可生成的最大词元数量。
+
+    输入词元和生成词元的总长度受模型上下文长度的限制。如果该数值超过最大上下文词元数，您可能会遇到错误。`,
   com_endpoint_openai_temp:
-    '值越高表示输出越随机，值越低表示输出越确定。建议不要同时改变此值和Top P。',
-  com_endpoint_openai_max: '最大生成词元数。输入词元长度由模型的上下文长度决定。',
+    '值越高表示输出越随机，值越低表示输出越确定。建议不要同时改变此值和 Top P。',
+  com_endpoint_openai_max:
+    '最大生成词元数。输入词元长度由模型的上下文长度决定。',
   com_endpoint_openai_topp:
-    '相较于随机性的另一个取样方法，称为核采样，模型选取输出词元中大于P值（概率密度在整个概率分布中的比例）的结果。比如 top_p=0.1 表示只有概率占比为前10%的词元才会被考虑作为输出。建议不要同时改变此值和随机性。',
+    '相较于随机性的另一个取样方法，称为核采样，模型选取输出词元中大于 top_p（概率密度在整个概率分布中的比例）的结果。比如 top_p=0.1 表示只有概率占比为前 10% 的词元才会被考虑作为输出。建议不要同时改变此值和随机性。',
   com_endpoint_openai_freq:
-    '值介于-2.0到2.0之间。正值将惩罚当前已频繁使用的词元，从而降低重复用词的可能性。',
+    '值介于 -2.0 到 2.0 之间。正值将惩罚当前已频繁使用的词元，从而降低重复用词的可能性。',
   com_endpoint_openai_pres:
-    '值介于-2.0到2.0之间。正值将惩罚当前已经使用的词元，从而增加讨论新话题的可能性。',
+    '值介于 -2.0 到 2.0 之间。正值将惩罚当前已经使用的词元，从而增加讨论新话题的可能性。',
   com_endpoint_openai_resend:
-    '重新发送所有先前附加的图像。(注意：这会显着增加Token成本，并且可能会遇到很多关于图像附件的错误。)',
+    '重新发送所有先前附加的图像。注意：这会显着增加词元成本，并且可能会遇到很多关于图像附件的错误。',
   com_endpoint_openai_resend_files:
-    '重新发送所有先前附加的文件。(注意：这会显着增加Token成本，并且可能会遇到很多关于图像附件的错误。)',
+    '重新发送所有先前附加的文件。注意：这会显着增加词元成本，并且可能会遇到很多关于图像附件的错误。',
   com_endpoint_openai_detail:
-    '发送给Vision的图像分辨率。 “Low”更便宜且更快，“High”更详细但更昂贵，“Auto”将基于图像分辨率自动在两者之间进行选择。',
-  com_endpoint_openai_custom_name_placeholder: '为ChatGPT设置一个名称',
-  com_endpoint_openai_prompt_prefix_placeholder: '在消息开头添加系统级提示词，默认为空',
+    '发送给Vision的图像分辨率。 “Low” 更便宜且更快，“High” 更详细但更昂贵，“Auto” 将基于图像分辨率自动在两者之间进行选择。',
+  com_endpoint_openai_stop: '最多 4 个序列，API 将停止生成更多词元。',
+  com_endpoint_openai_custom_name_placeholder: '为 AI 设置一个名称',
+  com_endpoint_openai_prompt_prefix_placeholder:
+    '在系统消息中添加自定义指令，默认为空',
   com_endpoint_anthropic_temp:
-    '值介于0到1之间。 对于分析性/选择性任务，值应更接近0；对于创造性和生成性任务，值应更接近1。我们建议更改该参数或Top-p，但不要同时更改这两个参数。',
+    '值介于 0 到 1 之间。对于分析性/选择性任务，值应更接近 0；对于创造性和生成性任务，值应更接近 1。我们建议更改该参数或 Top P，但不要同时更改这两个参数。',
   com_endpoint_anthropic_topp:
-    'Top-p（核采样）会改变模型选择输出词元的方式。从概率最大的K（参见topK参数）向最小的K选择，直到它们的概率之和等于top-p值。',
+    'top-p（核采样）会改变模型选择输出词元的方式。从概率最大的 K（参见topK参数）向最小的 K 选择，直到它们的概率之和等于 top-p 值。',
   com_endpoint_anthropic_topk:
-    'Top-k 会改变模型选择输出词元的方式。top-k为1意味着所选词是模型词汇中概率最大的（也称为贪心解码），而top-k为3意味着下一个词是从3个概率最大的词中选出的（使用随机性）。',
+    'top-k 会改变模型选择输出词元的方式。top-k 为 1 意味着所选词是模型词汇中概率最大的（也称为贪心解码），而 top-k 为 3 意味着下一个词是从 3 个概率最大的词中选出的（使用随机性）。',
   com_endpoint_anthropic_maxoutputtokens:
-    '响应中可生成的最大词元数。指定较低的值会得到更短的响应，而指定较高的值则会得到更长的响应。',
-  com_endpoint_anthropic_custom_name_placeholder: '为Anthropic设置一个名称',
+    '响应中可以生成的最大令牌数。指定较低的值以获得较短的响应，指定较高的值以获得较长的响应。注意：模型可能会在达到此最大值之前停止。',
+  com_endpoint_anthropic_prompt_cache:
+    '提示词缓存允许在 API 调用中重用大型上下文或指令，从而降低成本和延迟',
+  com_endpoint_prompt_cache: '使用提示词缓存',
+  com_endpoint_anthropic_custom_name_placeholder: '为 Anthropic 设置一个名称',
   com_endpoint_frequency_penalty: '频率惩罚度',
   com_endpoint_presence_penalty: '话题新鲜度',
   com_endpoint_plug_use_functions: '使用函数',
@@ -311,9 +524,9 @@ export default {
   com_endpoint_plug_set_custom_instructions_for_gpt_placeholder:
     '在消息开头添加系统级提示词，默认为空',
   com_endpoint_import: '导入',
-  com_endpoint_set_custom_name: '设置一个自定义名，以便您检索此预设',
-  com_endpoint_preset_delete_confirm: '确定删除此预设？',
-  com_endpoint_preset_clear_all_confirm: '确定删除所有预设？',
+  com_endpoint_set_custom_name: '设置一个自定义名称，以便您检索此预设',
+  com_endpoint_preset_delete_confirm: '您确定要删除此预设吗？',
+  com_endpoint_preset_clear_all_confirm: '您确定要删除所有预设吗？',
   com_endpoint_preset_import: '成功导入预设！',
   com_endpoint_preset_import_error: '导入预设时发生错误，请重试。',
   com_endpoint_preset_save_error: '保存预设时发生错误，请重试。',
@@ -336,61 +549,76 @@ export default {
   com_endpoint_examples: ' 预设',
   com_endpoint_completion: '补全',
   com_endpoint_agent: '代理',
-  com_endpoint_show_what_settings: '显示{0}设置',
+  com_endpoint_show_what_settings: '显示 {0} 设置',
   com_endpoint_export: '导出',
+  com_endpoint_export_share: '导出/共享',
   com_endpoint_assistant: '助手',
   com_endpoint_use_active_assistant: '使用激活的助手',
   com_endpoint_assistant_model: '助手模型',
   com_endpoint_save_as_preset: '保存为预设',
-  com_endpoint_presets_clear_warning: '确定要清除所有预设吗？此操作不可逆。',
+  com_endpoint_presets_clear_warning:
+    '确定要清除所有预设吗？此操作不可逆。',
   com_endpoint_not_implemented: '未实现功能',
-  com_endpoint_no_presets: '暂无预设，使用设置按钮创建一个。',
+  com_endpoint_no_presets: '暂无预设，使用设置按钮创建一个',
   com_endpoint_not_available: '无可用渠道',
   com_endpoint_view_options: '查看选项',
   com_endpoint_save_convo_as_preset: '保存对话为预设',
   com_endpoint_my_preset: '我的预设',
-  com_endpoint_agent_model: '代理模型 (推荐: GPT-3.5)',
-  com_endpoint_completion_model: '补全模型 (推荐: GPT-4)',
-  com_endpoint_func_hover: '将插件作为OpenAI函数使用',
-  com_endpoint_skip_hover: '跳过补全步骤， 检查最终答案和生成步骤',
-  com_endpoint_config_key: '设置API Key',
+  com_endpoint_agent_model: '代理模型（推荐: GPT-3.5）',
+  com_endpoint_completion_model: '补全模型（推荐: GPT-4）',
+  com_endpoint_func_hover: '将插件作为 OpenAI 函数使用',
+  com_endpoint_skip_hover:
+    '跳过补全步骤，检查最终答案和生成步骤',
+  com_endpoint_config_key: '设置 API 密钥',
   com_endpoint_assistant_placeholder: '请从右侧面板中选择助手',
-  com_endpoint_config_placeholder: '在顶部菜单设置API KEY',
-  com_endpoint_config_key_for: '设置API Key：',
+  com_endpoint_config_placeholder: '在顶部菜单设置 API 密钥。',
+  com_endpoint_config_key_for: '设置 API 密钥：',
   com_endpoint_config_key_name: '密钥',
   com_endpoint_config_value: '输入值：',
-  com_endpoint_config_key_name_placeholder: '请先设置API key',
+  com_endpoint_config_key_name_placeholder: '请先设置 API 密钥',
   com_endpoint_config_key_encryption: '您的密钥将被加密并删除于：',
+  com_endpoint_config_key_never_expires: '您的密钥将永远有效',
   com_endpoint_config_key_expiry: '过期时间',
   com_endpoint_config_click_here: '点击此处',
-  com_endpoint_config_google_service_key: 'Google服务账号密钥',
+  com_endpoint_config_google_service_key: 'Google 服务账户密钥',
   com_endpoint_config_google_cloud_platform: '（从谷歌云平台）',
-  com_endpoint_config_google_api_key: 'Google API密钥',
-  com_endpoint_config_google_gemini_api: '(Gemini API)',
-  com_endpoint_config_google_api_info: '获取您的生成式语言API密钥(Gemini),',
-  com_endpoint_config_key_import_json_key: '导入服务账号JSON密钥',
-  com_endpoint_config_key_import_json_key_success: '成功导入服务账号JSON密钥',
-  com_endpoint_config_key_import_json_key_invalid: '无效的服务账号JSON密钥，您是否导入正确的文件？',
-  com_endpoint_config_key_get_edge_key: '为获得Bing访问凭证（Access token），请登录：',
+  com_endpoint_config_google_api_key: 'Google API KEY',
+  com_endpoint_config_google_gemini_api: '（Gemini API）',
+  com_endpoint_config_google_api_info: '获取您的生成式语言 API 密钥（Gemini），',
+  com_endpoint_config_key_import_json_key: '导入服务账户 JSON 密钥。',
+  com_endpoint_config_key_import_json_key_success: '成功导入服务账户 JSON 密钥',
+  com_endpoint_config_key_import_json_key_invalid:
+    '无效的服务账户 JSON 密钥，您是否导入正确的文件？',
+  com_endpoint_config_key_get_edge_key: '为获得 Bing 访问令牌（Access token），请登录：',
   com_endpoint_config_key_get_edge_key_dev_tool:
     '登录网站后，使用开发工具或扩展程序复制 _U cookie 的内容。如果失败，请按照以下步骤操作：',
-  com_endpoint_config_key_edge_instructions: '说明',
-  com_endpoint_config_key_edge_full_key_string: '提供完整的cookie字符串。',
-  com_endpoint_config_key_chatgpt: '为获得ChatGPT的访问凭证（Access token）, 请登录：',
+  com_endpoint_config_key_edge_instructions: '操作步骤',
+  com_endpoint_config_key_edge_full_key_string: '提供完整的 cookie 字符串。',
+  com_endpoint_config_key_chatgpt: '为获得 ChatGPT 的访问令牌（Access token）, 请登录：',
   com_endpoint_config_key_chatgpt_then_visit: '然后访问',
-  com_endpoint_config_key_chatgpt_copy_token: '复制access token。',
+  com_endpoint_config_key_chatgpt_copy_token: '复制 access token。',
   com_endpoint_config_key_google_need_to: '您需要',
-  com_endpoint_config_key_google_vertex_ai: '在Google Cloud上启用Vertex AI',
+  com_endpoint_config_key_google_vertex_ai: '在 Google Cloud 上启用 Vertex AI',
   com_endpoint_config_key_google_vertex_api: 'API，然后',
-  com_endpoint_config_key_google_service_account: '创建一个服务账号',
+  com_endpoint_config_key_google_service_account: '创建一个服务账户',
   com_endpoint_config_key_google_vertex_api_role:
-    '确保单击“创建并继续”以至少授予“Vertex AI 用户”角色。最后，创建一个要在此处导入的JSON密钥。',
+    '确保单击 “创建并继续” 以至少授予 “Vertex AI 用户” 角色。最后，创建一个要在此处导入的 JSON 密钥。',
+  com_nav_account_settings: '账户设置',
+  com_nav_font_size: '消息字体大小',
+  com_nav_font_size_xs: '超小号',
+  com_nav_font_size_sm: '小号',
+  com_nav_font_size_base: '中号',
+  com_nav_font_size_lg: '大号',
+  com_nav_font_size_xl: '超大号',
   com_nav_welcome_assistant: '请选择助手',
   com_nav_welcome_message: '我今天能帮你做什么？',
-  com_nav_auto_scroll: '打开时自动滚动到最新内容',
+  com_nav_auto_scroll: '打开对话时自动滚动到最新消息',
   com_nav_hide_panel: '隐藏最右侧面板',
-  com_nav_modular_chat: '启用对话中切换渠道',
+  com_nav_modular_chat: '启用在对话中切换渠道',
   com_nav_latex_parsing: '解析消息中的 LaTeX（可能会影响性能）',
+  com_nav_text_to_speech: '文本转语音',
+  com_nav_automatic_playback: '自动播放最新消息',
+  com_nav_speech_to_text: '语音转文本',
   com_nav_profile_picture: '个人资料头像',
   com_nav_change_picture: '修改头像',
   com_nav_plugin_store: '插件商店',
@@ -399,21 +627,36 @@ export default {
   com_ui_add: '添加',
   com_nav_tool_remove: '移除',
   com_nav_tool_dialog: '助手工具',
+  com_ui_misc: '杂项',
+  com_ui_roleplay: '角色扮演',
+  com_ui_write: '写作',
+  com_ui_idea: '灵感',
+  com_ui_shop: '购物',
+  com_ui_finance: '财务',
+  com_ui_code: '代码',
+  com_ui_travel: '旅行',
+  com_ui_teach_or_explain: '学习',
+  com_ui_select_file: '选择文件',
+  com_ui_drag_drop_file: '将文件拖放到此处',
+  com_ui_upload_image: '上传图片',
+  com_ui_select_a_category: '未选择类别',
+  com_ui_clear_all: '全部清除',
   com_nav_tool_dialog_description: '必须保存助手才能保留工具选择。',
-  com_show_agent_settings: '显示Agent设置',
-  com_show_completion_settings: '显示Completion设置',
-  com_hide_examples: '隐藏样例',
-  com_show_examples: '显示样例',
+  com_show_agent_settings: '显示代理设置',
+  com_show_completion_settings: '显示补全设置',
+  com_hide_examples: '隐藏示例',
+  com_show_examples: '显示示例',
   com_nav_plugin_search: '搜索插件',
   com_nav_tool_search: '搜索工具',
-  com_nav_plugin_auth_error: '尝试验证此插件时出错。请重试。',
+  com_nav_plugin_auth_error:
+    '尝试验证此插件时出现错误。请重试。',
   com_nav_export_filename: '文件名',
   com_nav_export_filename_placeholder: '设置文件名',
   com_nav_export_type: '类型',
-  com_nav_export_include_endpoint_options: '包含配置信息',
+  com_nav_export_include_endpoint_options: '包含渠道选项',
   com_nav_enabled: '启用',
   com_nav_not_supported: '未支持',
-  com_nav_export_all_message_branches: '导出所有对话',
+  com_nav_export_all_message_branches: '导出所有消息分支',
   com_nav_export_recursive_or_sequential: '递归或顺序？',
   com_nav_export_recursive: '递归',
   com_nav_export_conversation: '导出对话',
@@ -423,17 +666,21 @@ export default {
   com_nav_shared_links_empty: '您没有共享链接。',
   com_nav_shared_links_name: '名称',
   com_nav_shared_links_date_shared: '共享日期',
+  com_nav_source_chat: '查看源代码对话',
   com_nav_my_files: '我的文件',
   com_nav_theme: '主题',
-  com_nav_theme_system: '跟随系统设置',
+  com_nav_theme_system: '系统设置',
   com_nav_theme_dark: '暗色主题',
   com_nav_theme_light: '亮色主题',
-  com_nav_font_size: '字体大小:',
+  com_nav_enter_to_send: '按下 Enter 键发送消息',
   com_nav_user_name_display: '在消息中显示用户名',
-  com_nav_save_drafts: '保存草稿本地',
+  com_nav_save_drafts: '在本地保存草稿',
+  com_nav_chat_direction: '对话方向',
   com_nav_show_code: '使用代码解释器时始终显示代码',
-  com_nav_clear_all_chats: '清空所有对话',
-  com_nav_confirm_clear: '确认清空',
+  com_nav_auto_send_prompts: '自动发送提示词',
+  com_nav_always_make_prod: '始终应用新版本',
+  com_nav_clear_all_chats: '清除所有对话',
+  com_nav_confirm_clear: '确认清除',
   com_nav_close_sidebar: '关闭侧边栏',
   com_nav_open_sidebar: '打开侧边栏',
   com_nav_send_message: '发送消息',
@@ -445,2263 +692,105 @@ export default {
   com_nav_archive_all_chats: '归档所有对话',
   com_nav_archive_all: '归档所有',
   com_nav_archive_name: '名称',
-  com_nav_archive_created_at: '创建时间',
-  com_nav_clear_conversation: '清空对话',
-  com_nav_clear_conversation_confirm_message: '请是否清空所有对话？该操作无法撤销',
+  com_nav_archive_created_at: '归档时间',
+  com_nav_clear_conversation: '清除对话',
+  com_nav_clear_conversation_confirm_message:
+    '您确定要删除所有对话吗？该操作无法撤销。',
   com_nav_help_faq: '帮助',
   com_nav_settings: '设置',
-  com_nav_search_placeholder: '搜索对话及对话内容',
-  com_nav_info_bookmarks_rebuild:
-    '如果书签计数不正确，请重新构建书签信息。书签计数将被重新计算，数据将恢复到其正确状态。',
+  com_nav_search_placeholder: '搜索消息',
+  com_nav_delete_account: '删除账户',
+  com_nav_delete_account_confirm: '删除账户 - 您确定吗？',
+  com_nav_delete_account_button: '永久删除我的账户',
+  com_nav_delete_account_email_placeholder: '请输入您的账户邮箱',
+  com_nav_delete_account_confirm_placeholder: '要继续，请在下面的输入框中输入 “DELETE”',
+  com_nav_delete_warning: '警告：这将永久删除您的账户。',
+  com_nav_delete_data_info: '您的所有数据将被删除。',
+  com_nav_conversation_mode: '对话模式',
+  com_nav_auto_send_text: '自动发送文本',
+  com_nav_auto_send_text_disabled: '设置为 -1 以禁用',
+  com_nav_auto_transcribe_audio: '自动转录音频',
+  com_nav_db_sensitivity: '分贝灵敏度',
+  com_nav_playback_rate: '音频播放速度',
+  com_nav_audio_play_error: '播放音频时发生错误：{0}',
+  com_nav_audio_process_error: '处理音频时发生错误：{0}',
+  com_nav_long_audio_warning: '较长的文本将需要更长时间来处理。',
+  com_nav_tts_init_error: '初始化文本转语音失败：{0}',
+  com_nav_tts_unsupported_error:
+    '所选引擎的文本转语音在此浏览器中不受支持。',
+  com_nav_source_buffer_error: '设置音频播放时发生错误。请刷新页面。',
+  com_nav_media_source_init_error:
+    '无法准备音频播放器。请检查您的浏览器设置。',
+  com_nav_buffer_append_error: '音频流处理出现问题。播放可能会被中断。',
+  com_nav_speech_cancel_error: '无法停止音频播放。您可能需要刷新页面。',
+  com_nav_voices_fetch_error:
+    '无法获取语音选项。请检查您的网络连接。',
+  com_nav_engine: '引擎',
+  com_nav_browser: '浏览器',
+  com_nav_edge: '边缘端',
+  com_nav_external: '外部',
+  com_nav_delete_cache_storage: '删除 TTS 缓存存储',
+  com_nav_enable_cache_tts: '启用 TTS 缓存',
+  com_nav_voice_select: '语音',
+  com_nav_enable_cloud_browser_voice: '使用云端语音',
+  com_nav_info_enter_to_send:
+    '启用后，按下 `ENTER` 将发送您的消息。禁用后，按下 `ENTER` 将添加新行，您需要按下 `CTRL + ENTER` 来发送消息。',
+  com_nav_info_save_draft:
+    '启用后，您在聊天表单中输入的文本和附件将自动本地保存为草稿。即使您重新加载页面或切换到不同的对话，这些草稿也将可用。草稿存储在您设备的本地，并在消息发送后删除。',
+  com_nav_info_fork_change_default:
+    '`仅可见消息` 仅包含到所选消息的直接路径，`包含相关分支` 添加路径上的分支，`包含所有目标` 包括所有连接的消息和分支。',
+  com_nav_info_fork_split_target_setting:
+    '启用后，将根据选择的行为，从目标消息开始到对话中的最新消息进行分叉。',
+  com_nav_info_user_name_display:
+    '启用后，发送者的用户名将显示在您发送的每条消息上方。禁用后，您只会在自己的消息上方看到 “您”。',
+  com_nav_info_latex_parsing:
+    '启用后，消息中的 LaTeX 代码将呈现为数学公式。如果您不需要 LaTeX 渲染，禁用此功能可能会提高性能。',
+  com_nav_info_revoke:
+    '此操作将撤销并删除您提供的所有 API 密钥。您需要重新输入这些凭据以继续使用这些渠道。',
+  com_nav_info_delete_cache_storage:
+    '此操作将删除存储在您设备上的所有缓存 TTS（文本转语音）音频文件。缓存音频文件用于加快先前生成的 TTS 音频的播放速度，但它们可能会占用您设备的存储空间。',
+  // Command Settings Tab
+  com_nav_commands: '命令',
+  com_nav_commands_tab: '命令设置',
+  com_nav_at_command: '@-命令',
+  com_nav_at_command_description:
+    '切换至命令 “@” 以更改端点、模型、预设等',
+  com_nav_plus_command: '+-命令',
+  com_nav_plus_command_description: '切换至命令 “+” 以添加多响应设置',
+  com_nav_slash_command: '/-命令',
+  com_nav_slash_command_description: '切换至命令 “/” 以通过键盘选择提示词',
+  com_nav_command_settings: '命令设置',
+  com_nav_command_settings_description: '自定义对话中可用的命令',
   com_nav_setting_general: '通用',
+  com_nav_setting_chat: '对话',
   com_nav_setting_beta: '实验特性',
   com_nav_setting_data: '数据管理',
   com_nav_setting_account: '账户',
-  /* The following are AI Translated */
-  com_assistants_file_search: '文件搜索',
-  com_assistants_file_search_info:
-    '暂不支持为文件搜索附加向量存储。您可以从提供程序游乐场附加它们,或者在线程基础上为文件搜索附加文件。',
-  com_assistants_non_retrieval_model: '此模型未启用文件搜索功能。请选择其他模型。',
-  com_ui_attach_error_openai: '无法将助手文件附加到其他渠道',
-  com_ui_attach_warn_endpoint: '不兼容的工具可能会忽略非助手文件',
-  com_ui_assistant_deleted: '助手已成功删除',
-  com_ui_assistant_delete_error: '删除助手时出错。',
-  com_ui_date_october: '十月',
-  com_ui_date_november: '十一月',
-  com_ui_date_december: '十二月',
-  com_ui_copied: '已复制！',
-  com_ui_copy_code: '复制代码',
-  com_nav_source_chat: '查看源代码对话',
-  com_ui_date_today: '今天',
-  com_ui_date_yesterday: '昨天',
-  com_ui_date_previous_7_days: '过去7天',
-  com_ui_date_previous_30_days: '过去30天',
-  com_ui_date_january: '一月',
-  com_ui_date_february: '二月',
-  com_ui_date_march: '三月',
-  com_ui_date_april: '四月',
-  com_ui_date_may: '五月',
-  com_ui_date_june: '六月',
-  com_ui_date_july: '七月',
-  com_ui_date_august: '八月',
-  com_ui_date_september: '九月',
-  com_ui_nothing_found: '未找到任何内容',
-  com_ui_go_to_conversation: '转到对话',
-  com_error_moderation:
-    '很抱歉,您提交的内容被我们的审核系统标记为不符合社区指引。我们无法就此特定主题继续交流。如果您有任何其他问题或想探讨的话题,请编辑您的消息或开启新的对话。',
-  com_error_no_user_key: '没有找到密钥。请提供密钥后重试。',
-  com_error_no_base_url: '未找到基础URL,请提供一个后重试。',
-  com_error_invalid_user_key: '提供的密钥无效。请提供有效的密钥后重试。',
-  com_error_expired_user_key: '您提供的 {0} 密钥已于 {1} 过期。请提供新的密钥并重试。',
-  com_sidepanel_parameters: '参数',
-  com_ui_on: '开启',
-  com_ui_off: '关闭',
-  com_ui_yes: '是的',
-  com_ui_no: '否',
-  com_ui_none_selected: '未选择任何项目',
-  com_ui_fork: '分支',
-  com_ui_fork_info_1: '使用此设置可以分叉消息,以获得所需的行为。',
-  com_ui_fork_info_2:
-    '"分叉"是指从当前对话中选择特定消息作为起点/终点,根据所选选项创建一个新的对话副本。',
-  com_ui_fork_info_3:
-    '"目标消息"是指此弹出窗口所打开的消息,或者如果您选中"{0}",则是对话中最新的消息。',
-  com_ui_fork_info_visible: '此选项仅分叉可见的消息;换句话说,是直接路径到目标消息,没有任何分支。',
-  com_ui_fork_info_branches:
-    '此选项会分叉可见消息及相关分支;换言之,包括沿路径的直接路线到目标消息,以及路径上的分支。',
-  com_ui_fork_info_target:
-    '此选项会分叉所有导向目标消息的消息分支,包括其相邻消息;换句话说,无论是否可见或在同一路径上,所有消息分支都会被包含在内。',
-  com_ui_fork_info_start: '如果勾选,则根据上述选择的行为,从此消息开始到对话中最新的消息将被分叉。',
-  com_ui_fork_info_remember: '选中此项可记住您的选择,以便下次分支对话时更快捷地使用您偏好的选项。',
-  com_ui_fork_success: '对话分支成功',
-  com_ui_fork_processing: '正在分叉对话...',
-  com_ui_fork_error: '分叉对话时出现错误',
-  com_ui_fork_change_default: '默认分支选项',
-  com_ui_fork_default: '使用默认分支选项',
-  com_ui_fork_remember: '记住',
-  com_ui_fork_split_target_setting: '默认以目标消息开始分支',
-  com_ui_fork_split_target: '在此分叉',
-  com_ui_fork_remember_checked: '您的选择将在使用后被记住。您可以随时在设置中更改。',
-  com_ui_fork_all_target: '包含所有目标',
-  com_ui_fork_branches: '包含相关分支',
-  com_ui_fork_visible: '仅显示可见消息',
-  com_ui_fork_from_message: '选择分支选项',
-  com_ui_mention: '提及一个端点、助手或预设以快速切换到它',
-  com_ui_import_conversation_file_type_error: '不支持的导入类型',
-  com_ui_min_tags: '无法再移除更多值,至少需要保留{0}个。',
-  com_ui_max_tags: '最多允许{0}个,使用最新值。',
-  com_endpoint_context_tokens: '最大上下文词元数',
-  com_endpoint_context_info:
-    '可用于上下文的最大词元数。用于控制每个请求发送的词元数量。如果未指定,将根据已知模型的上下文大小使用系统默认值。设置较高的值可能会导致错误和/或更高的词元成本。',
-  com_endpoint_stop: '停止序列',
-  com_endpoint_stop_placeholder: '按Enter键分隔多个值',
-  com_endpoint_openai_max_tokens:
-    '可选的`max_tokens`字段,表示在聊天补全中可生成的最大token数量。\n\n输入token和生成token的总长度受模型上下文长度的限制。如果该数值超过最大上下文token数,您可能会遇到错误。',
-  com_endpoint_openai_stop: '最多4个序列,API将停止生成更多词元。',
-  com_nav_enter_to_send: '请按Enter键发送消息',
+  com_nav_setting_speech: '语音',
   com_nav_language: '语言',
   com_nav_lang_auto: '自动检测语言',
-  com_nav_lang_english: '英语',
+  com_nav_lang_english: 'English',
   com_nav_lang_chinese: '中文',
-  com_nav_lang_german: '德语',
-  com_nav_lang_spanish: '西班牙语',
-  com_nav_lang_french: '法语',
-  com_nav_lang_italian: '语言',
-  com_nav_lang_polish: '语言',
-  com_nav_lang_brazilian_portuguese: '葡萄牙语(巴西)',
-  com_nav_lang_russian: '俄语',
-  com_nav_lang_japanese: '日语',
-  com_nav_lang_swedish: '语言',
-  com_nav_lang_korean: '韩语',
-  com_nav_lang_vietnamese: '越南语',
+  com_nav_lang_german: 'Deutsch',
+  com_nav_lang_spanish: 'Español',
+  com_nav_lang_french: 'Français ',
+  com_nav_lang_italian: 'Italiano',
+  com_nav_lang_polish: 'Polski',
+  com_nav_lang_brazilian_portuguese: 'Português Brasileiro',
+  com_nav_lang_russian: 'Русский',
+  com_nav_lang_japanese: '日本語',
+  com_nav_lang_swedish: 'Svenska',
+  com_nav_lang_korean: '한국어',
+  com_nav_lang_vietnamese: 'Tiếng Việt',
   com_nav_lang_traditionalchinese: '繁體中文',
   com_nav_lang_arabic: 'العربية',
-  com_nav_lang_turkish: '土耳其语',
-  com_nav_lang_dutch: '荷兰语',
-  com_nav_lang_indonesia: '印度尼西亚语',
-  com_nav_lang_hebrew: '希伯来语',
-};
-
-export const comparisons = {
-  com_files_no_results: {
-    english: 'No results.',
-    translated: '无结果。',
-  },
-  com_files_filter: {
-    english: 'Filter files...',
-    translated: '筛选文件...',
-  },
-  com_files_number_selected: {
-    english: '{0} of {1} file(s) selected',
-    translated: '已选择 {0} 个文件（共 {1} 个文件）',
-  },
-  com_sidepanel_select_assistant: {
-    english: 'Select an Assistant',
-    translated: '选择助手',
-  },
-  com_sidepanel_assistant_builder: {
-    english: 'Assistant Builder',
-    translated: '助手生成器',
-  },
-  com_sidepanel_hide_panel: {
-    english: 'Hide Panel',
-    translated: '隐藏侧边栏',
-  },
-  com_sidepanel_attach_files: {
-    english: 'Attach Files',
-    translated: '附加文件',
-  },
-  com_sidepanel_manage_files: {
-    english: 'Manage Files',
-    translated: '管理文件',
-  },
-  com_sidepanel_conversation_tags: {
-    english: 'Bookmarks',
-    translated: '书签',
-  },
-  com_assistants_capabilities: {
-    english: 'Capabilities',
-    translated: '功能',
-  },
-  com_assistants_knowledge: {
-    english: 'Knowledge',
-    translated: '知识',
-  },
-  com_assistants_knowledge_info: {
-    english:
-      'If you upload files under Knowledge, conversations with your Assistant may include file contents.',
-    translated: '如果您在“知识”中上传文件，与助手的对话可能包括文件内容。',
-  },
-  com_assistants_knowledge_disabled: {
-    english:
-      'Assistant must be created, and Code Interpreter or Retrieval must be enabled and saved before uploading files as Knowledge.',
-    translated: '必须创建助手，且启用并保存代码解释器或检索，才能将文件作为知识上传。',
-  },
-  com_assistants_image_vision: {
-    english: 'Image Vision',
-    translated: '识图',
-  },
-  com_assistants_code_interpreter: {
-    english: 'Code Interpreter',
-    translated: '代码解释器',
-  },
-  com_assistants_code_interpreter_files: {
-    english: 'The following files are only available for Code Interpreter:',
-    translated: '以下文件仅适用于代码解释器：',
-  },
-  com_assistants_retrieval: {
-    english: 'Retrieval',
-    translated: '检索',
-  },
-  com_assistants_search_name: {
-    english: 'Search assistants by name',
-    translated: '按名称搜索助手',
-  },
-  com_assistants_tools: {
-    english: 'Tools',
-    translated: '工具',
-  },
-  com_assistants_actions: {
-    english: 'Actions',
-    translated: '操作',
-  },
-  com_assistants_add_tools: {
-    english: 'Add Tools',
-    translated: '添加工具',
-  },
-  com_assistants_add_actions: {
-    english: 'Add Actions',
-    translated: '添加操作',
-  },
-  com_assistants_available_actions: {
-    english: 'Available Actions',
-    translated: '可用操作',
-  },
-  com_assistants_running_action: {
-    english: 'Running action',
-    translated: '正在运行操作',
-  },
-  com_assistants_completed_action: {
-    english: 'Talked to {0}',
-    translated: '与 {0} 聊天',
-  },
-  com_assistants_completed_function: {
-    english: 'Ran {0}',
-    translated: '运行 {0}',
-  },
-  com_assistants_function_use: {
-    english: 'Assistant used {0}',
-    translated: '助手使用了 {0}',
-  },
-  com_assistants_domain_info: {
-    english: 'Assistant sent this info to {0}',
-    translated: '助手将此信息发送到了 {0}',
-  },
-  com_assistants_delete_actions_success: {
-    english: 'Successfully deleted Action from Assistant',
-    translated: '已成功从助手删除操作',
-  },
-  com_assistants_update_actions_success: {
-    english: 'Successfully created or updated Action',
-    translated: '已成功创建或更新操作',
-  },
-  com_assistants_update_actions_error: {
-    english: 'There was an error creating or updating the action.',
-    translated: '创建或更新操作时出错。',
-  },
-  com_assistants_delete_actions_error: {
-    english: 'There was an error deleting the action.',
-    translated: '删除操作时出错。',
-  },
-  com_assistants_actions_info: {
-    english: 'Let your Assistant retrieve information or take actions via API\'s',
-    translated: '让您的助手通过 API 检索信息或执行操作',
-  },
-  com_assistants_name_placeholder: {
-    english: 'Optional: The name of the assistant',
-    translated: '（选填）助手的名称',
-  },
-  com_assistants_instructions_placeholder: {
-    english: 'The system instructions that the assistant uses',
-    translated: '助手使用的系统指令',
-  },
-  com_assistants_description_placeholder: {
-    english: 'Optional: Describe your Assistant here',
-    translated: '（选填）在此处描述您的助手',
-  },
-  com_assistants_actions_disabled: {
-    english: 'You need to create an assistant before adding actions.',
-    translated: '您需要先创建助手，然后才能添加操作。',
-  },
-  com_assistants_update_success: {
-    english: 'Successfully updated',
-    translated: '更新成功',
-  },
-  com_assistants_update_error: {
-    english: 'There was an error updating your assistant.',
-    translated: '更新助手时出错。',
-  },
-  com_assistants_create_success: {
-    english: 'Successfully created',
-    translated: '已成功创建',
-  },
-  com_assistants_create_error: {
-    english: 'There was an error creating your assistant.',
-    translated: '创建助手时出错。',
-  },
-  com_ui_field_required: {
-    english: 'This field is required',
-    translated: '此字段为必填项',
-  },
-  com_ui_download_error: {
-    english: 'Error downloading file. The file may have been deleted.',
-    translated: '下载文件时出错，该文件可能已被删除。',
-  },
-  com_ui_attach_error_type: {
-    english: 'Unsupported file type for endpoint:',
-    translated: '渠道不支持的文件类型:',
-  },
-  com_ui_attach_error_size: {
-    english: 'File size limit exceeded for endpoint:',
-    translated: '超出渠道规定的文件大小:',
-  },
-  com_ui_attach_error: {
-    english: 'Cannot attach file. Create or select a conversation, or try refreshing the page.',
-    translated: '无法附加文件，请创建或选择一个对话，或尝试刷新页面。',
-  },
-  com_ui_examples: {
-    english: 'Examples',
-    translated: '示例',
-  },
-  com_ui_new_chat: {
-    english: 'New chat',
-    translated: '创建新对话',
-  },
-  com_ui_happy_birthday: {
-    english: 'It\'s my 1st birthday!',
-    translated: '这是我的第一个生日！',
-  },
-  com_ui_example_quantum_computing: {
-    english: 'Explain quantum computing in simple terms',
-    translated: '如何给7岁小孩讲解量子计算？',
-  },
-  com_ui_example_10_year_old_b_day: {
-    english: 'Got any creative ideas for a 10 year old\'s birthday?',
-    translated: '如何举办生日宴才能耳目一新？',
-  },
-  com_ui_example_http_in_js: {
-    english: 'How do I make an HTTP request in Javascript?',
-    translated: '如何在Python中实现HTTP请求？',
-  },
-  com_ui_capabilities: {
-    english: 'Capabilities',
-    translated: '功能',
-  },
-  com_ui_capability_remember: {
-    english: 'Remembers what user said earlier in the conversation',
-    translated: '记忆历史对话',
-  },
-  com_ui_capability_correction: {
-    english: 'Allows user to provide follow-up corrections',
-    translated: '允许更正内容',
-  },
-  com_ui_capability_decline_requests: {
-    english: 'Trained to decline inappropriate requests',
-    translated: '限制不当信息',
-  },
-  com_ui_limitations: {
-    english: 'Limitations',
-    translated: '局限性',
-  },
-  com_ui_limitation_incorrect_info: {
-    english: 'May occasionally generate incorrect information',
-    translated: '可能会不时出现错误信息',
-  },
-  com_ui_limitation_harmful_biased: {
-    english: 'May occasionally produce harmful instructions or biased content',
-    translated: '可能会提供有害指示或者偏见',
-  },
-  com_ui_limitation_limited_2021: {
-    english: 'Limited knowledge of world and events after 2021',
-    translated: '基于2021年以前信息训练',
-  },
-  com_ui_experimental: {
-    english: 'Experimental Features',
-    translated: '实验性',
-  },
-  com_ui_ascending: {
-    english: 'Asc',
-    translated: '升序',
-  },
-  com_ui_descending: {
-    english: 'Desc',
-    translated: '降序',
-  },
-  com_ui_show_all: {
-    english: 'Show All',
-    translated: '展开全部',
-  },
-  com_ui_name: {
-    english: 'Name',
-    translated: '名称',
-  },
-  com_ui_date: {
-    english: 'Date',
-    translated: '日期',
-  },
-  com_ui_storage: {
-    english: 'Storage',
-    translated: '存储',
-  },
-  com_ui_context: {
-    english: 'Context',
-    translated: '上下文',
-  },
-  com_ui_size: {
-    english: 'Size',
-    translated: '大小',
-  },
-  com_ui_host: {
-    english: 'Host',
-    translated: '主机',
-  },
-  com_ui_update: {
-    english: 'Update',
-    translated: '更新',
-  },
-  com_ui_authentication: {
-    english: 'Authentication',
-    translated: '认证',
-  },
-  com_ui_instructions: {
-    english: 'Instructions',
-    translated: '指令',
-  },
-  com_ui_description: {
-    english: 'Description',
-    translated: '描述',
-  },
-  com_ui_error: {
-    english: 'Error',
-    translated: '错误',
-  },
-  com_ui_select: {
-    english: 'Select',
-    translated: '选择',
-  },
-  com_ui_input: {
-    english: 'Input',
-    translated: '输入',
-  },
-  com_ui_close: {
-    english: 'Close',
-    translated: '关闭',
-  },
-  com_ui_model: {
-    english: 'Model',
-    translated: '模型',
-  },
-  com_ui_select_model: {
-    english: 'Select a model',
-    translated: '模型选择',
-  },
-  com_ui_select_search_model: {
-    english: 'Search model by name',
-    translated: '以名称搜索模型',
-  },
-  com_ui_select_search_plugin: {
-    english: 'Search plugin by name',
-    translated: '以名称搜索插件',
-  },
-  com_ui_use_prompt: {
-    english: 'Use prompt',
-    translated: '使用提示词',
-  },
-  com_ui_prev: {
-    english: 'Prev',
-    translated: '上一页',
-  },
-  com_ui_next: {
-    english: 'Next',
-    translated: '下一页',
-  },
-  com_ui_stop: {
-    english: 'Stop',
-    translated: '停止',
-  },
-  com_ui_upload_files: {
-    english: 'Upload files',
-    translated: '上传文件',
-  },
-  com_ui_prompt_templates: {
-    english: 'Prompt Templates',
-    translated: '对话模板',
-  },
-  com_ui_hide_prompt_templates: {
-    english: 'Hide Prompt Templates',
-    translated: '隐藏对话模板',
-  },
-  com_ui_showing: {
-    english: 'Showing',
-    translated: '显示',
-  },
-  com_ui_of: {
-    english: 'of',
-    translated: '/',
-  },
-  com_ui_entries: {
-    english: 'Entries',
-    translated: '项',
-  },
-  com_ui_pay_per_call: {
-    english: 'All AI conversations in one place. Pay per call and not per month',
-    translated: '所有对话都将集中在一处。按会话次数计费，而不是按月付费',
-  },
-  com_ui_new_footer: {
-    english: 'All AI conversations in one place.',
-    translated: '所有对话都将集中在一处。',
-  },
-  com_ui_enter: {
-    english: 'Enter',
-    translated: '进入',
-  },
-  com_ui_submit: {
-    english: 'Submit',
-    translated: '提交',
-  },
-  com_ui_upload_success: {
-    english: 'Successfully uploaded file',
-    translated: '上传文件成功',
-  },
-  com_ui_upload_error: {
-    english: 'There was an error uploading your file',
-    translated: '上传文件错误',
-  },
-  com_ui_upload_invalid: {
-    english: 'Invalid file for upload. Must be an image not exceeding 2 MB',
-    translated: '无效的上传文件，请上传不超过2M大小的图片',
-  },
-  com_ui_cancel: {
-    english: 'Cancel',
-    translated: '取消',
-  },
-  com_ui_save: {
-    english: 'Save',
-    translated: '保存',
-  },
-  com_ui_save_submit: {
-    english: 'Save & Submit',
-    translated: '保存并提交',
-  },
-  com_user_message: {
-    english: 'You',
-    translated: 'You',
-  },
-  com_ui_copy_to_clipboard: {
-    english: 'Copy to clipboard',
-    translated: '复制到剪贴板',
-  },
-  com_ui_copied_to_clipboard: {
-    english: 'Copied to clipboard',
-    translated: '已复制到剪贴板',
-  },
-  com_ui_regenerate: {
-    english: 'Regenerate',
-    translated: '重新生成',
-  },
-  com_ui_continue: {
-    english: 'Continue',
-    translated: '继续',
-  },
-  com_ui_edit: {
-    english: 'Edit',
-    translated: '编辑',
-  },
-  com_ui_success: {
-    english: 'Success',
-    translated: '成功',
-  },
-  com_ui_all: {
-    english: 'all',
-    translated: '所有',
-  },
-  com_ui_clear: {
-    english: 'Clear',
-    translated: '清除',
-  },
-  com_ui_revoke: {
-    english: 'Revoke',
-    translated: '撤销',
-  },
-  com_ui_revoke_info: {
-    english: 'Revoke all user provided credentials',
-    translated: '撤销所有用户提供的凭据',
-  },
-  com_ui_import_conversation: {
-    english: 'Import',
-    translated: '导入',
-  },
-  com_ui_import_conversation_info: {
-    english: 'Import conversations from a JSON file',
-    translated: '从JSON文件导入对话',
-  },
-  com_ui_import_conversation_success: {
-    english: 'Conversations imported successfully',
-    translated: '对话导入成功',
-  },
-  com_ui_import_conversation_error: {
-    english: 'There was an error importing your conversations',
-    translated: '导入对话时发生错误',
-  },
-  com_ui_confirm_action: {
-    english: 'Confirm Action',
-    translated: '确认执行',
-  },
-  com_ui_chats: {
-    english: 'chats',
-    translated: '聊天',
-  },
-  com_ui_avatar: {
-    english: 'Avatar',
-    translated: '头像',
-  },
-  com_ui_unknown: {
-    english: 'Unknown',
-    translated: '未知',
-  },
-  com_ui_result: {
-    english: 'Result',
-    translated: '结果',
-  },
-  com_ui_image_gen: {
-    english: 'Image Gen',
-    translated: '图片生成',
-  },
-  com_ui_assistant: {
-    english: 'Assistant',
-    translated: '助手',
-  },
-  com_ui_assistants: {
-    english: 'Assistants',
-    translated: '助手',
-  },
-  com_ui_attachment: {
-    english: 'Attachment',
-    translated: '附件',
-  },
-  com_ui_assistants_output: {
-    english: 'Assistants Output',
-    translated: '助手输出',
-  },
-  com_ui_delete: {
-    english: 'Delete',
-    translated: '删除',
-  },
-  com_ui_create: {
-    english: 'Create',
-    translated: '创建',
-  },
-  com_ui_share: {
-    english: 'Share',
-    translated: '分享',
-  },
-  com_ui_copy_link: {
-    english: 'Copy link',
-    translated: '复制链接',
-  },
-  com_ui_update_link: {
-    english: 'Update link',
-    translated: '更新链接',
-  },
-  com_ui_create_link: {
-    english: 'Create link',
-    translated: '创建链接',
-  },
-  com_ui_share_link_to_chat: {
-    english: 'Share link to chat',
-    translated: '分享链接到聊天',
-  },
-  com_ui_share_retrieve_error: {
-    english: 'There was an error deleting the shared link.',
-    translated: '删除共享链接时出错。',
-  },
-  com_ui_share_delete_error: {
-    english: 'There was an error deleting the shared link.',
-    translated: '删除共享链接时出错。',
-  },
-  com_ui_share_error: {
-    english: 'There was an error sharing the chat link',
-    translated: '分享聊天链接时发生错误',
-  },
-  com_ui_share_create_message: {
-    english: 'Your name and any messages you add after sharing stay private.',
-    translated: '您的名字及您在分享后添加的任何消息将保持私密。',
-  },
-  com_ui_share_created_message: {
-    english:
-      'A shared link to your chat has been created. Manage previously shared chats at any time via Settings.',
-    translated: '已创建到您聊天的共享链接。可以通过设置随时管理以前共享的聊天。',
-  },
-  com_ui_share_update_message: {
-    english: 'Your name, custom instructions, and any messages you add after sharing stay private.',
-    translated: '您的名字、定制指令及您在分享后添加的任何消息将保持私密。',
-  },
-  com_ui_share_updated_message: {
-    english:
-      'A shared link to your chat has been updated. Manage previously shared chats at any time via Settings.',
-    translated: '已更新到您聊天的共享链接。可以通过设置随时管理以前共享的聊天。',
-  },
-  com_ui_shared_link_not_found: {
-    english: 'Shared link not found',
-    translated: '未找到共享链接',
-  },
-  com_ui_delete_conversation: {
-    english: 'Delete chat?',
-    translated: '删除对话？',
-  },
-  com_ui_delete_confirm: {
-    english: 'This will delete',
-    translated: '这将删除',
-  },
-  com_ui_delete_assistant_confirm: {
-    english: 'Are you sure you want to delete this Assistant? This cannot be undone.',
-    translated: '确定要删除此助手吗？该操作无法撤销。',
-  },
-  com_ui_rename: {
-    english: 'Rename',
-    translated: '重命名',
-  },
-  com_ui_archive: {
-    english: 'Archive',
-    translated: '归档',
-  },
-  com_ui_archive_error: {
-    english: 'Failed to archive conversation',
-    translated: '归档对话失败',
-  },
-  com_ui_unarchive: {
-    english: 'Unarchive',
-    translated: '取消归档',
-  },
-  com_ui_unarchive_error: {
-    english: 'Failed to unarchive conversation',
-    translated: '取消归档对话失败',
-  },
-  com_ui_more_options: {
-    english: 'More',
-    translated: '更多',
-  },
-  com_ui_preview: {
-    english: 'Preview',
-    translated: '预览',
-  },
-  com_ui_upload: {
-    english: 'Upload',
-    translated: '上传',
-  },
-  com_ui_connect: {
-    english: 'Connect',
-    translated: '连接',
-  },
-  com_ui_upload_delay: {
-    english:
-      'Uploading "{0}" is taking more time than anticipated. Please wait while the file finishes indexing for retrieval.',
-    translated: '上传 "{0}" 时比预期花了更长时间。 文件正在进行检索索引，请稍候。',
-  },
-  com_ui_privacy_policy: {
-    english: 'Privacy policy',
-    translated: '隐私政策',
-  },
-  com_ui_terms_of_service: {
-    english: 'Terms of service',
-    translated: '服务政策',
-  },
-  com_ui_bookmarks: {
-    english: 'Bookmarks',
-    translated: '书签',
-  },
-  com_ui_bookmarks_rebuild: {
-    english: 'Rebuild',
-    translated: '重建',
-  },
-  com_ui_bookmarks_new: {
-    english: 'New Bookmark',
-    translated: '新书签',
-  },
-  com_ui_bookmark_delete_confirm: {
-    english: 'Are you sure you want to delete this bookmark?',
-    translated: '你确定要删除这个书签吗？',
-  },
-  com_ui_bookmarks_title: {
-    english: 'Title',
-    translated: '标题',
-  },
-  com_ui_bookmarks_count: {
-    english: 'Count',
-    translated: '计数',
-  },
-  com_ui_bookmarks_description: {
-    english: 'Description',
-    translated: '描述',
-  },
-  com_ui_bookmarks_create_success: {
-    english: 'Bookmark created successfully',
-    translated: '书签创建成功',
-  },
-  com_ui_bookmarks_update_success: {
-    english: 'Bookmark updated successfully',
-    translated: '书签更新成功',
-  },
-  com_ui_bookmarks_delete_success: {
-    english: 'Bookmark deleted successfully',
-    translated: '书签删除成功',
-  },
-  com_ui_bookmarks_create_error: {
-    english: 'There was an error creating the bookmark',
-    translated: '创建书签时出错',
-  },
-  com_ui_bookmarks_update_error: {
-    english: 'There was an error updating the bookmark',
-    translated: '更新书签时出错',
-  },
-  com_ui_bookmarks_delete_error: {
-    english: 'There was an error deleting the bookmark',
-    translated: '删除书签时出错',
-  },
-  com_ui_bookmarks_add_to_conversation: {
-    english: 'Add to current conversation',
-    translated: '添加到当前对话',
-  },
-  com_auth_error_login: {
-    english:
-      'Unable to login with the information provided. Please check your credentials and try again.',
-    translated: '无法登录，请确认提供的账户密码正确，并重新尝试。',
-  },
-  com_auth_error_login_rl: {
-    english: 'Too many login attempts in a short amount of time. Please try again later.',
-    translated: '尝试登录次数过多，请稍后再试。',
-  },
-  com_auth_error_login_ban: {
-    english: 'Your account has been temporarily banned due to violations of our service.',
-    translated: '根据我们的服务规则，您的帐号被暂时禁用。',
-  },
-  com_auth_error_login_server: {
-    english: 'There was an internal server error. Please wait a few moments and try again.',
-    translated: '内部服务器错误，请稍后再试。',
-  },
-  com_auth_no_account: {
-    english: 'Don\'t have an account?',
-    translated: '新用户注册',
-  },
-  com_auth_sign_up: {
-    english: 'Sign up',
-    translated: '注册',
-  },
-  com_auth_sign_in: {
-    english: 'Sign in',
-    translated: '登录',
-  },
-  com_auth_google_login: {
-    english: 'Continue with Google',
-    translated: '使用 Google 登录',
-  },
-  com_auth_facebook_login: {
-    english: 'Continue with Facebook',
-    translated: '使用 Facebook 登录',
-  },
-  com_auth_github_login: {
-    english: 'Continue with Github',
-    translated: '使用 GitHub 登录',
-  },
-  com_auth_discord_login: {
-    english: 'Continue with Discord',
-    translated: '使用 Discord 登录',
-  },
-  com_auth_email: {
-    english: 'Email',
-    translated: '电子邮箱',
-  },
-  com_auth_email_required: {
-    english: 'Email is required',
-    translated: '邮箱为必填项',
-  },
-  com_auth_email_min_length: {
-    english: 'Email must be at least 6 characters',
-    translated: '邮箱地址至少6个字符',
-  },
-  com_auth_email_max_length: {
-    english: 'Email should not be longer than 120 characters',
-    translated: '邮箱地址最多120个字符',
-  },
-  com_auth_email_pattern: {
-    english: 'You must enter a valid email address',
-    translated: '请输入正确的电子邮箱格式',
-  },
-  com_auth_email_address: {
-    english: 'Email address',
-    translated: '电子邮箱地址',
-  },
-  com_auth_password: {
-    english: 'Password',
-    translated: '密码',
-  },
-  com_auth_password_required: {
-    english: 'Password is required',
-    translated: '密码为必填项',
-  },
-  com_auth_password_min_length: {
-    english: 'Password must be at least 8 characters',
-    translated: '密码至少8个字符',
-  },
-  com_auth_password_max_length: {
-    english: 'Password must be less than 128 characters',
-    translated: '密码最多128个字符',
-  },
-  com_auth_password_forgot: {
-    english: 'Forgot Password?',
-    translated: '忘记密码?',
-  },
-  com_auth_password_confirm: {
-    english: 'Confirm password',
-    translated: '确认密码',
-  },
-  com_auth_password_not_match: {
-    english: 'Passwords do not match',
-    translated: '密码不一致',
-  },
-  com_auth_continue: {
-    english: 'Continue',
-    translated: '继续',
-  },
-  com_auth_create_account: {
-    english: 'Create your account',
-    translated: '创建账号',
-  },
-  com_auth_error_create: {
-    english: 'There was an error attempting to register your account. Please try again.',
-    translated: '注册账户过程中出现错误，请重试。',
-  },
-  com_auth_full_name: {
-    english: 'Full name',
-    translated: '姓名',
-  },
-  com_auth_name_required: {
-    english: 'Name is required',
-    translated: '姓名为必填项',
-  },
-  com_auth_name_min_length: {
-    english: 'Name must be at least 3 characters',
-    translated: '姓名至少3个字符',
-  },
-  com_auth_name_max_length: {
-    english: 'Name must be less than 80 characters',
-    translated: '姓名最多80个字符',
-  },
-  com_auth_username: {
-    english: 'Username (optional)',
-    translated: '用户名（可选）',
-  },
-  com_auth_username_required: {
-    english: 'Username is required',
-    translated: '用户名为必填项',
-  },
-  com_auth_username_min_length: {
-    english: 'Username must be at least 2 characters',
-    translated: '用户名至少3个字符',
-  },
-  com_auth_username_max_length: {
-    english: 'Username must be less than 20 characters',
-    translated: '用户名最多20个字符',
-  },
-  com_auth_already_have_account: {
-    english: 'Already have an account?',
-    translated: '已有账号',
-  },
-  com_auth_login: {
-    english: 'Login',
-    translated: '登录',
-  },
-  com_auth_reset_password: {
-    english: 'Reset your password',
-    translated: '重置密码',
-  },
-  com_auth_click: {
-    english: 'Click',
-    translated: '点击',
-  },
-  com_auth_here: {
-    english: 'HERE',
-    translated: '这里',
-  },
-  com_auth_to_reset_your_password: {
-    english: 'to reset your password.',
-    translated: '重置密码。',
-  },
-  com_auth_reset_password_link_sent: {
-    english: 'Email Sent',
-    translated: '重置密码链接已发送至邮箱',
-  },
-  com_auth_reset_password_email_sent: {
-    english: 'An email has been sent to you with further instructions to reset your password.',
-    translated: '重置密码邮件已发送至邮箱',
-  },
-  com_auth_error_reset_password: {
-    english:
-      'There was a problem resetting your password. There was no user found with the email address provided. Please try again.',
-    translated: '重置密码出现错误，未找到对应的邮箱地址，请重新输入。',
-  },
-  com_auth_reset_password_success: {
-    english: 'Password Reset Success',
-    translated: '密码重置成功',
-  },
-  com_auth_login_with_new_password: {
-    english: 'You may now login with your new password.',
-    translated: '现在你可以使用你的新密码登录。',
-  },
-  com_auth_error_invalid_reset_token: {
-    english: 'This password reset token is no longer valid.',
-    translated: '重置密码的密钥已失效。',
-  },
-  com_auth_click_here: {
-    english: 'Click here',
-    translated: '点击这里',
-  },
-  com_auth_to_try_again: {
-    english: 'to try again.',
-    translated: '再试一次。',
-  },
-  com_auth_submit_registration: {
-    english: 'Submit registration',
-    translated: '注册提交',
-  },
-  com_auth_welcome_back: {
-    english: 'Welcome back',
-    translated: '欢迎',
-  },
-  com_auth_back_to_login: {
-    english: 'Back to Login',
-    translated: '返回登录',
-  },
-  com_endpoint_open_menu: {
-    english: 'Open Menu',
-    translated: '打开菜单',
-  },
-  com_endpoint_bing_enable_sydney: {
-    english: 'Enable Sydney',
-    translated: '启用 Sydney',
-  },
-  com_endpoint_bing_to_enable_sydney: {
-    english: 'To enable Sydney',
-    translated: '启用 Sydney',
-  },
-  com_endpoint_bing_jailbreak: {
-    english: 'Jailbreak',
-    translated: '越狱',
-  },
-  com_endpoint_bing_context_placeholder: {
-    english:
-      'Bing can use up to 7k tokens for \'context\', which it can reference for the conversation. The specific limit is not known but may run into errors exceeding 7k tokens',
-    translated:
-      '必应可以使用多达7000个词元作为“上下文（context）”，参照这些内容进行对话。其具体限制并不清楚，但可能会在超过7000个词元时出现错误',
-  },
-  com_endpoint_bing_system_message_placeholder: {
-    english:
-      'WARNING: Misuse of this feature can get you BANNED from using Bing! Click on \'System Message\' for full instructions and the default message if omitted, which is the \'Sydney\' preset that is considered safe.',
-    translated:
-      '警告：滥用此功能可能导致你被禁止使用必应！点击“系统消息”查看完整的使用指南，如果你忽略了默认消息，那么将会使用被视为安全的“Sydney”预设。',
-  },
-  com_endpoint_system_message: {
-    english: 'System Message',
-    translated: '系统消息',
-  },
-  com_endpoint_message: {
-    english: 'Message',
-    translated: '发送消息给',
-  },
-  com_endpoint_message_not_appendable: {
-    english: 'Edit your message or Regenerate.',
-    translated: '编辑您的消息内容或重新生成',
-  },
-  com_endpoint_default_blank: {
-    english: 'default: blank',
-    translated: '初始值: 空白',
-  },
-  com_endpoint_default_false: {
-    english: 'default: false',
-    translated: '初始值: 否',
-  },
-  com_endpoint_default_creative: {
-    english: 'default: creative',
-    translated: '初始值: 创意',
-  },
-  com_endpoint_default_empty: {
-    english: 'default: empty',
-    translated: '初始值: 空',
-  },
-  com_endpoint_default_with_num: {
-    english: 'default: {0}',
-    translated: '初始值: {0}',
-  },
-  com_endpoint_context: {
-    english: 'Context',
-    translated: '上下文',
-  },
-  com_endpoint_tone_style: {
-    english: 'Tone Style',
-    translated: '语气',
-  },
-  com_endpoint_token_count: {
-    english: 'Token count',
-    translated: '词元数',
-  },
-  com_endpoint_output: {
-    english: 'Output',
-    translated: '输出',
-  },
-  com_endpoint_google_temp: {
-    english:
-      'Higher values = more random, while lower values = more focused and deterministic. We recommend altering this or Top P but not both.',
-    translated: '值越高表示输出越随机，值越低表示输出越确定。建议不要同时改变此值和Top-p。',
-  },
-  com_endpoint_google_topp: {
-    english:
-      'Top-p changes how the model selects tokens for output. Tokens are selected from most K (see topK parameter) probable to least until the sum of their probabilities equals the top-p value.',
-    translated:
-      'Top-p（核采样）会改变模型选择输出词的方式。从概率最大的K（参见topK参数）向最小的K选择，直到它们的概率之和等于top-p值',
-  },
-  com_endpoint_google_topk: {
-    english:
-      'Top-k changes how the model selects tokens for output. A top-k of 1 means the selected token is the most probable among all tokens in the model\'s vocabulary (also called greedy decoding), while a top-k of 3 means that the next token is selected from among the 3 most probable tokens (using temperature).',
-    translated:
-      'Top-k 会改变模型选择输出词的方式。top-k为1意味着所选词是模型词汇中概率最大的（也称为贪心解码），而top-k为3意味着下一个词是从3个概率最大的词中选出的（使用随机性）。',
-  },
-  com_endpoint_google_maxoutputtokens: {
-    english:
-      ' \tMaximum number of tokens that can be generated in the response. Specify a lower value for shorter responses and a higher value for longer responses.',
-    translated:
-      ' \t响应生成中可以使用的最大词元数。指定较低的值会得到更短的响应，而指定较高的值则会得到更长的响应。',
-  },
-  com_endpoint_google_custom_name_placeholder: {
-    english: 'Set a custom name for Google',
-    translated: '为Google设置一个名称',
-  },
-  com_endpoint_prompt_prefix_placeholder: {
-    english: 'Set custom instructions or context. Ignored if empty.',
-    translated: '自定义提示词和上下文，默认为空',
-  },
-  com_endpoint_instructions_assistants_placeholder: {
-    english:
-      'Overrides the instructions of the assistant. This is useful for modifying the behavior on a per-run basis.',
-    translated: '覆盖助手的指令。这对于需要逐次修改行为非常有用。',
-  },
-  com_endpoint_prompt_prefix_assistants_placeholder: {
-    english:
-      'Set additional instructions or context on top of the Assistant\'s main instructions. Ignored if empty.',
-    translated: '在助手的主要指令之上设置额外的指令或上下文。如果为空，则忽略。',
-  },
-  com_endpoint_custom_name: {
-    english: 'Custom Name',
-    translated: '自定义名称',
-  },
-  com_endpoint_prompt_prefix: {
-    english: 'Custom Instructions',
-    translated: '自定义指令',
-  },
-  com_endpoint_prompt_prefix_assistants: {
-    english: 'Additional Instructions',
-    translated: '额外命令',
-  },
-  com_endpoint_instructions_assistants: {
-    english: 'Override Instructions',
-    translated: '覆写命令',
-  },
-  com_endpoint_temperature: {
-    english: 'Temperature',
-    translated: '温度',
-  },
-  com_endpoint_default: {
-    english: 'default',
-    translated: '初始值',
-  },
-  com_endpoint_top_p: {
-    english: 'Top P',
-    translated: 'Top P',
-  },
-  com_endpoint_top_k: {
-    english: 'Top K',
-    translated: 'Top K',
-  },
-  com_endpoint_max_output_tokens: {
-    english: 'Max Output Tokens',
-    translated: '最大输出词元数',
-  },
-  com_endpoint_openai_temp: {
-    english:
-      'Higher values = more random, while lower values = more focused and deterministic. We recommend altering this or Top P but not both.',
-    translated: '值越高表示输出越随机，值越低表示输出越确定。建议不要同时改变此值和Top P。',
-  },
-  com_endpoint_openai_max: {
-    english:
-      'The max tokens to generate. The total length of input tokens and generated tokens is limited by the model\'s context length.',
-    translated: '最大生成词元数。输入词元长度由模型的上下文长度决定。',
-  },
-  com_endpoint_openai_topp: {
-    english:
-      'An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered. We recommend altering this or temperature but not both.',
-    translated:
-      '相较于随机性的另一个取样方法，称为核采样，模型选取输出词元中大于P值（概率密度在整个概率分布中的比例）的结果。比如 top_p=0.1 表示只有概率占比为前10%的词元才会被考虑作为输出。建议不要同时改变此值和随机性。',
-  },
-  com_endpoint_openai_freq: {
-    english:
-      'Number between -2.0 and 2.0. Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model\'s likelihood to repeat the same line verbatim.',
-    translated: '值介于-2.0到2.0之间。正值将惩罚当前已频繁使用的词元，从而降低重复用词的可能性。',
-  },
-  com_endpoint_openai_pres: {
-    english:
-      'Number between -2.0 and 2.0. Positive values penalize new tokens based on whether they appear in the text so far, increasing the model\'s likelihood to talk about new topics.',
-    translated: '值介于-2.0到2.0之间。正值将惩罚当前已经使用的词元，从而增加讨论新话题的可能性。',
-  },
-  com_endpoint_openai_resend: {
-    english:
-      'Resend all previously attached images. Note: this can significantly increase token cost and you may experience errors with many image attachments.',
-    translated:
-      '重新发送所有先前附加的图像。(注意：这会显着增加Token成本，并且可能会遇到很多关于图像附件的错误。)',
-  },
-  com_endpoint_openai_resend_files: {
-    english:
-      'Resend all previously attached files. Note: this will increase token cost and you may experience errors with many attachments.',
-    translated:
-      '重新发送所有先前附加的文件。(注意：这会显着增加Token成本，并且可能会遇到很多关于图像附件的错误。)',
-  },
-  com_endpoint_openai_detail: {
-    english:
-      'The resolution for Vision requests. "Low" is cheaper and faster, "High" is more detailed and expensive, and "Auto" will automatically choose between the two based on the image resolution.',
-    translated:
-      '发送给Vision的图像分辨率。 “Low”更便宜且更快，“High”更详细但更昂贵，“Auto”将基于图像分辨率自动在两者之间进行选择。',
-  },
-  com_endpoint_openai_custom_name_placeholder: {
-    english: 'Set a custom name for the AI',
-    translated: '为ChatGPT设置一个名称',
-  },
-  com_endpoint_openai_prompt_prefix_placeholder: {
-    english: 'Set custom instructions to include in System Message. Default: none',
-    translated: '在消息开头添加系统级提示词，默认为空',
-  },
-  com_endpoint_anthropic_temp: {
-    english:
-      'Ranges from 0 to 1. Use temp closer to 0 for analytical / multiple choice, and closer to 1 for creative and generative tasks. We recommend altering this or Top P but not both.',
-    translated:
-      '值介于0到1之间。 对于分析性/选择性任务，值应更接近0；对于创造性和生成性任务，值应更接近1。我们建议更改该参数或Top-p，但不要同时更改这两个参数。',
-  },
-  com_endpoint_anthropic_topp: {
-    english:
-      'Top-p changes how the model selects tokens for output. Tokens are selected from most K (see topK parameter) probable to least until the sum of their probabilities equals the top-p value.',
-    translated:
-      'Top-p（核采样）会改变模型选择输出词元的方式。从概率最大的K（参见topK参数）向最小的K选择，直到它们的概率之和等于top-p值。',
-  },
-  com_endpoint_anthropic_topk: {
-    english:
-      'Top-k changes how the model selects tokens for output. A top-k of 1 means the selected token is the most probable among all tokens in the model\'s vocabulary (also called greedy decoding), while a top-k of 3 means that the next token is selected from among the 3 most probable tokens (using temperature).',
-    translated:
-      'Top-k 会改变模型选择输出词元的方式。top-k为1意味着所选词是模型词汇中概率最大的（也称为贪心解码），而top-k为3意味着下一个词是从3个概率最大的词中选出的（使用随机性）。',
-  },
-  com_endpoint_anthropic_maxoutputtokens: {
-    english:
-      'Maximum number of tokens that can be generated in the response. Specify a lower value for shorter responses and a higher value for longer responses.',
-    translated:
-      '响应中可生成的最大词元数。指定较低的值会得到更短的响应，而指定较高的值则会得到更长的响应。',
-  },
-  com_endpoint_anthropic_custom_name_placeholder: {
-    english: 'Set a custom name for Anthropic',
-    translated: '为Anthropic设置一个名称',
-  },
-  com_endpoint_frequency_penalty: {
-    english: 'Frequency Penalty',
-    translated: '频率惩罚度',
-  },
-  com_endpoint_presence_penalty: {
-    english: 'Presence Penalty',
-    translated: '话题新鲜度',
-  },
-  com_endpoint_plug_use_functions: {
-    english: 'Use Functions',
-    translated: '使用函数',
-  },
-  com_endpoint_plug_resend_files: {
-    english: 'Resend Files',
-    translated: '重发文件',
-  },
-  com_endpoint_plug_resend_images: {
-    english: 'Resend Images',
-    translated: '重发图片',
-  },
-  com_endpoint_plug_image_detail: {
-    english: 'Image Detail',
-    translated: '图片细节',
-  },
-  com_endpoint_plug_skip_completion: {
-    english: 'Skip Completion',
-    translated: '跳过补全',
-  },
-  com_endpoint_disabled_with_tools: {
-    english: 'disabled with tools',
-    translated: '系统禁用',
-  },
-  com_endpoint_disabled_with_tools_placeholder: {
-    english: 'Disabled with Tools Selected',
-    translated: '系统禁用',
-  },
-  com_endpoint_plug_set_custom_instructions_for_gpt_placeholder: {
-    english: 'Set custom instructions to include in System Message. Default: none',
-    translated: '在消息开头添加系统级提示词，默认为空',
-  },
-  com_endpoint_import: {
-    english: 'Import',
-    translated: '导入',
-  },
-  com_endpoint_set_custom_name: {
-    english: 'Set a custom name, in case you can find this preset',
-    translated: '设置一个自定义名，以便您检索此预设',
-  },
-  com_endpoint_preset_delete_confirm: {
-    english: 'Are you sure you want to delete this preset?',
-    translated: '确定删除此预设？',
-  },
-  com_endpoint_preset_clear_all_confirm: {
-    english: 'Are you sure you want to delete all of your presets?',
-    translated: '确定删除所有预设？',
-  },
-  com_endpoint_preset_import: {
-    english: 'Preset Imported!',
-    translated: '成功导入预设！',
-  },
-  com_endpoint_preset_import_error: {
-    english: 'There was an error importing your preset. Please try again.',
-    translated: '导入预设时发生错误，请重试。',
-  },
-  com_endpoint_preset_save_error: {
-    english: 'There was an error saving your preset. Please try again.',
-    translated: '保存预设时发生错误，请重试。',
-  },
-  com_endpoint_preset_delete_error: {
-    english: 'There was an error deleting your preset. Please try again.',
-    translated: '删除预设时发生错误，请重试。',
-  },
-  com_endpoint_preset_default_removed: {
-    english: 'is no longer the default preset.',
-    translated: '不再是默认预设。',
-  },
-  com_endpoint_preset_default_item: {
-    english: 'Default:',
-    translated: '默认：',
-  },
-  com_endpoint_preset_default_none: {
-    english: 'No default preset active.',
-    translated: '无默认预设可用。',
-  },
-  com_endpoint_preset_title: {
-    english: 'Preset',
-    translated: '预设',
-  },
-  com_endpoint_preset_saved: {
-    english: 'Saved!',
-    translated: '保存成功！',
-  },
-  com_endpoint_preset_default: {
-    english: 'is now the default preset.',
-    translated: '现在是默认预设。',
-  },
-  com_endpoint_preset: {
-    english: 'preset',
-    translated: '预设',
-  },
-  com_endpoint_presets: {
-    english: 'presets',
-    translated: '预设',
-  },
-  com_endpoint_preset_selected: {
-    english: 'Preset Active!',
-    translated: '预设可用！',
-  },
-  com_endpoint_preset_selected_title: {
-    english: 'Active!',
-    translated: '可用！',
-  },
-  com_endpoint_preset_name: {
-    english: 'Preset Name',
-    translated: '预设名',
-  },
-  com_endpoint_new_topic: {
-    english: 'New Topic',
-    translated: '新主题',
-  },
-  com_endpoint: {
-    english: 'Endpoint',
-    translated: '渠道',
-  },
-  com_endpoint_hide: {
-    english: 'Hide',
-    translated: '隐藏',
-  },
-  com_endpoint_show: {
-    english: 'Show',
-    translated: '显示',
-  },
-  com_endpoint_examples: {
-    english: ' Presets',
-    translated: ' 预设',
-  },
-  com_endpoint_completion: {
-    english: 'Completion',
-    translated: '补全',
-  },
-  com_endpoint_agent: {
-    english: 'Agent',
-    translated: '代理',
-  },
-  com_endpoint_show_what_settings: {
-    english: 'Show {0} Settings',
-    translated: '显示{0}设置',
-  },
-  com_endpoint_export: {
-    english: 'Export',
-    translated: '导出',
-  },
-  com_endpoint_assistant: {
-    english: 'Assistant',
-    translated: '助手',
-  },
-  com_endpoint_use_active_assistant: {
-    english: 'Use Active Assistant',
-    translated: '使用激活的助手',
-  },
-  com_endpoint_assistant_model: {
-    english: 'Assistant Model',
-    translated: '助手模型',
-  },
-  com_endpoint_save_as_preset: {
-    english: 'Save As Preset',
-    translated: '保存为预设',
-  },
-  com_endpoint_presets_clear_warning: {
-    english: 'Are you sure you want to clear all presets? This is irreversible.',
-    translated: '确定要清除所有预设吗？此操作不可逆。',
-  },
-  com_endpoint_not_implemented: {
-    english: 'Not implemented',
-    translated: '未实现功能',
-  },
-  com_endpoint_no_presets: {
-    english: 'No presets yet, use the settings button to create one',
-    translated: '暂无预设，使用设置按钮创建一个。',
-  },
-  com_endpoint_not_available: {
-    english: 'No endpoint available',
-    translated: '无可用渠道',
-  },
-  com_endpoint_view_options: {
-    english: 'View Options',
-    translated: '查看选项',
-  },
-  com_endpoint_save_convo_as_preset: {
-    english: 'Save Conversation as Preset',
-    translated: '保存对话为预设',
-  },
-  com_endpoint_my_preset: {
-    english: 'My Preset',
-    translated: '我的预设',
-  },
-  com_endpoint_agent_model: {
-    english: 'Agent Model (Recommended: GPT-3.5)',
-    translated: '代理模型 (推荐: GPT-3.5)',
-  },
-  com_endpoint_completion_model: {
-    english: 'Completion Model (Recommended: GPT-4)',
-    translated: '补全模型 (推荐: GPT-4)',
-  },
-  com_endpoint_func_hover: {
-    english: 'Enable use of Plugins as OpenAI Functions',
-    translated: '将插件作为OpenAI函数使用',
-  },
-  com_endpoint_skip_hover: {
-    english:
-      'Enable skipping the completion step, which reviews the final answer and generated steps',
-    translated: '跳过补全步骤， 检查最终答案和生成步骤',
-  },
-  com_endpoint_config_key: {
-    english: 'Set API Key',
-    translated: '设置API Key',
-  },
-  com_endpoint_assistant_placeholder: {
-    english: 'Please select an Assistant from the right-hand Side Panel',
-    translated: '请从右侧面板中选择助手',
-  },
-  com_endpoint_config_placeholder: {
-    english: 'Set your Key in the Header menu to chat.',
-    translated: '在顶部菜单设置API KEY',
-  },
-  com_endpoint_config_key_for: {
-    english: 'Set API Key for',
-    translated: '设置API Key：',
-  },
-  com_endpoint_config_key_name: {
-    english: 'Key',
-    translated: '密钥',
-  },
-  com_endpoint_config_value: {
-    english: 'Enter value for',
-    translated: '输入值：',
-  },
-  com_endpoint_config_key_name_placeholder: {
-    english: 'Set API key first',
-    translated: '请先设置API key',
-  },
-  com_endpoint_config_key_encryption: {
-    english: 'Your key will be encrypted and deleted at',
-    translated: '您的密钥将被加密并删除于：',
-  },
-  com_endpoint_config_key_expiry: {
-    english: 'the expiry time',
-    translated: '过期时间',
-  },
-  com_endpoint_config_click_here: {
-    english: 'Click Here',
-    translated: '点击此处',
-  },
-  com_endpoint_config_google_service_key: {
-    english: 'Google Service Account Key',
-    translated: 'Google服务账号密钥',
-  },
-  com_endpoint_config_google_cloud_platform: {
-    english: '(from Google Cloud Platform)',
-    translated: '（从谷歌云平台）',
-  },
-  com_endpoint_config_google_api_key: {
-    english: 'Google API Key',
-    translated: 'Google API密钥',
-  },
-  com_endpoint_config_google_gemini_api: {
-    english: '(Gemini API)',
-    translated: '(Gemini API)',
-  },
-  com_endpoint_config_google_api_info: {
-    english: 'To get your Generative Language API key (for Gemini),',
-    translated: '获取您的生成式语言API密钥(Gemini),',
-  },
-  com_endpoint_config_key_import_json_key: {
-    english: 'Import Service Account JSON Key.',
-    translated: '导入服务账号JSON密钥',
-  },
-  com_endpoint_config_key_import_json_key_success: {
-    english: 'Successfully Imported Service Account JSON Key',
-    translated: '成功导入服务账号JSON密钥',
-  },
-  com_endpoint_config_key_import_json_key_invalid: {
-    english: 'Invalid Service Account JSON Key, Did you import the correct file?',
-    translated: '无效的服务账号JSON密钥，您是否导入正确的文件？',
-  },
-  com_endpoint_config_key_get_edge_key: {
-    english: 'To get your Access token for Bing, login to',
-    translated: '为获得Bing访问凭证（Access token），请登录：',
-  },
-  com_endpoint_config_key_get_edge_key_dev_tool: {
-    english:
-      'Use dev tools or an extension while logged into the site to copy the content of the _U cookie. If this fails, follow these',
-    translated:
-      '登录网站后，使用开发工具或扩展程序复制 _U cookie 的内容。如果失败，请按照以下步骤操作：',
-  },
-  com_endpoint_config_key_edge_instructions: {
-    english: 'instructions',
-    translated: '说明',
-  },
-  com_endpoint_config_key_edge_full_key_string: {
-    english: 'to provide the full cookie strings.',
-    translated: '提供完整的cookie字符串。',
-  },
-  com_endpoint_config_key_chatgpt: {
-    english: 'To get your Access token For ChatGPT \'Free Version\', login to',
-    translated: '为获得ChatGPT的访问凭证（Access token）, 请登录：',
-  },
-  com_endpoint_config_key_chatgpt_then_visit: {
-    english: 'then visit',
-    translated: '然后访问',
-  },
-  com_endpoint_config_key_chatgpt_copy_token: {
-    english: 'Copy access token.',
-    translated: '复制access token。',
-  },
-  com_endpoint_config_key_google_need_to: {
-    english: 'You need to',
-    translated: '您需要',
-  },
-  com_endpoint_config_key_google_vertex_ai: {
-    english: 'Enable Vertex AI',
-    translated: '在Google Cloud上启用Vertex AI',
-  },
-  com_endpoint_config_key_google_vertex_api: {
-    english: 'API on Google Cloud, then',
-    translated: 'API，然后',
-  },
-  com_endpoint_config_key_google_service_account: {
-    english: 'Create a Service Account',
-    translated: '创建一个服务账号',
-  },
-  com_endpoint_config_key_google_vertex_api_role: {
-    english:
-      'Make sure to click \'Create and Continue\' to give at least the \'Vertex AI User\' role. Lastly, create a JSON key to import here.',
-    translated:
-      '确保单击“创建并继续”以至少授予“Vertex AI 用户”角色。最后，创建一个要在此处导入的JSON密钥。',
-  },
-  com_nav_welcome_assistant: {
-    english: 'Please Select an Assistant',
-    translated: '请选择助手',
-  },
-  com_nav_welcome_message: {
-    english: 'How can I help you today?',
-    translated: '我今天能帮你做什么？',
-  },
-  com_nav_auto_scroll: {
-    english: 'Auto-Scroll to latest message on chat open',
-    translated: '打开时自动滚动到最新内容',
-  },
-  com_nav_hide_panel: {
-    english: 'Hide right-most side panel',
-    translated: '隐藏最右侧面板',
-  },
-  com_nav_modular_chat: {
-    english: 'Enable switching Endpoints mid-conversation',
-    translated: '启用对话中切换渠道',
-  },
-  com_nav_latex_parsing: {
-    english: 'Parsing LaTeX in messages (may affect performance)',
-    translated: '解析消息中的 LaTeX（可能会影响性能）',
-  },
-  com_nav_profile_picture: {
-    english: 'Profile Picture',
-    translated: '个人资料头像',
-  },
-  com_nav_change_picture: {
-    english: 'Change picture',
-    translated: '修改头像',
-  },
-  com_nav_plugin_store: {
-    english: 'Plugin store',
-    translated: '插件商店',
-  },
-  com_nav_plugin_install: {
-    english: 'Install',
-    translated: '安装',
-  },
-  com_nav_plugin_uninstall: {
-    english: 'Uninstall',
-    translated: '卸载',
-  },
-  com_ui_add: {
-    english: 'Add',
-    translated: '添加',
-  },
-  com_nav_tool_remove: {
-    english: 'Remove',
-    translated: '移除',
-  },
-  com_nav_tool_dialog: {
-    english: 'Assistant Tools',
-    translated: '助手工具',
-  },
-  com_nav_tool_dialog_description: {
-    english: 'Assistant must be saved to persist tool selections.',
-    translated: '必须保存助手才能保留工具选择。',
-  },
-  com_show_agent_settings: {
-    english: 'Show Agent Settings',
-    translated: '显示Agent设置',
-  },
-  com_show_completion_settings: {
-    english: 'Show Completion Settings',
-    translated: '显示Completion设置',
-  },
-  com_hide_examples: {
-    english: 'Hide Examples',
-    translated: '隐藏样例',
-  },
-  com_show_examples: {
-    english: 'Show Examples',
-    translated: '显示样例',
-  },
-  com_nav_plugin_search: {
-    english: 'Search plugins',
-    translated: '搜索插件',
-  },
-  com_nav_tool_search: {
-    english: 'Search tools',
-    translated: '搜索工具',
-  },
-  com_nav_plugin_auth_error: {
-    english: 'There was an error attempting to authenticate this plugin. Please try again.',
-    translated: '尝试验证此插件时出错。请重试。',
-  },
-  com_nav_export_filename: {
-    english: 'Filename',
-    translated: '文件名',
-  },
-  com_nav_export_filename_placeholder: {
-    english: 'Set the filename',
-    translated: '设置文件名',
-  },
-  com_nav_export_type: {
-    english: 'Type',
-    translated: '类型',
-  },
-  com_nav_export_include_endpoint_options: {
-    english: 'Include endpoint options',
-    translated: '包含配置信息',
-  },
-  com_nav_enabled: {
-    english: 'Enabled',
-    translated: '启用',
-  },
-  com_nav_not_supported: {
-    english: 'Not Supported',
-    translated: '未支持',
-  },
-  com_nav_export_all_message_branches: {
-    english: 'Export all message branches',
-    translated: '导出所有对话',
-  },
-  com_nav_export_recursive_or_sequential: {
-    english: 'Recursive or sequential?',
-    translated: '递归或顺序？',
-  },
-  com_nav_export_recursive: {
-    english: 'Recursive',
-    translated: '递归',
-  },
-  com_nav_export_conversation: {
-    english: 'Export conversation',
-    translated: '导出对话',
-  },
-  com_nav_export: {
-    english: 'Export',
-    translated: '导出',
-  },
-  com_nav_shared_links: {
-    english: 'Shared links',
-    translated: '共享链接',
-  },
-  com_nav_shared_links_manage: {
-    english: 'Manage',
-    translated: '管理',
-  },
-  com_nav_shared_links_empty: {
-    english: 'You have no shared links.',
-    translated: '您没有共享链接。',
-  },
-  com_nav_shared_links_name: {
-    english: 'Name',
-    translated: '名称',
-  },
-  com_nav_shared_links_date_shared: {
-    english: 'Date shared',
-    translated: '共享日期',
-  },
-  com_nav_my_files: {
-    english: 'My Files',
-    translated: '我的文件',
-  },
-  com_nav_theme: {
-    english: 'Theme',
-    translated: '主题',
-  },
-  com_nav_theme_system: {
-    english: 'System',
-    translated: '跟随系统设置',
-  },
-  com_nav_theme_dark: {
-    english: 'Dark',
-    translated: '暗色主题',
-  },
-  com_nav_theme_light: {
-    english: 'Light',
-    translated: '亮色主题',
-  },
-  com_nav_user_name_display: {
-    english: 'Display username in messages',
-    translated: '在消息中显示用户名',
-  },
-  com_nav_save_drafts: {
-    english: 'Save drafts locally',
-    translated: '保存草稿本地',
-  },
-  com_nav_show_code: {
-    english: 'Always show code when using code interpreter',
-    translated: '使用代码解释器时始终显示代码',
-  },
-  com_nav_clear_all_chats: {
-    english: 'Clear all chats',
-    translated: '清空所有对话',
-  },
-  com_nav_confirm_clear: {
-    english: 'Confirm Clear',
-    translated: '确认清空',
-  },
-  com_nav_close_sidebar: {
-    english: 'Close sidebar',
-    translated: '关闭侧边栏',
-  },
-  com_nav_open_sidebar: {
-    english: 'Open sidebar',
-    translated: '打开侧边栏',
-  },
-  com_nav_send_message: {
-    english: 'Send message',
-    translated: '发送消息',
-  },
-  com_nav_log_out: {
-    english: 'Log out',
-    translated: '注销',
-  },
-  com_nav_user: {
-    english: 'USER',
-    translated: '默认用户',
-  },
-  com_nav_archived_chats: {
-    english: 'Archived chats',
-    translated: '归档的对话',
-  },
-  com_nav_archived_chats_manage: {
-    english: 'Manage',
-    translated: '管理',
-  },
-  com_nav_archived_chats_empty: {
-    english: 'You have no archived conversations.',
-    translated: '您没有归档的对话。',
-  },
-  com_nav_archive_all_chats: {
-    english: 'Archive all chats',
-    translated: '归档所有对话',
-  },
-  com_nav_archive_all: {
-    english: 'Archive all',
-    translated: '归档所有',
-  },
-  com_nav_archive_name: {
-    english: 'Name',
-    translated: '名称',
-  },
-  com_nav_archive_created_at: {
-    english: 'DateCreated',
-    translated: '创建时间',
-  },
-  com_nav_clear_conversation: {
-    english: 'Clear conversations',
-    translated: '清空对话',
-  },
-  com_nav_clear_conversation_confirm_message: {
-    english: 'Are you sure you want to clear all conversations? This is irreversible.',
-    translated: '请是否清空所有对话？该操作无法撤销',
-  },
-  com_nav_help_faq: {
-    english: 'Help & FAQ',
-    translated: '帮助',
-  },
-  com_nav_settings: {
-    english: 'Settings',
-    translated: '设置',
-  },
-  com_nav_search_placeholder: {
-    english: 'Search messages',
-    translated: '搜索对话及对话内容',
-  },
-  com_nav_info_bookmarks_rebuild: {
-    english:
-      'If the bookmark count is incorrect, please rebuild the bookmark information. The bookmark count will be recalculated and the data will be restored to its correct state.',
-    translated:
-      '如果书签计数不正确，请重新构建书签信息。书签计数将被重新计算，数据将恢复到其正确状态。',
-  },
-  com_nav_setting_general: {
-    english: 'General',
-    translated: '通用',
-  },
-  com_nav_setting_beta: {
-    english: 'Beta features',
-    translated: '实验特性',
-  },
-  com_nav_setting_data: {
-    english: 'Data controls',
-    translated: '数据管理',
-  },
-  com_nav_setting_account: {
-    english: 'Account',
-    translated: '账户',
-  },
-  com_assistants_file_search: {
-    english: 'File Search',
-    translated: '文件搜索',
-  },
-  com_assistants_file_search_info: {
-    english:
-      'Attaching vector stores for File Search is not yet supported. You can attach them from the Provider Playground or attach files to messages for file search on a thread basis.',
-    translated:
-      '暂不支持为文件搜索附加向量存储。您可以从提供程序游乐场附加它们,或者在线程基础上为文件搜索附加文件。',
-  },
-  com_assistants_non_retrieval_model: {
-    english: 'File search is not enabled on this model. Please select another model.',
-    translated: '此模型未启用文件搜索功能。请选择其他模型。',
-  },
-  com_ui_attach_error_openai: {
-    english: 'Cannot attach Assistant files to other endpoints',
-    translated: '无法将助手文件附加到其他渠道',
-  },
-  com_ui_attach_warn_endpoint: {
-    english: 'Non-Assistant files may be ignored without a compatible tool',
-    translated: '不兼容的工具可能会忽略非助手文件',
-  },
-  com_ui_assistant_deleted: {
-    english: 'Successfully deleted assistant',
-    translated: '助手已成功删除',
-  },
-  com_ui_assistant_delete_error: {
-    english: 'There was an error deleting the assistant',
-    translated: '删除助手时出错。',
-  },
-  com_ui_date_october: {
-    english: 'October',
-    translated: '十月',
-  },
-  com_ui_date_november: {
-    english: 'November',
-    translated: '十一月',
-  },
-  com_ui_date_december: {
-    english: 'December',
-    translated: '十二月',
-  },
-  com_ui_copied: {
-    english: 'Copied!',
-    translated: '已复制！',
-  },
-  com_ui_copy_code: {
-    english: 'Copy code',
-    translated: '复制代码',
-  },
-  com_nav_source_chat: {
-    english: 'View source chat',
-    translated: '查看源代码对话',
-  },
-  com_ui_date_today: {
-    english: 'Today',
-    translated: '今天',
-  },
-  com_ui_date_yesterday: {
-    english: 'Yesterday',
-    translated: '昨天',
-  },
-  com_ui_date_previous_7_days: {
-    english: 'Previous 7 days',
-    translated: '过去7天',
-  },
-  com_ui_date_previous_30_days: {
-    english: 'Previous 30 days',
-    translated: '过去30天',
-  },
-  com_ui_date_january: {
-    english: 'January',
-    translated: '一月',
-  },
-  com_ui_date_february: {
-    english: 'February',
-    translated: '二月',
-  },
-  com_ui_date_march: {
-    english: 'March',
-    translated: '三月',
-  },
-  com_ui_date_april: {
-    english: 'April',
-    translated: '四月',
-  },
-  com_ui_date_may: {
-    english: 'May',
-    translated: '五月',
-  },
-  com_ui_date_june: {
-    english: 'June',
-    translated: '六月',
-  },
-  com_ui_date_july: {
-    english: 'July',
-    translated: '七月',
-  },
-  com_ui_date_august: {
-    english: 'August',
-    translated: '八月',
-  },
-  com_ui_date_september: {
-    english: 'September',
-    translated: '九月',
-  },
-  com_ui_nothing_found: {
-    english: 'Nothing found',
-    translated: '未找到任何内容',
-  },
-  com_ui_go_to_conversation: {
-    english: 'Go to conversation',
-    translated: '转到对话',
-  },
-  com_error_moderation: {
-    english:
-      'It appears that the content submitted has been flagged by our moderation system for not aligning with our community guidelines. We\'re unable to proceed with this specific topic. If you have any other questions or topics you\'d like to explore, please edit your message, or create a new conversation.',
-    translated:
-      '很抱歉,您提交的内容被我们的审核系统标记为不符合社区指引。我们无法就此特定主题继续交流。如果您有任何其他问题或想探讨的话题,请编辑您的消息或开启新的对话。',
-  },
-  com_error_no_user_key: {
-    english: 'No key found. Please provide a key and try again.',
-    translated: '没有找到密钥。请提供密钥后重试。',
-  },
-  com_error_no_base_url: {
-    english: 'No base URL found. Please provide one and try again.',
-    translated: '未找到基础URL,请提供一个后重试。',
-  },
-  com_error_invalid_user_key: {
-    english: 'Invalid key provided. Please provide a key and try again.',
-    translated: '提供的密钥无效。请提供有效的密钥后重试。',
-  },
-  com_error_expired_user_key: {
-    english: 'Provided key for {0} expired at {1}. Please provide a key and try again.',
-    translated: '您提供的 {0} 密钥已于 {1} 过期。请提供新的密钥并重试。',
-  },
-  com_sidepanel_parameters: {
-    english: 'Parameters',
-    translated: '参数',
-  },
-  com_ui_on: {
-    english: 'On',
-    translated: '开启',
-  },
-  com_ui_off: {
-    english: 'Off',
-    translated: '关闭',
-  },
-  com_ui_yes: {
-    english: 'Yes',
-    translated: '是的',
-  },
-  com_ui_no: {
-    english: 'No',
-    translated: '否',
-  },
-  com_ui_none_selected: {
-    english: 'None selected',
-    translated: '未选择任何项目',
-  },
-  com_ui_fork: {
-    english: 'Fork',
-    translated: '分支',
-  },
-  com_ui_fork_info_1: {
-    english: 'Use this setting to fork messages with the desired behavior.',
-    translated: '使用此设置可以分叉消息,以获得所需的行为。',
-  },
-  com_ui_fork_info_2: {
-    english:
-      '"Forking" refers to creating a new conversation that start/end from specific messages in the current conversation, creating a copy according to the options selected.',
-    translated:
-      '"分叉"是指从当前对话中选择特定消息作为起点/终点,根据所选选项创建一个新的对话副本。',
-  },
-  com_ui_fork_info_3: {
-    english:
-      'The "target message" refers to either the message this popup was opened from, or, if you check "{0}", the latest message in the conversation.',
-    translated: '"目标消息"是指此弹出窗口所打开的消息,或者如果您选中"{0}",则是对话中最新的消息。',
-  },
-  com_ui_fork_info_visible: {
-    english:
-      'This option forks only the visible messages; in other words, the direct path to the target message, without any branches.',
-    translated: '此选项仅分叉可见的消息;换句话说,是直接路径到目标消息,没有任何分支。',
-  },
-  com_ui_fork_info_branches: {
-    english:
-      'This option forks the visible messages, along with related branches; in other words, the direct path to the target message, including branches along the path.',
-    translated:
-      '此选项会分叉可见消息及相关分支;换言之,包括沿路径的直接路线到目标消息,以及路径上的分支。',
-  },
-  com_ui_fork_info_target: {
-    english:
-      'This option forks all messages leading up to the target message, including its neighbors; in other words, all message branches, whether or not they are visible or along the same path, are included.',
-    translated:
-      '此选项会分叉所有导向目标消息的消息分支,包括其相邻消息;换句话说,无论是否可见或在同一路径上,所有消息分支都会被包含在内。',
-  },
-  com_ui_fork_info_start: {
-    english:
-      'If checked, forking will commence from this message to the latest message in the conversation, according to the behavior selected above.',
-    translated: '如果勾选,则根据上述选择的行为,从此消息开始到对话中最新的消息将被分叉。',
-  },
-  com_ui_fork_info_remember: {
-    english:
-      'Check this to remember the options you select for future usage, making it quicker to fork conversations as preferred.',
-    translated: '选中此项可记住您的选择,以便下次分支对话时更快捷地使用您偏好的选项。',
-  },
-  com_ui_fork_success: {
-    english: 'Successfully forked conversation',
-    translated: '对话分支成功',
-  },
-  com_ui_fork_processing: {
-    english: 'Forking conversation...',
-    translated: '正在分叉对话...',
-  },
-  com_ui_fork_error: {
-    english: 'There was an error forking the conversation',
-    translated: '分叉对话时出现错误',
-  },
-  com_ui_fork_change_default: {
-    english: 'Default fork option',
-    translated: '默认分支选项',
-  },
-  com_ui_fork_default: {
-    english: 'Use default fork option',
-    translated: '使用默认分支选项',
-  },
-  com_ui_fork_remember: {
-    english: 'Remember',
-    translated: '记住',
-  },
-  com_ui_fork_split_target_setting: {
-    english: 'Start fork from target message by default',
-    translated: '默认以目标消息开始分支',
-  },
-  com_ui_fork_split_target: {
-    english: 'Start fork here',
-    translated: '在此分叉',
-  },
-  com_ui_fork_remember_checked: {
-    english:
-      'Your selection will be remembered after usage. Change this at any time in the settings.',
-    translated: '您的选择将在使用后被记住。您可以随时在设置中更改。',
-  },
-  com_ui_fork_all_target: {
-    english: 'Include all to/from here',
-    translated: '包含所有目标',
-  },
-  com_ui_fork_branches: {
-    english: 'Include related branches',
-    translated: '包含相关分支',
-  },
-  com_ui_fork_visible: {
-    english: 'Visible messages only',
-    translated: '仅显示可见消息',
-  },
-  com_ui_fork_from_message: {
-    english: 'Select a fork option',
-    translated: '选择分支选项',
-  },
-  com_ui_mention: {
-    english: 'Mention an endpoint, assistant, or preset to quickly switch to it',
-    translated: '提及一个端点、助手或预设以快速切换到它',
-  },
-  com_ui_import_conversation_file_type_error: {
-    english: 'Unsupported import type',
-    translated: '不支持的导入类型',
-  },
-  com_ui_min_tags: {
-    english: 'Cannot remove more values, a minimum of {0} are required.',
-    translated: '无法再移除更多值,至少需要保留{0}个。',
-  },
-  com_ui_max_tags: {
-    english: 'Maximum number allowed is {0}, using latest values.',
-    translated: '最多允许{0}个,使用最新值。',
-  },
-  com_endpoint_context_tokens: {
-    english: 'Max Context Tokens',
-    translated: '最大上下文词元数',
-  },
-  com_endpoint_context_info: {
-    english:
-      'The maximum number of tokens that can be used for context. Use this for control of how many tokens are sent per request.\n  If unspecified, will use system defaults based on known models\' context size. Setting higher values may result in errors and/or higher token cost.',
-    translated:
-      '可用于上下文的最大词元数。用于控制每个请求发送的词元数量。如果未指定,将根据已知模型的上下文大小使用系统默认值。设置较高的值可能会导致错误和/或更高的词元成本。',
-  },
-  com_endpoint_stop: {
-    english: 'Stop Sequences',
-    translated: '停止序列',
-  },
-  com_endpoint_stop_placeholder: {
-    english: 'Separate values by pressing `Enter`',
-    translated: '按Enter键分隔多个值',
-  },
-  com_endpoint_openai_max_tokens: {
-    english:
-      'Optional `max_tokens` field, representing the maximum number of tokens that can be generated in the chat completion.\n    \n    The total length of input tokens and generated tokens is limited by the models context length. You may experience errors if this number exceeds the max context tokens.',
-    translated:
-      '可选的`max_tokens`字段,表示在聊天补全中可生成的最大token数量。\n\n输入token和生成token的总长度受模型上下文长度的限制。如果该数值超过最大上下文token数,您可能会遇到错误。',
-  },
-  com_endpoint_openai_stop: {
-    english: 'Up to 4 sequences where the API will stop generating further tokens.',
-    translated: '最多4个序列,API将停止生成更多词元。',
-  },
-  com_nav_enter_to_send: {
-    english: 'Press Enter to send messages',
-    translated: '请按Enter键发送消息',
-  },
-  com_nav_language: {
-    english: 'Language',
-    translated: '语言',
-  },
-  com_nav_lang_auto: {
-    english: 'Auto detect',
-    translated: '自动检测语言',
-  },
-  com_nav_lang_english: {
-    english: 'English',
-    translated: '英语',
-  },
-  com_nav_lang_chinese: {
-    english: '中文',
-    translated: '中文',
-  },
-  com_nav_lang_german: {
-    english: 'Deutsch',
-    translated: '德语',
-  },
-  com_nav_lang_spanish: {
-    english: 'Español',
-    translated: '西班牙语',
-  },
-  com_nav_lang_french: {
-    english: 'Français ',
-    translated: '法语',
-  },
-  com_nav_lang_italian: {
-    english: 'Italiano',
-    translated: '语言',
-  },
-  com_nav_lang_polish: {
-    english: 'Polski',
-    translated: '语言',
-  },
-  com_nav_lang_brazilian_portuguese: {
-    english: 'Português Brasileiro',
-    translated: '葡萄牙语(巴西)',
-  },
-  com_nav_lang_russian: {
-    english: 'Русский',
-    translated: '俄语',
-  },
-  com_nav_lang_japanese: {
-    english: '日本語',
-    translated: '日语',
-  },
-  com_nav_lang_swedish: {
-    english: 'Svenska',
-    translated: '语言',
-  },
-  com_nav_lang_korean: {
-    english: '한국어',
-    translated: '韩语',
-  },
-  com_nav_lang_vietnamese: {
-    english: 'Tiếng Việt',
-    translated: '越南语',
-  },
-  com_nav_lang_traditionalchinese: {
-    english: '繁體中文',
-    translated: '繁體中文',
-  },
-  com_nav_lang_arabic: {
-    english: 'العربية',
-    translated: 'العربية',
-  },
-  com_nav_lang_turkish: {
-    english: 'Türkçe',
-    translated: '土耳其语',
-  },
-  com_nav_lang_dutch: {
-    english: 'Nederlands',
-    translated: '荷兰语',
-  },
-  com_nav_lang_indonesia: {
-    english: 'Indonesia',
-    translated: '印度尼西亚语',
-  },
-  com_nav_lang_hebrew: {
-    english: 'עברית',
-    translated: '希伯来语',
-  },
+  com_nav_lang_turkish: 'Türkçe',
+  com_nav_lang_dutch: 'Nederlands',
+  com_nav_lang_indonesia: 'Indonesia',
+  com_nav_lang_hebrew: 'עברית',
+  com_nav_lang_finnish: 'Suomi',
+  com_ui_accept: '我接受',
+  com_ui_decline: '我不接受',
+  com_ui_terms_and_conditions: '条款和条件',
+  com_ui_no_terms_content: '没有可显示的条款和条件内容',
 };
diff --git a/client/src/localization/prompts/instructions/It.md b/client/src/localization/prompts/instructions/It.md
index f52f1f2ac65..a7838e2045d 100644
--- a/client/src/localization/prompts/instructions/It.md
+++ b/client/src/localization/prompts/instructions/It.md
@@ -653,11 +653,11 @@ Write a prompt that is mindful of the nuances in the language with respect to it
 
 - **com_ui_rename**:
   - **english**: Rename
-  - **translated**: Rinominare
+  - **translated**: Rinomina
 
 - **com_ui_archive**:
   - **english**: Archive
-  - **translated**: Arsip
+  - **translated**: Archivia
 
 - **com_ui_archive_error**:
   - **english**: Failed to archive conversation
diff --git a/client/src/routes/Layouts/DashBreadcrumb.tsx b/client/src/routes/Layouts/DashBreadcrumb.tsx
index a0456c933d8..f031689e94e 100644
--- a/client/src/routes/Layouts/DashBreadcrumb.tsx
+++ b/client/src/routes/Layouts/DashBreadcrumb.tsx
@@ -10,10 +10,10 @@ import {
   BreadcrumbList,
   BreadcrumbSeparator,
   // BreadcrumbEllipsis,
-  DropdownMenu,
+  // DropdownMenu,
   // DropdownMenuItem,
   // DropdownMenuContent,
-  DropdownMenuTrigger,
+  // DropdownMenuTrigger,
 } from '~/components/ui';
 import { useLocalize, useCustomLink, useAuthContext } from '~/hooks';
 import AdvancedSwitch from '~/components/Prompts/AdvancedSwitch';
diff --git a/client/src/routes/Root.tsx b/client/src/routes/Root.tsx
index 41fc3f242e4..d980ce2f8b6 100644
--- a/client/src/routes/Root.tsx
+++ b/client/src/routes/Root.tsx
@@ -8,14 +8,16 @@ import { AgentsMapContext, AssistantsMapContext, FileMapContext, SearchContext }
 import { useAuthContext, useAssistantsMap, useAgentsMap, useFileMap, useSearch } from '~/hooks';
 import { Nav, MobileNav } from '~/components/Nav';
 import TermsAndConditionsModal from '~/components/ui/TermsAndConditionsModal';
+import { Banner } from '~/components/Banners';
 
 export default function Root() {
-  const { isAuthenticated, logout, token } = useAuthContext();
+  const { isAuthenticated, logout } = useAuthContext();
   const navigate = useNavigate();
   const [navVisible, setNavVisible] = useState(() => {
     const savedNavVisible = localStorage.getItem('navVisible');
     return savedNavVisible !== null ? JSON.parse(savedNavVisible) : true;
   });
+  const [bannerHeight, setBannerHeight] = useState(0);
 
   const search = useSearch({ isAuthenticated });
   const fileMap = useFileMap({ isAuthenticated });
@@ -24,9 +26,8 @@ export default function Root() {
 
   const [showTerms, setShowTerms] = useState(false);
   const { data: config } = useGetStartupConfig();
-
   const { data: termsData } = useUserTermsQuery({
-    enabled: isAuthenticated && !!config?.interface?.termsOfService?.modalAcceptance,
+    enabled: isAuthenticated && config?.interface?.termsOfService?.modalAcceptance === true,
   });
 
   useEffect(() => {
@@ -54,7 +55,8 @@ export default function Root() {
       <FileMapContext.Provider value={fileMap}>
         <AssistantsMapContext.Provider value={assistantsMap}>
           <AgentsMapContext.Provider value={agentsMap}>
-            <div className="flex h-dvh">
+            <Banner onHeightChange={setBannerHeight} />
+            <div className="flex" style={{ height: `calc(100dvh - ${bannerHeight}px)` }}>
               <div className="relative z-0 flex h-full w-full overflow-hidden">
                 <Nav navVisible={navVisible} setNavVisible={setNavVisible} />
                 <div className="relative flex h-full max-w-full flex-1 flex-col overflow-hidden">
@@ -64,7 +66,7 @@ export default function Root() {
               </div>
             </div>
           </AgentsMapContext.Provider>
-          {config?.interface?.termsOfService?.modalAcceptance && (
+          {config?.interface?.termsOfService?.modalAcceptance === true && (
             <TermsAndConditionsModal
               open={showTerms}
               onOpenChange={setShowTerms}
diff --git a/client/src/store/banner.ts b/client/src/store/banner.ts
new file mode 100644
index 00000000000..baa0b02728b
--- /dev/null
+++ b/client/src/store/banner.ts
@@ -0,0 +1,5 @@
+import { atomWithLocalStorage } from './utils';
+
+const hideBannerHint = atomWithLocalStorage('hideBannerHint', [] as string[]);
+
+export default { hideBannerHint };
diff --git a/client/src/store/families.ts b/client/src/store/families.ts
index 0a6d5badc19..5c24b8d0fa3 100644
--- a/client/src/store/families.ts
+++ b/client/src/store/families.ts
@@ -74,6 +74,7 @@ const conversationByIndex = atomFamily<TConversation | null, string | number>({
     ({ onSet, node }) => {
       onSet(async (newValue) => {
         const index = Number(node.key.split('__')[1]);
+        logger.log('conversation', 'Setting conversation:', { index, newValue });
         if (newValue?.assistant_id) {
           localStorage.setItem(
             `${LocalStorageKeys.ASST_ID_PREFIX}${index}${newValue.endpoint}`,
diff --git a/client/src/store/index.ts b/client/src/store/index.ts
index 291dc2083e7..b0ab47221d6 100644
--- a/client/src/store/index.ts
+++ b/client/src/store/index.ts
@@ -12,7 +12,7 @@ import preset from './preset';
 import prompts from './prompts';
 import lang from './language';
 import settings from './settings';
-
+import banner from './banner';
 export default {
   ...artifacts,
   ...families,
@@ -28,4 +28,5 @@ export default {
   ...preset,
   ...lang,
   ...settings,
+  ...banner,
 };
diff --git a/client/src/store/search.ts b/client/src/store/search.ts
index fc70d6e274b..77c4d9be4f7 100644
--- a/client/src/store/search.ts
+++ b/client/src/store/search.ts
@@ -10,7 +10,13 @@ const searchQuery = atom({
   default: '',
 });
 
+const isSearching = atom({
+  key: 'isSearching',
+  default: false,
+});
+
 export default {
   isSearchEnabled,
   searchQuery,
+  isSearching,
 };
diff --git a/client/src/store/settings.ts b/client/src/store/settings.ts
index fa75615cf7b..0316336bd3a 100644
--- a/client/src/store/settings.ts
+++ b/client/src/store/settings.ts
@@ -1,5 +1,5 @@
 import { atom } from 'recoil';
-import { SettingsViews } from 'librechat-data-provider';
+import { SettingsViews, LocalStorageKeys } from 'librechat-data-provider';
 import { atomWithLocalStorage } from '~/store/utils';
 import type { TOptionSettings } from '~/common';
 
@@ -23,6 +23,10 @@ const localStorageAtoms = {
   autoScroll: atomWithLocalStorage('autoScroll', false),
   hideSidePanel: atomWithLocalStorage('hideSidePanel', false),
   fontSize: atomWithLocalStorage('fontSize', 'text-base'),
+  enableUserMsgMarkdown: atomWithLocalStorage<boolean>(
+    LocalStorageKeys.ENABLE_USER_MSG_MARKDOWN,
+    true,
+  ),
 
   // Messages settings
   enterToSend: atomWithLocalStorage('enterToSend', true),
@@ -32,7 +36,7 @@ const localStorageAtoms = {
   forkSetting: atomWithLocalStorage('forkSetting', ''),
   splitAtTarget: atomWithLocalStorage('splitAtTarget', false),
 
-  rememberForkOption: atomWithLocalStorage('rememberForkOption', true),
+  rememberDefaultFork: atomWithLocalStorage(LocalStorageKeys.REMEMBER_FORK_OPTION, false),
 
   // Beta features settings
   modularChat: atomWithLocalStorage('modularChat', true),
diff --git a/client/src/style.css b/client/src/style.css
index a53376225cd..dc91fe2c7c9 100644
--- a/client/src/style.css
+++ b/client/src/style.css
@@ -44,11 +44,37 @@ html {
   --surface-secondary: var(--gray-50);
   --surface-tertiary: var(--gray-100);
   --surface-tertiary-alt: var(--white);
+  --surface-dialog: var(--white);
   --border-light: var(--gray-200);
   --border-medium-alt: var(--gray-300);
   --border-medium: var(--gray-300);
   --border-heavy: var(--gray-400);
   --border-xheavy: var(--gray-500);
+  /* These are test styles */
+
+  --background: 0 0% 100%;
+  --foreground: 0 0% 3.9%;
+  --card: 0 0% 100%;
+  --card-foreground: 0 0% 3.9%;
+  --primary: 0 0% 9%;
+  --primary-foreground: 0 0% 98%;
+  --secondary: 0 0% 96.1%;
+  --secondary-foreground: 0 0% 9%;
+  --muted: 0 0% 96.1%;
+  --muted-foreground: 0 0% 45.1%;
+  --accent: 0 0% 96.1%;
+  --accent-foreground: 0 0% 9%;
+  --destructive: 0 84.2% 60.2%;
+  --destructive-foreground: 0 0% 98%;
+  --border: 0 0% 89.8%;
+  --input: 0 0% 89.8%;
+  --ring: 0 0% 3.9%;
+  --radius: 0.5rem;
+  --chart-1: 12 76% 61%;
+  --chart-2: 173 58% 39%;
+  --chart-3: 197 37% 24%;
+  --chart-4: 43 74% 66%;
+  --chart-5: 27 87% 67%;
 }
 .dark {
   --text-primary: var(--gray-100);
@@ -66,11 +92,36 @@ html {
   --surface-secondary: var(--gray-800);
   --surface-tertiary: var(--gray-700);
   --surface-tertiary-alt: var(--gray-700);
+  --surface-dialog: var(--gray-850);
   --border-light: var(--gray-700);
   --border-medium-alt: var(--gray-600);
   --border-medium: var(--gray-600);
   --border-heavy: var(--gray-500);
   --border-xheavy: var(--gray-400);
+  /* These are test styles */
+
+  --background: 0 0% 7%;
+  --foreground: 0 0% 98%;
+  --card: 0 0% 3.9%;
+  --card-foreground: 0 0% 98%;
+  --primary: 0 0% 98%;
+  --primary-foreground: 0 0% 9%;
+  --secondary: 0 0% 14.9%;
+  --secondary-foreground: 0 0% 98%;
+  --muted: 0 0% 14.9%;
+  --muted-foreground: 0 0% 63.9%;
+  --accent: 0 0% 14.9%;
+  --accent-foreground: 0 0% 98%;
+  --destructive: 0 62.8% 30.6%;
+  --destructive-foreground: 0 0% 98%;
+  --border: 0 0% 14.9%;
+  --input: 0 0% 14.9%;
+  --ring: 0 0% 83.1%;
+  --chart-1: 220 70% 50%;
+  --chart-2: 160 60% 45%;
+  --chart-3: 30 80% 55%;
+  --chart-4: 280 65% 60%;
+  --chart-5: 340 75% 55%;
 }
 .gizmo {
   --text-primary: var(--gizmo-gray-950);
@@ -1178,11 +1229,19 @@ button {
   color: rgba(64, 65, 79, var(--tw-text-opacity));
   font-size: 0.875rem;
   line-height: 1.25rem;
+  transition: all 0.1s ease-in-out;
 }
+
 .btn-neutral:hover {
   --tw-bg-opacity: 1;
   background-color: rgba(236, 236, 241, var(--tw-bg-opacity));
 }
+
+.btn-neutral:focus {
+  outline: none;
+  box-shadow: 0 0 0 2px var(--ring-primary);
+}
+
 .dark .btn-neutral {
   --tw-border-opacity: 1;
   --tw-bg-opacity: 1;
@@ -1191,10 +1250,15 @@ button {
   border-color: rgba(66, 66, 66, var(--tw-border-opacity));
   color: rgba(255, 255, 240, var(--tw-text-opacity));
 }
+
 .dark .btn-neutral:hover {
   --tw-bg-opacity: 1;
   background-color: rgba(66, 66, 66, var(--tw-bg-opacity));
 }
+
+.dark .btn-neutral:focus {
+  box-shadow: 0 0 0 2px var(--ring-primary);
+}
 .btn-small {
   padding: 0.25rem 0.5rem;
 }
@@ -1950,7 +2014,7 @@ button.scroll-convo {
 
 .prose ol > li::marker,
 .markdown ol > li::marker {
-  content: counter(list-counter) ". ";
+  content: counter(list-counter) '. ';
   color: var(--tw-prose-counters);
   font-weight: 400;
 }
@@ -1969,7 +2033,7 @@ button.scroll-convo {
 
 .prose ol ol > li::marker,
 .markdown ol ol > li::marker {
-  content: counter(list-counter-alpha, lower-alpha) ". ";
+  content: counter(list-counter-alpha, lower-alpha) '. ';
 }
 
 .prose ol ol ol,
@@ -1985,7 +2049,7 @@ button.scroll-convo {
 
 .prose ol ol ol > li::marker,
 .markdown ol ol ol > li::marker {
-  content: counter(list-counter-roman, lower-roman) ". ";
+  content: counter(list-counter-roman, lower-roman) '. ';
 }
 
 /* Unordered lists */
@@ -2275,6 +2339,27 @@ button.scroll-convo {
   line-height: inherit;
 }
 
+.tooltip {
+  z-index: 50;
+  cursor: pointer;
+  border-radius: 0.275rem;
+  background-color: var(--surface-primary);
+  padding-top: 0.25rem;
+  padding-bottom: 0.25rem;
+  padding-left: 0.5rem;
+  padding-right: 0.5rem;
+  font-size: 1rem;
+  line-height: 1.5rem;
+  color: black;
+  box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.25);
+}
+
+.tooltip:where(.dark, .dark *) {
+  background-color: var(--surface-primary);
+  color: white;
+  box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.35);
+}
+
 :focus {
   outline: none;
 }
@@ -2288,3 +2373,67 @@ button.scroll-convo {
   outline: 2px solid #fff;
   outline-offset: 2px;
 }
+
+.popover-ui {
+  z-index: 1000;
+  display: flex;
+  max-height: min(var(--popover-available-height, 300px), 300px);
+  flex-direction: column;
+  overflow: auto;
+  overscroll-behavior: contain;
+  border-radius: 1rem;
+  border-width: 1px;
+  border-style: solid;
+  border-color: var(--border-light);
+  background-color: hsl(var(--background));
+  padding: 0.5rem;
+  color: var(--text-primary);
+  box-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
+  transform-origin: top;
+  opacity: 0;
+  transition-property: opacity, scale, translate;
+  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  transition-duration: 150ms;
+  scale: 0.95;
+  translate: 0 -0.5rem;
+  margin-top: 4px;
+  margin-right: -2px;
+}
+
+.popover-ui:focus-visible,
+.popover-ui[data-focus-visible] {
+  outline: var(--bg-surface-hover);
+  outline-offset: -1px;
+}
+
+.popover-ui:where(.dark, .dark *) {
+  background-color: hsl(var(--background));
+  color: var(--text-secondary);
+  box-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.25), 0 4px 6px -4px rgb(0 0 0 / 0.1);
+}
+
+.select-item {
+  display: flex;
+  cursor: pointer;
+  scroll-margin: 0.5rem;
+  align-items: center;
+  gap: 0.5rem;
+  border-radius: 0.5rem;
+  padding: 0.5rem;
+  outline: none !important;
+}
+
+.select-item[aria-disabled='true'] {
+  opacity: 0.5;
+}
+
+.select-item[data-active-item] {
+  background-color: hsl(var(--accent));
+  color: var(--text-primary);
+}
+
+.popover-ui[data-enter] {
+  opacity: 1;
+  scale: 1;
+  translate: 0;
+}
diff --git a/client/src/utils/buildDefaultConvo.ts b/client/src/utils/buildDefaultConvo.ts
index 0f210823cbf..22728d07536 100644
--- a/client/src/utils/buildDefaultConvo.ts
+++ b/client/src/utils/buildDefaultConvo.ts
@@ -9,19 +9,17 @@ import getLocalStorageItems from './getLocalStorageItems';
 
 const buildDefaultConvo = ({
   conversation,
-  endpoint,
+  endpoint = null,
   models,
   lastConversationSetup,
 }: {
   conversation: TConversation;
-  endpoint: EModelEndpoint;
+  endpoint: EModelEndpoint | null;
   models: string[];
-  // TODO: fix this type as we should allow undefined
-  lastConversationSetup: TConversation;
-}) => {
-  const { lastSelectedModel, lastSelectedTools, lastBingSettings } = getLocalStorageItems();
-  const { jailbreak, toneStyle } = lastBingSettings;
-  const endpointType = lastConversationSetup?.endpointType ?? conversation?.endpointType;
+  lastConversationSetup: TConversation | null;
+}): TConversation => {
+  const { lastSelectedModel, lastSelectedTools } = getLocalStorageItems();
+  const endpointType = lastConversationSetup?.endpointType ?? conversation.endpointType;
 
   if (!endpoint) {
     return {
@@ -32,10 +30,10 @@ const buildDefaultConvo = ({
   }
 
   const availableModels = models;
-  const model = lastConversationSetup?.model ?? lastSelectedModel?.[endpoint];
-  const secondaryModel =
+  const model = lastConversationSetup?.model ?? lastSelectedModel?.[endpoint] ?? '';
+  const secondaryModel: string | null =
     endpoint === EModelEndpoint.gptPlugins
-      ? lastConversationSetup?.agentOptions?.model ?? lastSelectedModel?.secondaryModel
+      ? lastConversationSetup?.agentOptions?.model ?? lastSelectedModel?.secondaryModel ?? null
       : null;
 
   let possibleModels: string[], secondaryModels: string[];
@@ -46,7 +44,7 @@ const buildDefaultConvo = ({
     possibleModels = [...availableModels];
   }
 
-  if (secondaryModel && availableModels.includes(secondaryModel)) {
+  if (secondaryModel != null && secondaryModel !== '' && availableModels.includes(secondaryModel)) {
     secondaryModels = [secondaryModel, ...availableModels];
   } else {
     secondaryModels = [...availableModels];
@@ -70,18 +68,20 @@ const buildDefaultConvo = ({
   };
 
   // Ensures assistant_id is always defined
-  if (isAssistantsEndpoint(endpoint) && !defaultConvo.assistant_id && convo.assistant_id) {
-    defaultConvo.assistant_id = convo.assistant_id;
+  const assistantId = convo?.assistant_id ?? '';
+  const defaultAssistantId = lastConversationSetup?.assistant_id ?? '';
+  if (isAssistantsEndpoint(endpoint) && !defaultAssistantId && assistantId) {
+    defaultConvo.assistant_id = assistantId;
   }
 
   // Ensures agent_id is always defined
-  if (isAgentsEndpoint(endpoint) && !defaultConvo.agent_id && convo.agent_id) {
-    defaultConvo.agent_id = convo.agent_id;
+  const agentId = convo?.agent_id ?? '';
+  const defaultAgentId = lastConversationSetup?.agent_id ?? '';
+  if (isAgentsEndpoint(endpoint) && !defaultAgentId && agentId) {
+    defaultConvo.agent_id = agentId;
   }
 
   defaultConvo.tools = lastConversationSetup?.tools ?? lastSelectedTools ?? defaultConvo.tools;
-  defaultConvo.jailbreak = jailbreak ?? defaultConvo.jailbreak;
-  defaultConvo.toneStyle = toneStyle ?? defaultConvo.toneStyle;
 
   return defaultConvo;
 };
diff --git a/client/src/utils/convos.spec.ts b/client/src/utils/convos.spec.ts
index 8669dadd467..53cb0d5dada 100644
--- a/client/src/utils/convos.spec.ts
+++ b/client/src/utils/convos.spec.ts
@@ -1,4 +1,5 @@
-import { convoData } from './convos.fakeData';
+import { Constants } from 'librechat-data-provider';
+import type { TConversation, ConversationData } from 'librechat-data-provider';
 import {
   dateKeys,
   addConversation,
@@ -8,9 +9,17 @@ import {
   findPageForConversation,
   groupConversationsByDate,
 } from './convos';
-import type { TConversation, ConversationData } from 'librechat-data-provider';
+import { convoData } from './convos.fakeData';
 import { normalizeData } from './collection';
 
+jest.mock('date-fns', () => {
+  const actual = jest.requireActual('date-fns');
+  return {
+    ...actual,
+    startOfToday: jest.fn(() => new Date('2023-07-15T00:00:00Z')),
+  };
+});
+
 describe('Conversation Utilities', () => {
   describe('groupConversationsByDate', () => {
     it('groups conversations by date correctly', () => {
@@ -34,6 +43,66 @@ describe('Conversation Utilities', () => {
       expect(grouped[4][1]).toHaveLength(1);
     });
 
+    it('groups conversations correctly across multiple years', () => {
+      const fixedDate = new Date('2023-07-15T12:00:00Z');
+      const conversations = [
+        { conversationId: '1', updatedAt: '2023-07-15T10:00:00Z' }, // Today
+        { conversationId: '2', updatedAt: '2023-07-14T12:00:00Z' }, // Yesterday
+        { conversationId: '3', updatedAt: '2023-07-08T12:00:00Z' }, // This week
+        { conversationId: '4', updatedAt: '2023-07-01T12:00:00Z' }, // This month (within last 30 days)
+        { conversationId: '5', updatedAt: '2023-06-01T12:00:00Z' }, // Last month
+        { conversationId: '6', updatedAt: '2023-01-01T12:00:00Z' }, // This year, January
+        { conversationId: '7', updatedAt: '2022-12-01T12:00:00Z' }, // Last year, December
+        { conversationId: '8', updatedAt: '2022-06-01T12:00:00Z' }, // Last year, June
+        { conversationId: '9', updatedAt: '2021-12-01T12:00:00Z' }, // Two years ago
+        { conversationId: '10', updatedAt: '2020-06-01T12:00:00Z' }, // Three years ago
+      ];
+
+      // Mock Date.now
+      const originalDateNow = Date.now;
+      Date.now = jest.fn(() => fixedDate.getTime());
+
+      const grouped = groupConversationsByDate(conversations as TConversation[]);
+
+      // Restore Date.now
+      Date.now = originalDateNow;
+
+      const expectedGroups = [
+        dateKeys.today,
+        dateKeys.yesterday,
+        dateKeys.previous7Days,
+        dateKeys.previous30Days,
+        dateKeys.june,
+        dateKeys.january,
+        ' 2022',
+        ' 2021',
+        ' 2020',
+      ];
+
+      expect(grouped.map(([key]) => key)).toEqual(expectedGroups);
+
+      // Helper function to safely get group length
+      const getGroupLength = (key: string) => grouped.find(([k]) => k === key)?.[1]?.length ?? 0;
+
+      // Check specific group contents
+      expect(getGroupLength(dateKeys.today)).toBe(1);
+      expect(getGroupLength(dateKeys.yesterday)).toBe(1);
+      expect(getGroupLength(dateKeys.previous7Days)).toBe(1);
+      expect(getGroupLength(dateKeys.previous30Days)).toBe(1);
+      expect(getGroupLength(dateKeys.june)).toBe(1);
+      expect(getGroupLength(dateKeys.january)).toBe(1);
+      expect(getGroupLength(' 2022')).toBe(2); // December and June 2022
+      expect(getGroupLength(' 2021')).toBe(1);
+      expect(getGroupLength(' 2020')).toBe(1);
+
+      // Check that all conversations are accounted for
+      const totalGroupedConversations = grouped.reduce(
+        (total, [, convos]) => total + convos.length,
+        0,
+      );
+      expect(totalGroupedConversations).toBe(conversations.length);
+    });
+
     it('returns an empty array for no conversations', () => {
       expect(groupConversationsByDate([])).toEqual([]);
     });
@@ -60,18 +129,182 @@ describe('Conversation Utilities', () => {
       const uniqueIds = [...new Set(allGroupedIds)];
       expect(allGroupedIds.length).toBe(uniqueIds.length);
     });
+
+    it('sorts conversations by month correctly', () => {
+      const conversations = [
+        { conversationId: '1', updatedAt: '2023-01-01T12:00:00Z' }, // January 2023
+        { conversationId: '2', updatedAt: '2023-12-01T12:00:00Z' }, // December 2023
+        { conversationId: '3', updatedAt: '2023-02-01T12:00:00Z' }, // February 2023
+        { conversationId: '4', updatedAt: '2023-11-01T12:00:00Z' }, // November 2023
+        { conversationId: '5', updatedAt: '2022-12-01T12:00:00Z' }, // December 2022
+      ];
+
+      const grouped = groupConversationsByDate(conversations as TConversation[]);
+
+      // Check if the years are in the correct order (most recent first)
+      expect(grouped.map(([key]) => key)).toEqual([' 2023', ' 2022']);
+
+      // Check if conversations within 2023 are sorted correctly by month
+      const conversationsIn2023 = grouped[0][1];
+      const monthsIn2023 = conversationsIn2023.map((c) => new Date(c.updatedAt).getMonth());
+      expect(monthsIn2023).toEqual([11, 10, 1, 0]); // December (11), November (10), February (1), January (0)
+
+      // Check if the conversation from 2022 is in its own group
+      expect(grouped[1][1].length).toBe(1);
+      expect(new Date(grouped[1][1][0].updatedAt).getFullYear()).toBe(2022);
+    });
+
+    it('handles conversations from multiple years correctly', () => {
+      const conversations = [
+        { conversationId: '1', updatedAt: '2023-01-01T12:00:00Z' }, // January 2023
+        { conversationId: '2', updatedAt: '2022-12-01T12:00:00Z' }, // December 2022
+        { conversationId: '3', updatedAt: '2021-06-01T12:00:00Z' }, // June 2021
+        { conversationId: '4', updatedAt: '2023-06-01T12:00:00Z' }, // June 2023
+        { conversationId: '5', updatedAt: '2021-12-01T12:00:00Z' }, // December 2021
+      ];
+
+      const grouped = groupConversationsByDate(conversations as TConversation[]);
+
+      expect(grouped.map(([key]) => key)).toEqual([' 2023', ' 2022', ' 2021']);
+      expect(grouped[0][1].map((c) => new Date(c.updatedAt).getMonth())).toEqual([5, 0]); // June, January
+      expect(grouped[1][1].map((c) => new Date(c.updatedAt).getMonth())).toEqual([11]); // December
+      expect(grouped[2][1].map((c) => new Date(c.updatedAt).getMonth())).toEqual([11, 5]); // December, June
+    });
+
+    it('handles conversations from the same month correctly', () => {
+      const conversations = [
+        { conversationId: '1', updatedAt: '2023-06-01T12:00:00Z' },
+        { conversationId: '2', updatedAt: '2023-06-15T12:00:00Z' },
+        { conversationId: '3', updatedAt: '2023-06-30T12:00:00Z' },
+      ];
+
+      const grouped = groupConversationsByDate(conversations as TConversation[]);
+
+      expect(grouped.length).toBe(1);
+      expect(grouped[0][0]).toBe(' 2023');
+      expect(grouped[0][1].map((c) => c.conversationId)).toEqual(['3', '2', '1']);
+    });
+
+    it('handles conversations from today, yesterday, and previous days correctly', () => {
+      const today = new Date();
+      const yesterday = new Date(today);
+      yesterday.setDate(yesterday.getDate() - 1);
+      const twoDaysAgo = new Date(today);
+      twoDaysAgo.setDate(twoDaysAgo.getDate() - 2);
+
+      const conversations = [
+        { conversationId: '1', updatedAt: today.toISOString() },
+        { conversationId: '2', updatedAt: yesterday.toISOString() },
+        { conversationId: '3', updatedAt: twoDaysAgo.toISOString() },
+      ];
+
+      const grouped = groupConversationsByDate(conversations as TConversation[]);
+
+      expect(grouped.map(([key]) => key)).toEqual([
+        dateKeys.today,
+        dateKeys.yesterday,
+        dateKeys.previous7Days,
+      ]);
+    });
+
+    it('handles conversations with null or undefined updatedAt correctly', () => {
+      const conversations = [
+        { conversationId: '1', updatedAt: '2023-06-01T12:00:00Z' },
+        { conversationId: '2', updatedAt: null },
+        { conversationId: '3', updatedAt: undefined },
+      ];
+
+      const grouped = groupConversationsByDate(conversations as TConversation[]);
+
+      expect(grouped.length).toBe(2); // One group for 2023 and one for today (null/undefined dates)
+      expect(grouped[0][0]).toBe(dateKeys.today);
+      expect(grouped[0][1].length).toBe(2); // Two conversations with null/undefined dates
+      expect(grouped[1][0]).toBe(' 2023');
+      expect(grouped[1][1].length).toBe(1); // One conversation from 2023
+    });
+
+    it('handles an empty array of conversations', () => {
+      const grouped = groupConversationsByDate([]);
+
+      expect(grouped).toEqual([]);
+    });
+
+    it('correctly groups and sorts conversations for every month of the year', () => {
+      const months = [
+        'january',
+        'february',
+        'march',
+        'april',
+        'may',
+        'june',
+        'july',
+        'august',
+        'september',
+        'october',
+        'november',
+        'december',
+      ];
+
+      // Create conversations for each month in both 2023 and 2022
+      const conversations = months.flatMap((month, index) => [
+        {
+          conversationId: `2023-${month}`,
+          updatedAt: `2023-${String(index + 1).padStart(2, '0')}-15T12:00:00Z`,
+        },
+        {
+          conversationId: `2022-${month}`,
+          updatedAt: `2022-${String(index + 1).padStart(2, '0')}-15T12:00:00Z`,
+        },
+      ]);
+
+      const grouped = groupConversationsByDate(conversations as TConversation[]);
+
+      // Check that we have two year groups
+      expect(grouped.length).toBe(2);
+
+      // Check 2023 months
+      const group2023 = grouped.find(([key]) => key === ' 2023') ?? [];
+      expect(group2023).toBeDefined();
+      const grouped2023 = group2023[1];
+      expect(grouped2023?.length).toBe(12);
+      expect(grouped2023?.map((c) => new Date(c.updatedAt).getMonth())).toEqual([
+        11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,
+      ]);
+
+      // Check 2022 months
+      const group2022 = grouped.find(([key]) => key === ' 2022') ?? [];
+      expect(group2022).toBeDefined();
+      const grouped2022 = group2022[1];
+      expect(grouped2022?.length).toBe(12);
+      expect(grouped2022?.map((c) => new Date(c.updatedAt).getMonth())).toEqual([
+        11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,
+      ]);
+
+      // Check that all conversations are accounted for
+      const totalGroupedConversations =
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        grouped.reduce((total, [_, convos]) => total + convos.length, 0);
+      expect(totalGroupedConversations).toBe(conversations.length);
+
+      // Check that the years are in the correct order
+      const yearOrder = grouped.map(([key]) => key);
+      expect(yearOrder).toEqual([' 2023', ' 2022']);
+    });
   });
 
   describe('addConversation', () => {
     it('adds a new conversation to the top of the list', () => {
       const data = { pages: [{ conversations: [] }] };
-      const newConversation = { conversationId: 'new', updatedAt: '2023-04-02T12:00:00Z' };
+      const newConversation = {
+        conversationId: Constants.NEW_CONVO,
+        updatedAt: '2023-04-02T12:00:00Z',
+      };
       const newData = addConversation(
         data as unknown as ConversationData,
         newConversation as TConversation,
       );
       expect(newData.pages[0].conversations).toHaveLength(1);
-      expect(newData.pages[0].conversations[0].conversationId).toBe('new');
+      expect(newData.pages[0].conversations[0].conversationId).toBe(Constants.NEW_CONVO);
     });
   });
 
@@ -171,13 +404,13 @@ describe('Conversation Utilities with Fake Data', () => {
   describe('addConversation', () => {
     it('adds a new conversation to the existing fake data', () => {
       const newConversation = {
-        conversationId: 'new',
+        conversationId: Constants.NEW_CONVO,
         updatedAt: new Date().toISOString(),
       } as TConversation;
       const initialLength = convoData.pages[0].conversations.length;
       const newData = addConversation(convoData, newConversation);
       expect(newData.pages[0].conversations.length).toBe(initialLength + 1);
-      expect(newData.pages[0].conversations[0].conversationId).toBe('new');
+      expect(newData.pages[0].conversations[0].conversationId).toBe(Constants.NEW_CONVO);
     });
   });
 
diff --git a/client/src/utils/convos.ts b/client/src/utils/convos.ts
index 4b6b05cdd68..3f11bcbe7cc 100644
--- a/client/src/utils/convos.ts
+++ b/client/src/utils/convos.ts
@@ -6,7 +6,6 @@ import {
   parseISO,
   startOfDay,
   startOfYear,
-  startOfToday,
   isWithinInterval,
 } from 'date-fns';
 import { EModelEndpoint, LocalStorageKeys } from 'librechat-data-provider';
@@ -40,7 +39,7 @@ export const dateKeys = {
 };
 
 const getGroupName = (date: Date) => {
-  const now = new Date();
+  const now = new Date(Date.now());
   if (isToday(date)) {
     return dateKeys.today;
   }
@@ -60,6 +59,32 @@ const getGroupName = (date: Date) => {
   return ' ' + getYear(date).toString();
 };
 
+const monthOrderMap = new Map([
+  ['december', 11],
+  ['november', 10],
+  ['october', 9],
+  ['september', 8],
+  ['august', 7],
+  ['july', 6],
+  ['june', 5],
+  ['may', 4],
+  ['april', 3],
+  ['march', 2],
+  ['february', 1],
+  ['january', 0],
+]);
+
+const dateKeysReverse = Object.fromEntries(
+  Object.entries(dateKeys).map(([key, value]) => [value, key]),
+);
+
+const dateGroupsSet = new Set([
+  dateKeys.today,
+  dateKeys.yesterday,
+  dateKeys.previous7Days,
+  dateKeys.previous30Days,
+]);
+
 export const groupConversationsByDate = (
   conversations: Array<TConversation | null>,
 ): GroupedConversations => {
@@ -68,47 +93,66 @@ export const groupConversationsByDate = (
   }
 
   const seenConversationIds = new Set();
-  const groups = conversations.reduce((acc, conversation) => {
-    if (!conversation) {
-      return acc;
-    }
+  const groups = new Map();
+  const now = new Date(Date.now());
 
-    if (seenConversationIds.has(conversation.conversationId)) {
-      return acc;
+  conversations.forEach((conversation) => {
+    if (!conversation || seenConversationIds.has(conversation.conversationId)) {
+      return;
     }
     seenConversationIds.add(conversation.conversationId);
 
-    const date = conversation.updatedAt ? parseISO(conversation.updatedAt) : startOfToday();
+    let date: Date;
+    if (conversation.updatedAt) {
+      date = parseISO(conversation.updatedAt);
+    } else {
+      date = now;
+    }
+
     const groupName = getGroupName(date);
-    if (!acc[groupName]) {
-      acc[groupName] = [];
+    if (!groups.has(groupName)) {
+      groups.set(groupName, []);
     }
-    acc[groupName].push(conversation);
-    return acc;
-  }, {});
-
-  const sortedGroups = {};
-  const dateGroups = [
-    dateKeys.today,
-    dateKeys.yesterday,
-    dateKeys.previous7Days,
-    dateKeys.previous30Days,
-  ];
-  dateGroups.forEach((group) => {
-    if (groups[group]) {
-      sortedGroups[group] = groups[group];
+    groups.get(groupName).push(conversation);
+  });
+
+  const sortedGroups = new Map();
+
+  // Add date groups first
+  dateGroupsSet.forEach((group) => {
+    if (groups.has(group)) {
+      sortedGroups.set(group, groups.get(group));
     }
   });
 
-  Object.keys(groups)
-    .filter((group) => !dateGroups.includes(group))
-    .sort()
-    .reverse()
-    .forEach((year) => {
-      sortedGroups[year] = groups[year];
+  // Sort and add year/month groups
+  const yearMonthGroups = Array.from(groups.keys())
+    .filter((group) => !dateGroupsSet.has(group))
+    .sort((a, b) => {
+      const [yearA, yearB] = [parseInt(a.trim()), parseInt(b.trim())];
+      if (yearA !== yearB) {
+        return yearB - yearA;
+      }
+
+      const [monthA, monthB] = [dateKeysReverse[a], dateKeysReverse[b]];
+      const bOrder = monthOrderMap.get(monthB) ?? -1;
+      const aOrder = monthOrderMap.get(monthA) ?? -1;
+      return bOrder - aOrder;
     });
 
-  return Object.entries(sortedGroups);
+  yearMonthGroups.forEach((group) => {
+    sortedGroups.set(group, groups.get(group));
+  });
+
+  // Sort conversations within each group
+  sortedGroups.forEach((conversations) => {
+    conversations.sort(
+      (a: TConversation, b: TConversation) =>
+        new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime(),
+    );
+  });
+
+  return Array.from(sortedGroups, ([key, value]) => [key, value]);
 };
 
 export const addConversation = (
@@ -195,7 +239,7 @@ export const getConversationById = (
   data: ConversationData | undefined,
   conversationId: string | null,
 ): TConversation | undefined => {
-  if (!data || !conversationId) {
+  if (!data || !(conversationId ?? '')) {
     return undefined;
   }
 
@@ -224,11 +268,11 @@ export function storeEndpointSettings(conversation: TConversation | null) {
     return;
   }
 
-  const lastModel = JSON.parse(localStorage.getItem(LocalStorageKeys.LAST_MODEL) || '{}');
+  const lastModel = JSON.parse(localStorage.getItem(LocalStorageKeys.LAST_MODEL) ?? '{}');
   lastModel[endpoint] = model;
 
   if (endpoint === EModelEndpoint.gptPlugins) {
-    lastModel.secondaryModel = agentOptions?.model || model || '';
+    lastModel.secondaryModel = agentOptions?.model ?? model ?? '';
   }
 
   localStorage.setItem(LocalStorageKeys.LAST_MODEL, JSON.stringify(lastModel));
diff --git a/client/src/utils/forms.ts b/client/src/utils/forms.tsx
similarity index 79%
rename from client/src/utils/forms.ts
rename to client/src/utils/forms.tsx
index 0362f576ed0..2447a234dd8 100644
--- a/client/src/utils/forms.ts
+++ b/client/src/utils/forms.tsx
@@ -1,3 +1,4 @@
+import { EarthIcon } from 'lucide-react';
 import { alternateName } from 'librechat-data-provider';
 import type { Agent, TFile } from 'librechat-data-provider';
 import type { DropdownValueSetter, TAgentOption } from '~/common';
@@ -39,14 +40,22 @@ export const createProviderOption = (provider: string) => ({
 type FileTuple = [string, Partial<TFile>];
 type FileList = Array<FileTuple>;
 
-export const processAgentOption = (
-  _agent?: Agent,
-  fileMap?: Record<string, TFile>,
-): TAgentOption => {
+export const processAgentOption = ({
+  agent: _agent,
+  fileMap,
+  instanceProjectId,
+}: {
+  agent?: Agent;
+  fileMap?: Record<string, TFile | undefined>;
+  instanceProjectId?: string;
+}): TAgentOption => {
+  const isGlobal =
+    (instanceProjectId != null && _agent?.projectIds?.includes(instanceProjectId)) ?? false;
   const agent: TAgentOption = {
     ...(_agent ?? ({} as Agent)),
     label: _agent?.name ?? '',
     value: _agent?.id ?? '',
+    icon: isGlobal ? <EarthIcon className="icon-md text-green-400" /> : null,
     // files: _agent?.file_ids ? ([] as FileList) : undefined,
     // code_files: _agent?.tool_resources?.code_interpreter?.file_ids
     //   ? ([] as FileList)
@@ -58,7 +67,7 @@ export const processAgentOption = (
   }
 
   const handleFile = (file_id: string, list?: FileList) => {
-    const file = fileMap?.[file_id];
+    const file = fileMap[file_id];
     if (file) {
       list?.push([file_id, file]);
     } else {
@@ -82,7 +91,7 @@ export const processAgentOption = (
   }
 
   if (agent.code_files && _agent?.tool_resources?.code_interpreter?.file_ids) {
-    _agent.tool_resources?.code_interpreter?.file_ids?.forEach((file_id) =>
+    _agent.tool_resources.code_interpreter.file_ids.forEach((file_id) =>
       handleFile(file_id, agent.code_files),
     );
   }
diff --git a/client/src/utils/getLocalStorageItems.ts b/client/src/utils/getLocalStorageItems.ts
index f189d0d9c92..dd7177955be 100644
--- a/client/src/utils/getLocalStorageItems.ts
+++ b/client/src/utils/getLocalStorageItems.ts
@@ -1,24 +1,25 @@
-import { LocalStorageKeys } from 'librechat-data-provider';
+import { LocalStorageKeys, TConversation } from 'librechat-data-provider';
 
 export default function getLocalStorageItems() {
   const items = {
-    lastSelectedModel: localStorage.getItem(LocalStorageKeys.LAST_MODEL),
-    lastSelectedTools: localStorage.getItem(LocalStorageKeys.LAST_TOOLS),
-    lastBingSettings: localStorage.getItem(LocalStorageKeys.LAST_BING),
-    lastConversationSetup: localStorage.getItem(LocalStorageKeys.LAST_CONVO_SETUP + '_0'),
+    lastSelectedModel: localStorage.getItem(LocalStorageKeys.LAST_MODEL) ?? '',
+    lastSelectedTools: localStorage.getItem(LocalStorageKeys.LAST_TOOLS) ?? '',
+    lastConversationSetup: localStorage.getItem(LocalStorageKeys.LAST_CONVO_SETUP + '_0') ?? '',
   };
 
-  const lastSelectedModel = items.lastSelectedModel ? JSON.parse(items.lastSelectedModel) : {};
-  const lastSelectedTools = items.lastSelectedTools ? JSON.parse(items.lastSelectedTools) : [];
-  const lastBingSettings = items.lastBingSettings ? JSON.parse(items.lastBingSettings) : {};
+  const lastSelectedModel = items.lastSelectedModel
+    ? (JSON.parse(items.lastSelectedModel) as Record<string, string | undefined> | null)
+    : {};
+  const lastSelectedTools = items.lastSelectedTools
+    ? (JSON.parse(items.lastSelectedTools) as string[] | null)
+    : [];
   const lastConversationSetup = items.lastConversationSetup
-    ? JSON.parse(items.lastConversationSetup)
+    ? (JSON.parse(items.lastConversationSetup) as Partial<TConversation> | null)
     : {};
 
   return {
     lastSelectedModel,
     lastSelectedTools,
-    lastBingSettings,
     lastConversationSetup,
   };
 }
diff --git a/client/src/utils/messages.ts b/client/src/utils/messages.ts
index d2d7ffe08eb..507618a2c73 100644
--- a/client/src/utils/messages.ts
+++ b/client/src/utils/messages.ts
@@ -11,7 +11,7 @@ export const getLengthAndLastTenChars = (str?: string): string => {
   return `${length}${lastTenChars}`;
 };
 
-export const getLatestText = (message?: TMessage | null, includeIndex?: boolean) => {
+export const getLatestText = (message?: TMessage | null, includeIndex?: boolean): string => {
   if (!message) {
     return '';
   }
@@ -21,11 +21,12 @@ export const getLatestText = (message?: TMessage | null, includeIndex?: boolean)
   if (message.content && message.content.length > 0) {
     for (let i = message.content.length - 1; i >= 0; i--) {
       const part = message.content[i];
-      if (
-        part.type === ContentTypes.TEXT &&
-        ((part[ContentTypes.TEXT].value as string | undefined)?.length ?? 0) > 0
-      ) {
-        const text = part[ContentTypes.TEXT].value;
+      if (part.type !== ContentTypes.TEXT) {
+        continue;
+      }
+
+      const text = (typeof part.text === 'string' ? part.text : part.text.value) || '';
+      if (text.length > 0) {
         if (includeIndex === true) {
           return `${text}-${i}`;
         } else {
@@ -39,6 +40,26 @@ export const getLatestText = (message?: TMessage | null, includeIndex?: boolean)
   return '';
 };
 
+export const getAllContentText = (message?: TMessage | null): string => {
+  if (!message) {
+    return '';
+  }
+
+  if (message.text) {
+    return message.text;
+  }
+
+  if (message.content && message.content.length > 0) {
+    return message.content
+      .filter((part) => part.type === ContentTypes.TEXT)
+      .map((part) => (typeof part.text === 'string' ? part.text : part.text.value) ?? '')
+      .filter((text) => text.length > 0)
+      .join('\n');
+  }
+
+  return '';
+};
+
 export const getTextKey = (message?: TMessage | null, convoId?: string | null) => {
   if (!message) {
     return '';
diff --git a/client/tailwind.config.cjs b/client/tailwind.config.cjs
index 1e51b989277..dcd59b97170 100644
--- a/client/tailwind.config.cjs
+++ b/client/tailwind.config.cjs
@@ -77,11 +77,47 @@ module.exports = {
         'surface-secondary': 'var(--surface-secondary)',
         'surface-tertiary': 'var(--surface-tertiary)',
         'surface-tertiary-alt': 'var(--surface-tertiary-alt)',
+        'surface-dialog': 'var(--surface-dialog)',
         'border-light': 'var(--border-light)',
         'border-medium': 'var(--border-medium)',
         'border-medium-alt': 'var(--border-medium-alt)',
         'border-heavy': 'var(--border-heavy)',
         'border-xheavy': 'var(--border-xheavy)',
+        /* These are test styles */
+        border: 'hsl(var(--border))',
+        input: 'hsl(var(--input))',
+        ring: 'hsl(var(--ring))',
+        background: 'hsl(var(--background))',
+        foreground: 'hsl(var(--foreground))',
+        primary: {
+          DEFAULT: 'hsl(var(--primary))',
+          foreground: 'hsl(var(--primary-foreground))',
+        },
+        secondary: {
+          DEFAULT: 'hsl(var(--secondary))',
+          foreground: 'hsl(var(--secondary-foreground))',
+        },
+        destructive: {
+          DEFAULT: 'hsl(var(--destructive))',
+          foreground: 'hsl(var(--destructive-foreground))',
+        },
+        muted: {
+          DEFAULT: 'hsl(var(--muted))',
+          foreground: 'hsl(var(--muted-foreground))',
+        },
+        accent: {
+          DEFAULT: 'hsl(var(--accent))',
+          foreground: 'hsl(var(--accent-foreground))',
+        },
+        card: {
+          DEFAULT: 'hsl(var(--card))',
+          foreground: 'hsl(var(--card-foreground))',
+        },
+      },
+      borderRadius: {
+        lg: 'var(--radius)',
+        md: 'calc(var(--radius) - 2px)',
+        sm: 'calc(var(--radius) - 4px)',
       },
     },
   },
diff --git a/config/delete-banner.js b/config/delete-banner.js
new file mode 100644
index 00000000000..efb89f34188
--- /dev/null
+++ b/config/delete-banner.js
@@ -0,0 +1,61 @@
+const path = require('path');
+require('module-alias')({ base: path.resolve(__dirname, '..', 'api') });
+const { askQuestion, silentExit } = require('./helpers');
+const Banner = require('~/models/schema/banner');
+const connect = require('./connect');
+
+(async () => {
+  await connect();
+
+  console.purple('--------------------------');
+  console.purple('Delete the banner!');
+  console.purple('--------------------------');
+
+  const now = new Date();
+
+  try {
+    const banner = await Banner.findOne({
+      displayFrom: { $lte: now },
+      $or: [{ displayTo: { $gte: now } }, { displayTo: null }],
+    });
+
+    if (!banner) {
+      console.yellow('No banner found to delete.');
+      silentExit(0);
+    }
+
+    console.purple('Current banner:');
+    console.log(`Message: ${banner.message}`);
+    console.log(`Display From: ${banner.displayFrom}`);
+    console.log(`Display To: ${banner.displayTo || 'Not specified'}`);
+    console.log(`Is Public: ${banner.isPublic}`);
+
+    const confirmDelete = await askQuestion('Do you want to delete this banner? (y/N): ');
+
+    if (confirmDelete.toLowerCase() === 'y') {
+      await Banner.findByIdAndDelete(banner._id);
+      console.green('Banner deleted successfully!');
+    } else {
+      console.yellow('Banner deletion cancelled.');
+    }
+  } catch (error) {
+    console.red('Error: ' + error.message);
+    console.error(error);
+    silentExit(1);
+  }
+
+  silentExit(0);
+})();
+
+process.on('uncaughtException', (err) => {
+  if (!err.message.includes('fetch failed')) {
+    console.error('There was an uncaught error:');
+    console.error(err);
+  }
+
+  if (err.message.includes('fetch failed')) {
+    return;
+  } else {
+    process.exit(1);
+  }
+});
diff --git a/config/helpers.js b/config/helpers.js
index 6bc6ed0ef2a..d7d679a5a53 100644
--- a/config/helpers.js
+++ b/config/helpers.js
@@ -21,6 +21,27 @@ const askQuestion = (query) => {
   );
 };
 
+const askMultiLineQuestion = (query) => {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+
+  console.cyan(query);
+
+  return new Promise((resolve) => {
+    let lines = [];
+    rl.on('line', (line) => {
+      if (line.trim() === '.') {
+        rl.close();
+        resolve(lines.join('\n'));
+      } else {
+        lines.push(line);
+      }
+    });
+  });
+};
+
 function isDockerRunning() {
   try {
     execSync('docker info');
@@ -56,6 +77,7 @@ console.gray = (msg) => console.log('\x1b[90m%s\x1b[0m', msg);
 
 module.exports = {
   askQuestion,
+  askMultiLineQuestion,
   silentExit,
   isDockerRunning,
   deleteNodeModules,
diff --git a/config/update-banner.js b/config/update-banner.js
new file mode 100644
index 00000000000..4640230bc2b
--- /dev/null
+++ b/config/update-banner.js
@@ -0,0 +1,147 @@
+const path = require('path');
+const { v5: uuidv5 } = require('uuid');
+require('module-alias')({ base: path.resolve(__dirname, '..', 'api') });
+const { askQuestion, askMultiLineQuestion, silentExit } = require('./helpers');
+const Banner = require('~/models/schema/banner');
+const connect = require('./connect');
+
+(async () => {
+  await connect();
+
+  /**
+   * Show the welcome / help menu
+   */
+  console.purple('--------------------------');
+  console.purple('Update the banner!');
+  console.purple('--------------------------');
+  /**
+   * Set up the variables we need and get the arguments if they were passed in
+   */
+  let displayFrom = '';
+  let displayTo = '';
+  let message = '';
+  let isPublic = undefined;
+  // If we have the right number of arguments, lets use them
+  if (process.argv.length >= 3) {
+    displayFrom = process.argv[2];
+    displayTo = process.argv[3];
+    message = process.argv[4];
+    isPublic = process.argv[5] === undefined ? undefined : process.argv[5] === 'true';
+  } else {
+    console.orange(
+      'Usage: npm run update-banner <displayFrom(Format: yyyy-mm-ddTHH:MM:SSZ)> <displayTo(Format: yyyy-mm-ddTHH:MM:SSZ)> <message> <isPublic(true/false)>',
+    );
+    console.orange('Note: if you do not pass in the arguments, you will be prompted for them.');
+    console.purple('--------------------------');
+  }
+
+  /**
+   * If we don't have the right number of arguments, lets prompt the user for them
+   */
+  if (!displayFrom) {
+    displayFrom = await askQuestion('Display From (Format: yyyy-mm-ddTHH:MM:SSZ, Default: now):');
+  }
+
+  // Validate the displayFrom format (ISO 8601)
+  const dateTimeRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$/;
+  if (displayFrom && !dateTimeRegex.test(displayFrom)) {
+    console.red('Error: Invalid date format for displayFrom. Please use yyyy-mm-ddTHH:MM:SSZ.');
+    silentExit(1);
+  }
+
+  displayFrom = displayFrom ? new Date(displayFrom) : new Date();
+
+  if (!displayTo) {
+    displayTo = await askQuestion(
+      'Display To (Format: yyyy-mm-ddTHH:MM:SSZ, Default: not specified):',
+    );
+  }
+
+  if (displayTo && !dateTimeRegex.test(displayTo)) {
+    console.red('Error: Invalid date format for displayTo. Please use yyyy-mm-ddTHH:MM:SSZ.');
+    silentExit(1);
+  }
+
+  displayTo = displayTo ? new Date(displayTo) : null;
+
+  if (!message) {
+    message = await askMultiLineQuestion(
+      'Enter your message ((Enter a single dot "." on a new line to finish)):',
+    );
+  }
+
+  if (message.trim() === '') {
+    console.red('Error: Message cannot be empty!');
+    silentExit(1);
+  }
+
+  if (isPublic === undefined) {
+    const isPublicInput = await askQuestion('Is public (y/N):');
+    isPublic = isPublicInput.toLowerCase() === 'y' ? true : false;
+  }
+
+  // Generate the same bannerId for the same message
+  // This allows us to display only messages that haven't been shown yet
+  const NAMESPACE = '6ba7b810-9dad-11d1-80b4-00c04fd430c8'; // Use an arbitrary namespace UUID
+  const bannerId = uuidv5(message, NAMESPACE);
+
+  let result;
+  try {
+    // There is always only one Banner record in the DB.
+    // If a Banner exists in the DB, it will be updated.
+    // If it doesn't exist, a new one will be added.
+    const existingBanner = await Banner.findOne();
+    if (existingBanner) {
+      result = await Banner.findByIdAndUpdate(
+        existingBanner._id,
+        {
+          displayFrom,
+          displayTo,
+          message,
+          bannerId,
+          isPublic,
+        },
+        { new: true },
+      );
+    } else {
+      result = await Banner.create({
+        displayFrom,
+        displayTo,
+        message,
+        bannerId,
+        isPublic,
+      });
+    }
+  } catch (error) {
+    console.red('Error: ' + error.message);
+    console.error(error);
+    silentExit(1);
+  }
+
+  if (!result) {
+    console.red('Error: Something went wrong while updating the banner!');
+    console.error(result);
+    silentExit(1);
+  }
+
+  console.green('Banner updated successfully!');
+  console.purple(`bannerId: ${bannerId}`);
+  console.purple(`from: ${displayFrom}`);
+  console.purple(`to: ${displayTo || 'not specified'}`);
+  console.purple(`Banner: ${message}`);
+  console.purple(`isPublic: ${isPublic}`);
+  silentExit(0);
+})();
+
+process.on('uncaughtException', (err) => {
+  if (!err.message.includes('fetch failed')) {
+    console.error('There was an uncaught error:');
+    console.error(err);
+  }
+
+  if (err.message.includes('fetch failed')) {
+    return;
+  } else {
+    process.exit(1);
+  }
+});
diff --git a/e2e/jestSetup.js b/e2e/jestSetup.js
index 35a507d11e8..b6dcd1372f5 100644
--- a/e2e/jestSetup.js
+++ b/e2e/jestSetup.js
@@ -1,3 +1,3 @@
-// v0.7.5-rc1
+// v0.7.5-rc2
 // See .env.test.example for an example of the '.env.test' file.
 require('dotenv').config({ path: './e2e/.env.test' });
diff --git a/index.html b/index.html
index f3ad2350128..85632906cc2 100644
--- a/index.html
+++ b/index.html
@@ -1,4 +1,4 @@
-<!-- v0.7.5-rc1 -->
+<!-- v0.7.5-rc2 -->
 <!DOCTYPE html>
 <html>
 
diff --git a/package-lock.json b/package-lock.json
index ab752abba30..d499651c1aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "LibreChat",
-  "version": "v0.7.5-rc1",
+  "version": "v0.7.5-rc2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "LibreChat",
-      "version": "v0.7.5-rc1",
+      "version": "v0.7.5-rc2",
       "license": "ISC",
       "workspaces": [
         "api",
@@ -31,7 +31,7 @@
         "eslint-plugin-react-hooks": "^4.6.0",
         "husky": "^8.0.0",
         "jest": "^29.5.0",
-        "lint-staged": "^13.2.2",
+        "lint-staged": "^15.2.10",
         "prettier": "^2.8.8",
         "prettier-eslint": "^15.0.1",
         "prettier-eslint-cli": "^7.1.0",
@@ -40,7 +40,7 @@
     },
     "api": {
       "name": "@librechat/backend",
-      "version": "v0.7.5-rc1",
+      "version": "v0.7.5-rc2",
       "license": "ISC",
       "dependencies": {
         "@anthropic-ai/sdk": "^0.16.1",
@@ -52,8 +52,8 @@
         "@langchain/core": "^0.2.18",
         "@langchain/google-genai": "^0.0.11",
         "@langchain/google-vertexai": "^0.0.17",
-        "@librechat/agents": "^1.4.1",
-        "axios": "^1.3.4",
+        "@librechat/agents": "^1.5.2",
+        "axios": "^1.7.7",
         "bcryptjs": "^2.4.3",
         "cheerio": "^1.0.0-rc.12",
         "cohere-ai": "^7.9.1",
@@ -64,7 +64,7 @@
         "cors": "^2.8.5",
         "dedent": "^1.5.3",
         "dotenv": "^16.0.3",
-        "express": "^4.18.2",
+        "express": "^4.21.0",
         "express-mongo-sanitize": "^2.2.0",
         "express-rate-limit": "^6.9.0",
         "express-session": "^1.17.3",
@@ -85,11 +85,11 @@
         "meilisearch": "^0.38.0",
         "mime": "^3.0.0",
         "module-alias": "^2.2.3",
-        "mongoose": "^7.1.1",
+        "mongoose": "^7.3.3",
         "multer": "^1.4.5-lts.1",
         "nanoid": "^3.3.7",
         "nodejs-gpt": "^1.37.4",
-        "nodemailer": "^6.9.4",
+        "nodemailer": "^6.9.15",
         "ollama": "^0.5.0",
         "openai": "^4.47.1",
         "openai-chat-tokens": "^0.2.8",
@@ -110,7 +110,6 @@
         "ua-parser-js": "^1.0.36",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^4.7.1",
-        "ws": "^8.17.0",
         "zod": "^3.22.4"
       },
       "devDependencies": {
@@ -1220,10 +1219,10 @@
     },
     "client": {
       "name": "@librechat/frontend",
-      "version": "v0.7.5-rc1",
+      "version": "v0.7.5-rc2",
       "license": "ISC",
       "dependencies": {
-        "@ariakit/react": "^0.4.8",
+        "@ariakit/react": "^0.4.11",
         "@codesandbox/sandpack-react": "^2.18.2",
         "@dicebear/collection": "^7.0.4",
         "@dicebear/core": "^7.0.4",
@@ -1249,7 +1248,7 @@
         "@tanstack/react-query": "^4.28.0",
         "@tanstack/react-table": "^8.11.7",
         "@zattoo/use-double-click": "1.2.0",
-        "axios": "^1.3.4",
+        "axios": "^1.7.7",
         "class-variance-authority": "^0.6.0",
         "clsx": "^1.2.1",
         "copy-to-clipboard": "^3.3.3",
@@ -1258,6 +1257,7 @@
         "downloadjs": "^1.4.7",
         "export-from-json": "^1.7.2",
         "filenamify": "^6.0.0",
+        "framer-motion": "^11.5.4",
         "html-to-image": "^1.11.11",
         "image-blob-reduce": "^4.1.0",
         "js-cookie": "^3.0.5",
@@ -1398,16 +1398,18 @@
       }
     },
     "node_modules/@ariakit/core": {
-      "version": "0.4.8",
-      "resolved": "https://registry.npmjs.org/@ariakit/core/-/core-0.4.8.tgz",
-      "integrity": "sha512-HQS+9CI7pMqqVlAt5bPGenT0/e65UxXY+PKtgU7Y+0UToBDBRolO5S9+UUSDm8OmJHSnq24owEGm1Mv28l5XCQ=="
+      "version": "0.4.10",
+      "resolved": "https://registry.npmjs.org/@ariakit/core/-/core-0.4.10.tgz",
+      "integrity": "sha512-mX3EabQbfVh5uTjsTJ3+gjj7KGdTNhIN0qZHJd5Z2iPUnKl9NBy23Lgu6PEskpVsKAZ3proirjguD7U9fKMs/A==",
+      "license": "MIT"
     },
     "node_modules/@ariakit/react": {
-      "version": "0.4.8",
-      "resolved": "https://registry.npmjs.org/@ariakit/react/-/react-0.4.8.tgz",
-      "integrity": "sha512-Bb1vOrp0X52hxi1wE9TEHjjZ/Y08tVq2ZH+RFDwRQB3g04uVwrrhnTccHepC6rsObrDpAOV3/YlJCi4k/lSUaQ==",
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/@ariakit/react/-/react-0.4.11.tgz",
+      "integrity": "sha512-nLpPrmNcspqNhk4o+epsgeZfP1+Fkh4uIzNe5yrFkXolRkqHGKAxl4Hi82e0yxIBUbYbZIEwsZQQVceF1L6xrw==",
+      "license": "MIT",
       "dependencies": {
-        "@ariakit/react-core": "0.4.8"
+        "@ariakit/react-core": "0.4.11"
       },
       "funding": {
         "type": "opencollective",
@@ -1419,11 +1421,12 @@
       }
     },
     "node_modules/@ariakit/react-core": {
-      "version": "0.4.8",
-      "resolved": "https://registry.npmjs.org/@ariakit/react-core/-/react-core-0.4.8.tgz",
-      "integrity": "sha512-TzsddUWQwWYhrEVWHA/Gf7KCGx8rwFohAHfuljjqidKeZi2kUmuRAImCTG9oga34FWHFf4AdXQbBKclMNt0nrQ==",
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/@ariakit/react-core/-/react-core-0.4.11.tgz",
+      "integrity": "sha512-i6KedWhjZkNC7tMEKO0eNjjq2HRPiHyGaBS2x2VaWwzBepoYtjyvxRXyqLJ3gaiNdlwckN1TZsRDfD+viy13IQ==",
+      "license": "MIT",
       "dependencies": {
-        "@ariakit/core": "0.4.8",
+        "@ariakit/core": "0.4.10",
         "@floating-ui/dom": "^1.0.0",
         "use-sync-external-store": "^1.2.0"
       },
@@ -7584,9 +7587,9 @@
       "integrity": "sha512-941kjlHjfI97l6NuH/AwuXV4mHuVnRooDcHNSlzi98hz+4ug3wT4gJcWjSwSZHqeGAEn90lC9sFD+8a9d5Jvxg=="
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
-      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
       "cpu": [
         "ppc64"
       ],
@@ -7600,9 +7603,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
-      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
       "cpu": [
         "arm"
       ],
@@ -7616,9 +7619,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
-      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
       "cpu": [
         "arm64"
       ],
@@ -7632,9 +7635,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
-      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
       "cpu": [
         "x64"
       ],
@@ -7648,9 +7651,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
-      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
       "cpu": [
         "arm64"
       ],
@@ -7664,9 +7667,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
-      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
       "cpu": [
         "x64"
       ],
@@ -7680,9 +7683,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
-      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
       "cpu": [
         "arm64"
       ],
@@ -7696,9 +7699,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
-      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
       "cpu": [
         "x64"
       ],
@@ -7712,9 +7715,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
-      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
       "cpu": [
         "arm"
       ],
@@ -7728,9 +7731,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
-      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
       "cpu": [
         "arm64"
       ],
@@ -7744,9 +7747,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
-      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
       "cpu": [
         "ia32"
       ],
@@ -7760,9 +7763,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
-      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
       "cpu": [
         "loong64"
       ],
@@ -7776,9 +7779,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
-      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
       "cpu": [
         "mips64el"
       ],
@@ -7792,9 +7795,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
-      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
       "cpu": [
         "ppc64"
       ],
@@ -7808,9 +7811,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
-      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
       "cpu": [
         "riscv64"
       ],
@@ -7824,9 +7827,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
-      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
       "cpu": [
         "s390x"
       ],
@@ -7840,9 +7843,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
-      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
       "cpu": [
         "x64"
       ],
@@ -7856,9 +7859,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
       "cpu": [
         "x64"
       ],
@@ -7872,9 +7875,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
       "cpu": [
         "x64"
       ],
@@ -7888,9 +7891,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
-      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
       "cpu": [
         "x64"
       ],
@@ -7904,9 +7907,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
-      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
       "cpu": [
         "arm64"
       ],
@@ -7920,9 +7923,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
-      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
       "cpu": [
         "ia32"
       ],
@@ -7936,9 +7939,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
-      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
       "cpu": [
         "x64"
       ],
@@ -8084,12 +8087,13 @@
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.1.tgz",
-      "integrity": "sha512-iA8qE43/H5iGozC3W0YSnVSW42Vh522yyM1gj+BqRwVsTNOyr231PsXDaV04yT39PsO0QL2QpbI/M0ZaLUQgRQ==",
+      "version": "1.6.11",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.11.tgz",
+      "integrity": "sha512-qkMCxSR24v2vGkhYDo/UzxfJN3D4syqSjyuTFz6C7XcpU1pASPRieNI0Kj5VP3/503mOfYiGY891ugBX1GlABQ==",
+      "license": "MIT",
       "dependencies": {
         "@floating-ui/core": "^1.6.0",
-        "@floating-ui/utils": "^0.2.1"
+        "@floating-ui/utils": "^0.2.8"
       }
     },
     "node_modules/@floating-ui/react": {
@@ -8121,9 +8125,9 @@
       }
     },
     "node_modules/@floating-ui/utils": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.4.tgz",
-      "integrity": "sha512-dWO2pw8hhi+WrXq1YJy2yCuWoL20PddgGaqTgVe4cOS9Q6qklXCiA1tJEqX6BEwRNSCP84/afac9hd4MS+zEUA==",
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz",
+      "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==",
       "license": "MIT"
     },
     "node_modules/@google/generative-ai": {
@@ -8960,15 +8964,16 @@
       }
     },
     "node_modules/@langchain/aws": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/@langchain/aws/-/aws-0.0.6.tgz",
-      "integrity": "sha512-Shc64LB2eRbcDAg5wzBvrWB99QRdS+jZ3RE2epLs0f6lfo0IIdLmcM8MLQOB8Y7Yfn2XAlujpdpX2pX3D2G8Bw==",
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/@langchain/aws/-/aws-0.0.10.tgz",
+      "integrity": "sha512-q9sL34lq2UpSVDBTNixy2+DJbjd5RSlCGBoatVeWpfMDv2J47sJZlfVGfXLidFZhQox6uL1GyQJoKrIb+Cu97Q==",
       "dependencies": {
         "@aws-sdk/client-bedrock-agent-runtime": "^3.616.0",
         "@aws-sdk/client-bedrock-runtime": "^3.602.0",
         "@aws-sdk/client-kendra": "^3.352.0",
         "@aws-sdk/credential-provider-node": "^3.600.0",
-        "@langchain/core": ">=0.2.16 <0.3.0",
+        "@langchain/core": ">=0.2.21 <0.3.0",
+        "zod": "^3.23.8",
         "zod-to-json-schema": "^3.22.5"
       },
       "engines": {
@@ -10014,17 +10019,17 @@
       }
     },
     "node_modules/@librechat/agents": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@librechat/agents/-/agents-1.4.1.tgz",
-      "integrity": "sha512-i8FEiIUal570rbBQ5G7WRjpxd6JwSnYMif/VkfVQkMxx/6ln8gULdbzh6q0zwvUGcHp90Rv4e+Ve9C2dtNk2Ww==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@librechat/agents/-/agents-1.5.2.tgz",
+      "integrity": "sha512-mPBmzzidqTxsQ2nCNgPEqZnNzHKY6QvAr6mF+MTjsME/qQbqN+PjGUSQTCcvEKa3ClQK8yrZl8nNELFq9Ghv/w==",
       "dependencies": {
         "@aws-crypto/sha256-js": "^5.2.0",
         "@aws-sdk/credential-provider-node": "^3.613.0",
         "@aws-sdk/types": "^3.609.0",
-        "@langchain/anthropic": "^0.2.14",
-        "@langchain/aws": "^0.0.6",
+        "@langchain/anthropic": "^0.2.15",
+        "@langchain/aws": "^0.0.10",
         "@langchain/community": "^0.2.20",
-        "@langchain/core": "^0.2.18",
+        "@langchain/core": "^0.2.31",
         "@langchain/google-vertexai": "^0.0.20",
         "@langchain/langgraph": "^0.0.31",
         "@langchain/mistralai": "^0.0.26",
@@ -10034,7 +10039,7 @@
         "@smithy/util-utf8": "^2.0.0",
         "dotenv": "^16.4.5",
         "langchain": "^0.2.10",
-        "nanoid": "^3.3.4"
+        "nanoid": "^3.3.7"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -13260,9 +13265,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.14.1.tgz",
-      "integrity": "sha512-fH8/o8nSUek8ceQnT7K4EQbSiV7jgkHq81m9lWZFIXjJ7lJzpWXbQFpT/Zh6OZYnpFykvzC3fbEvEAFZu03dPA==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.0.tgz",
+      "integrity": "sha512-/IZQvg6ZR0tAkEi4tdXOraQoWeJy9gbQ/cx4I7k9dJaCk9qrXEcdouxRVz5kZXt5C2bQ9pILoAA+KB4C/d3pfw==",
       "cpu": [
         "arm"
       ],
@@ -13273,9 +13278,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.14.1.tgz",
-      "integrity": "sha512-Y/9OHLjzkunF+KGEoJr3heiD5X9OLa8sbT1lm0NYeKyaM3oMhhQFvPB0bNZYJwlq93j8Z6wSxh9+cyKQaxS7PQ==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.0.tgz",
+      "integrity": "sha512-ETHi4bxrYnvOtXeM7d4V4kZWixib2jddFacJjsOjwbgYSRsyXYtZHC4ht134OsslPIcnkqT+TKV4eU8rNBKyyQ==",
       "cpu": [
         "arm64"
       ],
@@ -13286,9 +13291,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.14.1.tgz",
-      "integrity": "sha512-+kecg3FY84WadgcuSVm6llrABOdQAEbNdnpi5X3UwWiFVhZIZvKgGrF7kmLguvxHNQy+UuRV66cLVl3S+Rkt+Q==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.0.tgz",
+      "integrity": "sha512-ZWgARzhSKE+gVUX7QWaECoRQsPwaD8ZR0Oxb3aUpzdErTvlEadfQpORPXkKSdKbFci9v8MJfkTtoEHnnW9Ulng==",
       "cpu": [
         "arm64"
       ],
@@ -13299,9 +13304,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.1.tgz",
-      "integrity": "sha512-2pYRzEjVqq2TB/UNv47BV/8vQiXkFGVmPFwJb+1E0IFFZbIX8/jo1olxqqMbo6xCXf8kabANhp5bzCij2tFLUA==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.0.tgz",
+      "integrity": "sha512-h0ZAtOfHyio8Az6cwIGS+nHUfRMWBDO5jXB8PQCARVF6Na/G6XS2SFxDl8Oem+S5ZsHQgtsI7RT4JQnI1qrlaw==",
       "cpu": [
         "x64"
       ],
@@ -13312,9 +13317,22 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.14.1.tgz",
-      "integrity": "sha512-mS6wQ6Do6/wmrF9aTFVpIJ3/IDXhg1EZcQFYHZLHqw6AzMBjTHWnCG35HxSqUNphh0EHqSM6wRTT8HsL1C0x5g==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.0.tgz",
+      "integrity": "sha512-9pxQJSPwFsVi0ttOmqLY4JJ9pg9t1gKhK0JDbV1yUEETSx55fdyCjt39eBQ54OQCzAF0nVGO6LfEH1KnCPvelA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.0.tgz",
+      "integrity": "sha512-YJ5Ku5BmNJZb58A4qSEo3JlIG4d3G2lWyBi13ABlXzO41SsdnUKi3HQHe83VpwBVG4jHFTW65jOQb8qyoR+qzg==",
       "cpu": [
         "arm"
       ],
@@ -13325,9 +13343,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.14.1.tgz",
-      "integrity": "sha512-p9rGKYkHdFMzhckOTFubfxgyIO1vw//7IIjBBRVzyZebWlzRLeNhqxuSaZ7kCEKVkm/kuC9fVRW9HkC/zNRG2w==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.0.tgz",
+      "integrity": "sha512-U4G4u7f+QCqHlVg1Nlx+qapZy+QoG+NV6ux+upo/T7arNGwKvKP2kmGM4W5QTbdewWFgudQxi3kDNST9GT1/mg==",
       "cpu": [
         "arm64"
       ],
@@ -13338,9 +13356,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.14.1.tgz",
-      "integrity": "sha512-nDY6Yz5xS/Y4M2i9JLQd3Rofh5OR8Bn8qe3Mv/qCVpHFlwtZSBYSPaU4mrGazWkXrdQ98GB//H0BirGR/SKFSw==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.0.tgz",
+      "integrity": "sha512-aQpNlKmx3amwkA3a5J6nlXSahE1ijl0L9KuIjVOUhfOh7uw2S4piR3mtpxpRtbnK809SBtyPsM9q15CPTsY7HQ==",
       "cpu": [
         "arm64"
       ],
@@ -13351,11 +13369,11 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.14.1.tgz",
-      "integrity": "sha512-im7HE4VBL+aDswvcmfx88Mp1soqL9OBsdDBU8NqDEYtkri0qV0THhQsvZtZeNNlLeCUQ16PZyv7cqutjDF35qw==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.0.tgz",
+      "integrity": "sha512-9fx6Zj/7vve/Fp4iexUFRKb5+RjLCff6YTRQl4CoDhdMfDoobWmhAxQWV3NfShMzQk1Q/iCnageFyGfqnsmeqQ==",
       "cpu": [
-        "ppc64le"
+        "ppc64"
       ],
       "dev": true,
       "optional": true,
@@ -13364,9 +13382,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.14.1.tgz",
-      "integrity": "sha512-RWdiHuAxWmzPJgaHJdpvUUlDz8sdQz4P2uv367T2JocdDa98iRw2UjIJ4QxSyt077mXZT2X6pKfT2iYtVEvOFw==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.0.tgz",
+      "integrity": "sha512-VWQiCcN7zBgZYLjndIEh5tamtnKg5TGxyZPWcN9zBtXBwfcGSZ5cHSdQZfQH/GB4uRxk0D3VYbOEe/chJhPGLQ==",
       "cpu": [
         "riscv64"
       ],
@@ -13377,9 +13395,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.14.1.tgz",
-      "integrity": "sha512-VMgaGQ5zRX6ZqV/fas65/sUGc9cPmsntq2FiGmayW9KMNfWVG/j0BAqImvU4KTeOOgYSf1F+k6at1UfNONuNjA==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.0.tgz",
+      "integrity": "sha512-EHmPnPWvyYqncObwqrosb/CpH3GOjE76vWVs0g4hWsDRUVhg61hBmlVg5TPXqF+g+PvIbqkC7i3h8wbn4Gp2Fg==",
       "cpu": [
         "s390x"
       ],
@@ -13390,9 +13408,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.14.1.tgz",
-      "integrity": "sha512-9Q7DGjZN+hTdJomaQ3Iub4m6VPu1r94bmK2z3UeWP3dGUecRC54tmVu9vKHTm1bOt3ASoYtEz6JSRLFzrysKlA==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.0.tgz",
+      "integrity": "sha512-tsSWy3YQzmpjDKnQ1Vcpy3p9Z+kMFbSIesCdMNgLizDWFhrLZIoN21JSq01g+MZMDFF+Y1+4zxgrlqPjid5ohg==",
       "cpu": [
         "x64"
       ],
@@ -13403,9 +13421,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.14.1.tgz",
-      "integrity": "sha512-JNEG/Ti55413SsreTguSx0LOVKX902OfXIKVg+TCXO6Gjans/k9O6ww9q3oLGjNDaTLxM+IHFMeXy/0RXL5R/g==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.0.tgz",
+      "integrity": "sha512-anr1Y11uPOQrpuU8XOikY5lH4Qu94oS6j0xrulHk3NkLDq19MlX8Ng/pVipjxBJ9a2l3+F39REZYyWQFkZ4/fw==",
       "cpu": [
         "x64"
       ],
@@ -13416,9 +13434,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.14.1.tgz",
-      "integrity": "sha512-ryS22I9y0mumlLNwDFYZRDFLwWh3aKaC72CWjFcFvxK0U6v/mOkM5Up1bTbCRAhv3kEIwW2ajROegCIQViUCeA==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.0.tgz",
+      "integrity": "sha512-7LB+Bh+Ut7cfmO0m244/asvtIGQr5pG5Rvjz/l1Rnz1kDzM02pSX9jPaS0p+90H5I1x4d1FkCew+B7MOnoatNw==",
       "cpu": [
         "arm64"
       ],
@@ -13429,9 +13447,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.14.1.tgz",
-      "integrity": "sha512-TdloItiGk+T0mTxKx7Hp279xy30LspMso+GzQvV2maYePMAWdmrzqSNZhUpPj3CGw12aGj57I026PgLCTu8CGg==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.0.tgz",
+      "integrity": "sha512-+3qZ4rer7t/QsC5JwMpcvCVPRcJt1cJrYS/TMJZzXIJbxWFQEVhrIc26IhB+5Z9fT9umfVc+Es2mOZgl+7jdJQ==",
       "cpu": [
         "ia32"
       ],
@@ -13442,9 +13460,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.1.tgz",
-      "integrity": "sha512-wQGI+LY/Py20zdUPq+XCem7JcPOyzIJBm3dli+56DJsQOHbnXZFEwgmnC6el1TPAfC8lBT3m+z69RmLykNUbew==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.0.tgz",
+      "integrity": "sha512-YdicNOSJONVx/vuPkgPTyRoAPx3GbknBZRCOUkK84FJ/YTfs/F0vl/YsMscrB6Y177d+yDRcj+JWMPMCgshwrA==",
       "cpu": [
         "x64"
       ],
@@ -15090,17 +15108,6 @@
         "@types/json-schema": "*"
       }
     },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
     "node_modules/@types/estree": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
@@ -15609,9 +15616,9 @@
       }
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
-      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
+      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -15634,9 +15641,9 @@
       "peer": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
-      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
+      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
       "dev": true,
       "peer": true
     },
@@ -15660,16 +15667,16 @@
       "peer": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
-      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
+      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6"
+        "@webassemblyjs/wasm-gen": "1.12.1"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
@@ -15700,30 +15707,30 @@
       "peer": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
-      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
+      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6",
-        "@webassemblyjs/wasm-opt": "1.11.6",
-        "@webassemblyjs/wasm-parser": "1.11.6",
-        "@webassemblyjs/wast-printer": "1.11.6"
+        "@webassemblyjs/helper-wasm-section": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-opt": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1",
+        "@webassemblyjs/wast-printer": "1.12.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
-      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
+      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
         "@webassemblyjs/ieee754": "1.11.6",
         "@webassemblyjs/leb128": "1.11.6",
@@ -15731,26 +15738,26 @@
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
-      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
+      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6",
-        "@webassemblyjs/wasm-parser": "1.11.6"
+        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/helper-buffer": "1.12.1",
+        "@webassemblyjs/wasm-gen": "1.12.1",
+        "@webassemblyjs/wasm-parser": "1.12.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
-      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
+      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-api-error": "1.11.6",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
         "@webassemblyjs/ieee754": "1.11.6",
@@ -15759,13 +15766,13 @@
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
-      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
+      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/ast": "1.12.1",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -15854,10 +15861,10 @@
         "acorn-walk": "^8.0.2"
       }
     },
-    "node_modules/acorn-import-assertions": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+    "node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
       "dev": true,
       "peer": true,
       "peerDependencies": {
@@ -16461,10 +16468,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
-      "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
-      "license": "MIT",
+      "version": "1.7.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -16823,9 +16829,9 @@
       "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
     },
     "node_modules/body-parser": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
       "dependencies": {
         "bytes": "3.1.2",
         "content-type": "~1.0.5",
@@ -16835,7 +16841,7 @@
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
@@ -17569,21 +17575,71 @@
       }
     },
     "node_modules/cli-truncate": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
-      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
+      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
       "dev": true,
       "dependencies": {
         "slice-ansi": "^5.0.0",
-        "string-width": "^5.0.0"
+        "string-width": "^7.0.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-truncate/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/cli-truncate/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
+      "dev": true
+    },
+    "node_modules/cli-truncate/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/cli-truncate/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
     "node_modules/cli-width": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
@@ -18529,11 +18585,11 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -19070,9 +19126,9 @@
       "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="
     },
     "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -19086,9 +19142,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.15.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
-      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
+      "version": "5.17.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -19109,6 +19165,18 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/environment": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz",
+      "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -19351,9 +19419,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
-      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -19363,29 +19431,29 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.2",
-        "@esbuild/android-arm": "0.20.2",
-        "@esbuild/android-arm64": "0.20.2",
-        "@esbuild/android-x64": "0.20.2",
-        "@esbuild/darwin-arm64": "0.20.2",
-        "@esbuild/darwin-x64": "0.20.2",
-        "@esbuild/freebsd-arm64": "0.20.2",
-        "@esbuild/freebsd-x64": "0.20.2",
-        "@esbuild/linux-arm": "0.20.2",
-        "@esbuild/linux-arm64": "0.20.2",
-        "@esbuild/linux-ia32": "0.20.2",
-        "@esbuild/linux-loong64": "0.20.2",
-        "@esbuild/linux-mips64el": "0.20.2",
-        "@esbuild/linux-ppc64": "0.20.2",
-        "@esbuild/linux-riscv64": "0.20.2",
-        "@esbuild/linux-s390x": "0.20.2",
-        "@esbuild/linux-x64": "0.20.2",
-        "@esbuild/netbsd-x64": "0.20.2",
-        "@esbuild/openbsd-x64": "0.20.2",
-        "@esbuild/sunos-x64": "0.20.2",
-        "@esbuild/win32-arm64": "0.20.2",
-        "@esbuild/win32-ia32": "0.20.2",
-        "@esbuild/win32-x64": "0.20.2"
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
       }
     },
     "node_modules/escalade": {
@@ -20087,36 +20155,36 @@
       "integrity": "sha512-4EMSHGOPSwAfBiibw3ndnP0AvjDWLsMvGOvWEZ2F96IGk0bIVdjQisOHxReSkE13mHcfbuCiXw+G4y0zv6N8Eg=="
     },
     "node_modules/express": {
-      "version": "4.19.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
-      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+      "version": "4.21.0",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
+      "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.2",
+        "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
         "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "1.3.1",
         "fresh": "0.5.2",
         "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
+        "merge-descriptors": "1.0.3",
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
+        "path-to-regexp": "0.1.10",
         "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "type-is": "~1.6.18",
@@ -20626,12 +20694,12 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
       "dependencies": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
@@ -20697,13 +20765,13 @@
       }
     },
     "node_modules/find-my-way": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-8.1.0.tgz",
-      "integrity": "sha512-41QwjCGcVTODUmLLqTMeoHeiozbMXYMAE1CKFiDyi9zVZ2Vjh0yz3MF0WQZoIb+cmzP/XlbFjlF2NtJmvZHznA==",
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-8.2.2.tgz",
+      "integrity": "sha512-Dobi7gcTEq8yszimcfp/R7+owiT4WncAJ7VTTgFH1jYJ5GaG1FbhjwDG820hptN0QDFvzVY3RfCzdInvGPGzjA==",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-querystring": "^1.0.0",
-        "safe-regex2": "^2.0.0"
+        "safe-regex2": "^3.1.0"
       },
       "engines": {
         "node": ">=14"
@@ -20906,6 +20974,31 @@
         "url": "https://github.com/sponsors/rawify"
       }
     },
+    "node_modules/framer-motion": {
+      "version": "11.5.4",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.5.4.tgz",
+      "integrity": "sha512-E+tb3/G6SO69POkdJT+3EpdMuhmtCh9EWuK4I1DnIC23L7tFPrl8vxP+LSovwaw6uUr73rUbpb4FgK011wbRJQ==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.4.0"
+      },
+      "peerDependencies": {
+        "@emotion/is-prop-valid": "*",
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@emotion/is-prop-valid": {
+          "optional": true
+        },
+        "react": {
+          "optional": true
+        },
+        "react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
@@ -21061,6 +21154,18 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
+    "node_modules/get-east-asian-width": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz",
+      "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/get-intrinsic": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
@@ -24815,27 +24920,27 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
     "node_modules/lint-staged": {
-      "version": "13.3.0",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.3.0.tgz",
-      "integrity": "sha512-mPRtrYnipYYv1FEE134ufbWpeggNTo+O/UPzngoaKzbzHAthvR55am+8GfHTnqNRQVRRrYQLGW9ZyUoD7DsBHQ==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "5.3.0",
-        "commander": "11.0.0",
-        "debug": "4.3.4",
-        "execa": "7.2.0",
-        "lilconfig": "2.1.0",
-        "listr2": "6.6.1",
-        "micromatch": "4.0.5",
-        "pidtree": "0.6.0",
-        "string-argv": "0.3.2",
-        "yaml": "2.3.1"
+      "version": "15.2.10",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.10.tgz",
+      "integrity": "sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "~5.3.0",
+        "commander": "~12.1.0",
+        "debug": "~4.3.6",
+        "execa": "~8.0.1",
+        "lilconfig": "~3.1.2",
+        "listr2": "~8.2.4",
+        "micromatch": "~4.0.8",
+        "pidtree": "~0.6.0",
+        "string-argv": "~0.3.2",
+        "yaml": "~2.5.0"
       },
       "bin": {
         "lint-staged": "bin/lint-staged.js"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": ">=18.12.0"
       },
       "funding": {
         "url": "https://opencollective.com/lint-staged"
@@ -24854,44 +24959,56 @@
       }
     },
     "node_modules/lint-staged/node_modules/commander": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz",
-      "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==",
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+      "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
       "dev": true,
       "engines": {
-        "node": ">=16"
+        "node": ">=18"
       }
     },
     "node_modules/lint-staged/node_modules/execa": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz",
-      "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
+      "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
       "dev": true,
       "dependencies": {
         "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.1",
-        "human-signals": "^4.3.0",
+        "get-stream": "^8.0.1",
+        "human-signals": "^5.0.0",
         "is-stream": "^3.0.0",
         "merge-stream": "^2.0.0",
         "npm-run-path": "^5.1.0",
         "onetime": "^6.0.0",
-        "signal-exit": "^3.0.7",
+        "signal-exit": "^4.1.0",
         "strip-final-newline": "^3.0.0"
       },
       "engines": {
-        "node": "^14.18.0 || ^16.14.0 || >=18.0.0"
+        "node": ">=16.17"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
+    "node_modules/lint-staged/node_modules/get-stream": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
+      "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/lint-staged/node_modules/human-signals": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz",
-      "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
+      "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
       "dev": true,
       "engines": {
-        "node": ">=14.18.0"
+        "node": ">=16.17.0"
       }
     },
     "node_modules/lint-staged/node_modules/is-stream": {
@@ -24906,6 +25023,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/lint-staged/node_modules/lilconfig": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
+      "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antonk52"
+      }
+    },
     "node_modules/lint-staged/node_modules/mimic-fn": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
@@ -24919,9 +25048,9 @@
       }
     },
     "node_modules/lint-staged/node_modules/npm-run-path": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz",
-      "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
       "dev": true,
       "dependencies": {
         "path-key": "^4.0.0"
@@ -24960,6 +25089,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/lint-staged/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/lint-staged/node_modules/strip-final-newline": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
@@ -24972,38 +25113,100 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lint-staged/node_modules/yaml": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz",
-      "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",
+    "node_modules/listr2": {
+      "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz",
+      "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==",
       "dev": true,
+      "dependencies": {
+        "cli-truncate": "^4.0.0",
+        "colorette": "^2.0.20",
+        "eventemitter3": "^5.0.1",
+        "log-update": "^6.1.0",
+        "rfdc": "^1.4.1",
+        "wrap-ansi": "^9.0.0"
+      },
       "engines": {
-        "node": ">= 14"
+        "node": ">=18.0.0"
       }
     },
-    "node_modules/listr2": {
-      "version": "6.6.1",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz",
-      "integrity": "sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==",
+    "node_modules/listr2/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/listr2/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/listr2/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
+      "dev": true
+    },
+    "node_modules/listr2/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "dev": true,
       "dependencies": {
-        "cli-truncate": "^3.1.0",
-        "colorette": "^2.0.20",
-        "eventemitter3": "^5.0.1",
-        "log-update": "^5.0.1",
-        "rfdc": "^1.3.0",
-        "wrap-ansi": "^8.1.0"
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=16.0.0"
+        "node": ">=18"
       },
-      "peerDependencies": {
-        "enquirer": ">= 2.3.0 < 3"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/listr2/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
       },
-      "peerDependenciesMeta": {
-        "enquirer": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/listr2/node_modules/wrap-ansi": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
+      "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "string-width": "^7.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
     "node_modules/loader-runner": {
@@ -25141,43 +25344,43 @@
       }
     },
     "node_modules/log-update": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz",
-      "integrity": "sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
+      "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
       "dev": true,
       "dependencies": {
-        "ansi-escapes": "^5.0.0",
-        "cli-cursor": "^4.0.0",
-        "slice-ansi": "^5.0.0",
-        "strip-ansi": "^7.0.1",
-        "wrap-ansi": "^8.0.1"
+        "ansi-escapes": "^7.0.0",
+        "cli-cursor": "^5.0.0",
+        "slice-ansi": "^7.1.0",
+        "strip-ansi": "^7.1.0",
+        "wrap-ansi": "^9.0.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/log-update/node_modules/ansi-escapes": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz",
-      "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
+      "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^1.0.2"
+        "environment": "^1.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/log-update/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
       "engines": {
         "node": ">=12"
@@ -25186,6 +25389,130 @@
         "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
+    "node_modules/log-update/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/cli-cursor": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
+      "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
+      "dev": true,
+      "dependencies": {
+        "restore-cursor": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
+      "dev": true
+    },
+    "node_modules/log-update/node_modules/is-fullwidth-code-point": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz",
+      "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==",
+      "dev": true,
+      "dependencies": {
+        "get-east-asian-width": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/onetime": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
+      "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
+      "dev": true,
+      "dependencies": {
+        "mimic-function": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/restore-cursor": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
+      "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^7.0.0",
+        "signal-exit": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/log-update/node_modules/slice-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz",
+      "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "is-fullwidth-code-point": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/log-update/node_modules/strip-ansi": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
@@ -25201,16 +25528,21 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/log-update/node_modules/type-fest": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
-      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
+    "node_modules/log-update/node_modules/wrap-ansi": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
+      "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
       "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "string-width": "^7.0.0",
+        "strip-ansi": "^7.1.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
     "node_modules/logform": {
@@ -26218,9 +26550,12 @@
       "devOptional": true
     },
     "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
@@ -26820,11 +27155,11 @@
       ]
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -26886,6 +27221,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/mimic-function": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz",
+      "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/mimic-response": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
@@ -27025,8 +27372,6 @@
       "version": "5.9.2",
       "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.9.2.tgz",
       "integrity": "sha512-H60HecKO4Bc+7dhOv4sJlgvenK4fQNqqUIlXxZYQNbfEWSALGAwGoyJd/0Qwk4TttFXUOHJ2ZJQe/52ScaUwtQ==",
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "bson": "^5.5.0",
         "mongodb-connection-string-url": "^2.6.0",
@@ -27139,23 +27484,6 @@
         "node": ">=16.20.1"
       }
     },
-    "node_modules/mongodb-memory-server-core/node_modules/debug": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/mongodb-memory-server-core/node_modules/https-proxy-agent": {
       "version": "7.0.5",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
@@ -27251,13 +27579,13 @@
       }
     },
     "node_modules/mongoose": {
-      "version": "7.6.8",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-7.6.8.tgz",
-      "integrity": "sha512-q9zAySH+UtOK5yonWyNcLfq3PxrY6s4gdta4qNGKNOE2yTVoY9FP4hQtvWYnv4rkdk7T8QmQMC7bbhJjDxIunw==",
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-7.8.1.tgz",
+      "integrity": "sha512-c3MY8P1mGUGO+0H8rqxMNmAmhP0xb2EPNItfr7tHAHkh52uB0owH4Gu6q1GTUYj8yoHEDG5MN2V1aBBR6aJPuA==",
       "dependencies": {
         "bson": "^5.5.0",
         "kareem": "2.5.1",
-        "mongodb": "5.9.1",
+        "mongodb": "5.9.2",
         "mpath": "0.9.0",
         "mquery": "5.0.0",
         "ms": "2.1.3",
@@ -27271,51 +27599,6 @@
         "url": "https://opencollective.com/mongoose"
       }
     },
-    "node_modules/mongoose/node_modules/mongodb": {
-      "version": "5.9.1",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.9.1.tgz",
-      "integrity": "sha512-NBGA8AfJxGPeB12F73xXwozt8ZpeIPmCUeWRwl9xejozTXFes/3zaep9zhzs1B/nKKsw4P3I4iPfXl3K7s6g+Q==",
-      "dependencies": {
-        "bson": "^5.5.0",
-        "mongodb-connection-string-url": "^2.6.0",
-        "socks": "^2.7.1"
-      },
-      "engines": {
-        "node": ">=14.20.1"
-      },
-      "optionalDependencies": {
-        "@mongodb-js/saslprep": "^1.1.0"
-      },
-      "peerDependencies": {
-        "@aws-sdk/credential-providers": "^3.188.0",
-        "@mongodb-js/zstd": "^1.0.0",
-        "kerberos": "^1.0.0 || ^2.0.0",
-        "mongodb-client-encryption": ">=2.3.0 <3",
-        "snappy": "^7.2.2"
-      },
-      "peerDependenciesMeta": {
-        "@aws-sdk/credential-providers": {
-          "optional": true
-        },
-        "@mongodb-js/zstd": {
-          "optional": true
-        },
-        "kerberos": {
-          "optional": true
-        },
-        "mongodb-client-encryption": {
-          "optional": true
-        },
-        "snappy": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/mongoose/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
     "node_modules/moo": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz",
@@ -27351,9 +27634,9 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/msedge-tts": {
       "version": "1.3.4",
@@ -27735,9 +28018,9 @@
       }
     },
     "node_modules/nodemailer": {
-      "version": "6.9.9",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.9.tgz",
-      "integrity": "sha512-dexTll8zqQoVJEZPwQAKzxxtFn0qTnjdQTchoU6Re9BUUGBJiOy3YMn/0ShTW6J5M0dfQ1NeDeRTTl4oIWgQMA==",
+      "version": "6.9.15",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.15.tgz",
+      "integrity": "sha512-AHf04ySLC6CIfuRtRiEYtGEXgRfa6INgWGluDhnxTZhHSKvrBu7lc1VVchQ0d8nPc4cFaZoPq8vkyNoZr0TpGQ==",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -28685,9 +28968,9 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
     },
     "node_modules/path-type": {
       "version": "4.0.0",
@@ -28748,9 +29031,9 @@
       }
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
@@ -28970,9 +29253,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.38",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
-      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+      "version": "8.4.47",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -28989,8 +29272,8 @@
       ],
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.2.0"
+        "picocolors": "^1.1.0",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -30486,11 +30769,11 @@
       ]
     },
     "node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -32068,11 +32351,11 @@
       }
     },
     "node_modules/ret": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.2.2.tgz",
-      "integrity": "sha512-M0b3YWQs7R3Z917WRQy1HHA7Ba7D8hvZg6UE5mLykJxQVE2ju0IXbGlaHPPlkY+WN7wFP+wUMXmBFA0aV6vYGQ==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.4.3.tgz",
+      "integrity": "sha512-0f4Memo5QP7WQyUEAYUO3esD/XjOc3Zjjg5CPsAq1p8sIu0XPeMbHJemKA0BO7tV0X7+A0FoEpbmHXWxPyD3wQ==",
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
       }
     },
     "node_modules/retry": {
@@ -32093,9 +32376,9 @@
       }
     },
     "node_modules/rfdc": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz",
-      "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA=="
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
@@ -32357,11 +32640,11 @@
       }
     },
     "node_modules/safe-regex2": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex2/-/safe-regex2-2.0.0.tgz",
-      "integrity": "sha512-PaUSFsUaNNuKwkBijoAPHAK6/eM6VirvyPWlZ7BAQy4D+hCvh4B6lIG+nPdhbFfIbP+gTGBcrdsOaUs0F+ZBOQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex2/-/safe-regex2-3.1.0.tgz",
+      "integrity": "sha512-RAAZAGbap2kBfbVhvmnTFv73NWLMvDGOITFYTZBAaY8eR+Ir4ef7Up/e7amo+y1+AH+3PtLkrt9mvcTsG9LXug==",
       "dependencies": {
-        "ret": "~0.2.0"
+        "ret": "~0.4.0"
       }
     },
     "node_modules/safe-stable-stringify": {
@@ -32433,9 +32716,9 @@
       }
     },
     "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
       "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -32468,6 +32751,14 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
+    "node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/send/node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -32479,11 +32770,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
@@ -32494,14 +32780,14 @@
       }
     },
     "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
       "dependencies": {
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.19.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -32613,13 +32899,17 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -32806,9 +33096,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -34668,20 +34958,6 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
       "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
     },
-    "node_modules/url/node_modules/qs": {
-      "version": "6.11.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
-      "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/use-callback-ref": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.1.tgz",
@@ -34949,14 +35225,14 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz",
-      "integrity": "sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==",
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.6.tgz",
+      "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==",
       "dev": true,
       "dependencies": {
-        "esbuild": "^0.20.1",
-        "postcss": "^8.4.38",
-        "rollup": "^4.13.0"
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -34975,6 +35251,7 @@
         "less": "*",
         "lightningcss": "^1.21.0",
         "sass": "*",
+        "sass-embedded": "*",
         "stylus": "*",
         "sugarss": "*",
         "terser": "^5.4.0"
@@ -34992,6 +35269,9 @@
         "sass": {
           "optional": true
         },
+        "sass-embedded": {
+          "optional": true
+        },
         "stylus": {
           "optional": true
         },
@@ -35052,9 +35332,9 @@
       }
     },
     "node_modules/vite/node_modules/rollup": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.14.1.tgz",
-      "integrity": "sha512-4LnHSdd3QK2pa1J6dFbfm1HN0D7vSK/ZuZTsdyUAlA6Rr1yTouUTL13HaDOGJVgby461AhrNGBS7sCGXXtT+SA==",
+      "version": "4.22.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.0.tgz",
+      "integrity": "sha512-W21MUIFPZ4+O2Je/EU+GP3iz7PH4pVPUXSbEZdatQnxo29+3rsUjgrJmzuAZU24z7yRAnFN6ukxeAhZh/c7hzg==",
       "dev": true,
       "dependencies": {
         "@types/estree": "1.0.5"
@@ -35067,21 +35347,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.14.1",
-        "@rollup/rollup-android-arm64": "4.14.1",
-        "@rollup/rollup-darwin-arm64": "4.14.1",
-        "@rollup/rollup-darwin-x64": "4.14.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.14.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.14.1",
-        "@rollup/rollup-linux-arm64-musl": "4.14.1",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.14.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.14.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.14.1",
-        "@rollup/rollup-linux-x64-gnu": "4.14.1",
-        "@rollup/rollup-linux-x64-musl": "4.14.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.14.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.14.1",
-        "@rollup/rollup-win32-x64-msvc": "4.14.1",
+        "@rollup/rollup-android-arm-eabi": "4.22.0",
+        "@rollup/rollup-android-arm64": "4.22.0",
+        "@rollup/rollup-darwin-arm64": "4.22.0",
+        "@rollup/rollup-darwin-x64": "4.22.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.22.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.22.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.22.0",
+        "@rollup/rollup-linux-arm64-musl": "4.22.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.22.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.22.0",
+        "@rollup/rollup-linux-x64-gnu": "4.22.0",
+        "@rollup/rollup-linux-x64-musl": "4.22.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.22.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.22.0",
+        "@rollup/rollup-win32-x64-msvc": "4.22.0",
         "fsevents": "~2.3.2"
       }
     },
@@ -35158,9 +35439,9 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -35205,27 +35486,26 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.90.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.1.tgz",
-      "integrity": "sha512-SstPdlAC5IvgFnhiRok8hqJo/+ArAbNv7rhU4fnWGHNVfN59HSQFaxZDSAL3IFG2YmqxuRs+IU33milSxbPlog==",
+      "version": "5.94.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^1.0.5",
-        "@webassemblyjs/ast": "^1.11.5",
-        "@webassemblyjs/wasm-edit": "^1.11.5",
-        "@webassemblyjs/wasm-parser": "^1.11.5",
+        "@webassemblyjs/ast": "^1.12.1",
+        "@webassemblyjs/wasm-edit": "^1.12.1",
+        "@webassemblyjs/wasm-parser": "^1.12.1",
         "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.9.0",
+        "acorn-import-attributes": "^1.9.5",
         "browserslist": "^4.21.10",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.15.0",
+        "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.9",
+        "graceful-fs": "^4.2.11",
         "json-parse-even-better-errors": "^2.3.1",
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
@@ -35233,7 +35513,7 @@
         "schema-utils": "^3.2.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.3.10",
-        "watchpack": "^2.4.0",
+        "watchpack": "^2.4.1",
         "webpack-sources": "^3.2.3"
       },
       "bin": {
@@ -36288,9 +36568,12 @@
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "node_modules/yaml": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
-      "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
+      "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
       "engines": {
         "node": ">= 14"
       }
@@ -36398,11 +36681,11 @@
     },
     "packages/data-provider": {
       "name": "librechat-data-provider",
-      "version": "0.7.420",
+      "version": "0.7.425",
       "license": "ISC",
       "dependencies": {
         "@types/js-yaml": "^4.0.9",
-        "axios": "^1.3.4",
+        "axios": "^1.7.7",
         "js-yaml": "^4.1.0",
         "openai": "4.11.1",
         "openapi-types": "^12.1.3",
diff --git a/package.json b/package.json
index f67533df8d3..36cf1bed5e2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "LibreChat",
-  "version": "v0.7.5-rc1",
+  "version": "v0.7.5-rc2",
   "description": "",
   "workspaces": [
     "api",
@@ -29,6 +29,8 @@
     "invite-user": "node config/invite-user.js",
     "ban-user": "node config/ban-user.js",
     "delete-user": "node config/delete-user.js",
+    "update-banner": "node config/update-banner.js",
+    "delete-banner": "node config/delete-banner.js",
     "backend": "cross-env NODE_ENV=production node api/server/index.js",
     "backend:dev": "cross-env NODE_ENV=development npx nodemon api/server/index.js",
     "backend:stop": "node config/stop-backend.js",
@@ -91,7 +93,7 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^8.0.0",
     "jest": "^29.5.0",
-    "lint-staged": "^13.2.2",
+    "lint-staged": "^15.2.10",
     "prettier": "^2.8.8",
     "prettier-eslint": "^15.0.1",
     "prettier-eslint-cli": "^7.1.0",
diff --git a/packages/data-provider/package.json b/packages/data-provider/package.json
index 4b381dacc01..dd265e3c13d 100644
--- a/packages/data-provider/package.json
+++ b/packages/data-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "librechat-data-provider",
-  "version": "0.7.420",
+  "version": "0.7.425",
   "description": "data services for librechat apps",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
@@ -40,7 +40,7 @@
   "homepage": "https://librechat.ai",
   "dependencies": {
     "@types/js-yaml": "^4.0.9",
-    "axios": "^1.3.4",
+    "axios": "^1.7.7",
     "js-yaml": "^4.1.0",
     "openai": "4.11.1",
     "openapi-types": "^12.1.3",
diff --git a/packages/data-provider/react-query/package.json b/packages/data-provider/react-query/package.json
index 069ea55ab59..e449e6966cc 100644
--- a/packages/data-provider/react-query/package.json
+++ b/packages/data-provider/react-query/package.json
@@ -5,6 +5,6 @@
   "module": "./index.es.js",
   "types": "../dist/types/react-query/index.d.ts",
   "dependencies": {
-    "axios": "^1.3.4"
+    "axios": "^1.7.7"
   }
 }
diff --git a/packages/data-provider/src/api-endpoints.ts b/packages/data-provider/src/api-endpoints.ts
index e78f27d67b6..ce9b77d4ac5 100644
--- a/packages/data-provider/src/api-endpoints.ts
+++ b/packages/data-provider/src/api-endpoints.ts
@@ -208,7 +208,8 @@ export const updatePromptPermissions = (roleName: string) =>
   `${roles()}/${roleName.toLowerCase()}/prompts`;
 
 /* Conversation Tags */
-export const conversationTags = (tag?: string) => `/api/tags${tag ? `/${tag}` : ''}`;
+export const conversationTags = (tag?: string) =>
+  `/api/tags${tag != null && tag ? `/${encodeURIComponent(tag)}` : ''}`;
 
 export const conversationTagsList = (pageNumber: string, sort?: string, order?: string) =>
   `${conversationTags()}/list?pageNumber=${pageNumber}${sort ? `&sort=${sort}` : ''}${
@@ -220,3 +221,4 @@ export const addTagToConversation = (conversationId: string) =>
 
 export const userTerms = () => '/api/user/terms';
 export const acceptUserTerms = () => '/api/user/terms/accept';
+export const banner = () => '/api/banner';
diff --git a/packages/data-provider/src/bedrock.ts b/packages/data-provider/src/bedrock.ts
new file mode 100644
index 00000000000..6ee2be2fe0f
--- /dev/null
+++ b/packages/data-provider/src/bedrock.ts
@@ -0,0 +1,147 @@
+import { z } from 'zod';
+import * as s from './schemas';
+
+export const bedrockInputSchema = s.tConversationSchema
+  .pick({
+    /* LibreChat params; optionType: 'conversation' */
+    modelLabel: true,
+    promptPrefix: true,
+    resendFiles: true,
+    iconURL: true,
+    greeting: true,
+    spec: true,
+    maxOutputTokens: true,
+    maxContextTokens: true,
+    artifacts: true,
+    /* Bedrock params; optionType: 'model' */
+    region: true,
+    system: true,
+    model: true,
+    maxTokens: true,
+    temperature: true,
+    topP: true,
+    stop: true,
+    /* Catch-all fields */
+    topK: true,
+    additionalModelRequestFields: true,
+  })
+  .transform(s.removeNullishValues)
+  .catch(() => ({}));
+
+export type BedrockConverseInput = z.infer<typeof bedrockInputSchema>;
+
+export const bedrockInputParser = s.tConversationSchema
+  .pick({
+    /* LibreChat params; optionType: 'conversation' */
+    modelLabel: true,
+    promptPrefix: true,
+    resendFiles: true,
+    iconURL: true,
+    greeting: true,
+    spec: true,
+    artifacts: true,
+    maxOutputTokens: true,
+    maxContextTokens: true,
+    /* Bedrock params; optionType: 'model' */
+    region: true,
+    model: true,
+    maxTokens: true,
+    temperature: true,
+    topP: true,
+    stop: true,
+    /* Catch-all fields */
+    topK: true,
+    additionalModelRequestFields: true,
+  })
+  .catchall(z.any())
+  .transform((data) => {
+    const knownKeys = [
+      'modelLabel',
+      'promptPrefix',
+      'resendFiles',
+      'iconURL',
+      'greeting',
+      'spec',
+      'maxOutputTokens',
+      'artifacts',
+      'additionalModelRequestFields',
+      'region',
+      'model',
+      'maxTokens',
+      'temperature',
+      'topP',
+      'stop',
+    ];
+
+    const additionalFields: Record<string, unknown> = {};
+    const typedData = data as Record<string, unknown>;
+
+    Object.entries(typedData).forEach(([key, value]) => {
+      if (!knownKeys.includes(key)) {
+        if (key === 'topK') {
+          additionalFields['top_k'] = value;
+        } else {
+          additionalFields[key] = value;
+        }
+        delete typedData[key];
+      }
+    });
+
+    if (Object.keys(additionalFields).length > 0) {
+      typedData.additionalModelRequestFields = {
+        ...((typedData.additionalModelRequestFields as Record<string, unknown> | undefined) || {}),
+        ...additionalFields,
+      };
+    }
+
+    if (typedData.maxOutputTokens !== undefined) {
+      typedData.maxTokens = typedData.maxOutputTokens;
+    } else if (typedData.maxTokens !== undefined) {
+      typedData.maxOutputTokens = typedData.maxTokens;
+    }
+
+    return s.removeNullishValues(typedData) as BedrockConverseInput;
+  })
+  .catch(() => ({}));
+
+export const bedrockOutputParser = (data: Record<string, unknown>) => {
+  const knownKeys = [...Object.keys(s.tConversationSchema.shape), 'topK', 'top_k'];
+  const result: Record<string, unknown> = {};
+
+  // Extract known fields from the root level
+  Object.entries(data).forEach(([key, value]) => {
+    if (knownKeys.includes(key)) {
+      result[key] = value;
+    }
+  });
+
+  // Extract known fields from additionalModelRequestFields
+  if (
+    typeof data.additionalModelRequestFields === 'object' &&
+    data.additionalModelRequestFields !== null
+  ) {
+    Object.entries(data.additionalModelRequestFields as Record<string, unknown>).forEach(
+      ([key, value]) => {
+        if (knownKeys.includes(key)) {
+          if (key === 'top_k') {
+            result['topK'] = value;
+          } else {
+            result[key] = value;
+          }
+        }
+      },
+    );
+  }
+
+  // Handle maxTokens and maxOutputTokens
+  if (result.maxTokens !== undefined && result.maxOutputTokens === undefined) {
+    result.maxOutputTokens = result.maxTokens;
+  } else if (result.maxOutputTokens !== undefined && result.maxTokens === undefined) {
+    result.maxTokens = result.maxOutputTokens;
+  }
+
+  // Remove additionalModelRequestFields from the result
+  delete result.additionalModelRequestFields;
+
+  return result;
+};
diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.ts
index c06a872844e..be0dfd3d8ef 100644
--- a/packages/data-provider/src/config.ts
+++ b/packages/data-provider/src/config.ts
@@ -11,6 +11,10 @@ export const defaultSocialLogins = ['google', 'facebook', 'openid', 'github', 'd
 
 export const defaultRetrievalModels = [
   'gpt-4o',
+  'o1-preview-2024-09-12',
+  'o1-preview',
+  'o1-mini-2024-09-12',
+  'o1-mini',
   'chatgpt-4o-latest',
   'gpt-4o-2024-05-13',
   'gpt-4o-2024-08-06',
@@ -142,10 +146,19 @@ export const defaultAssistantsVersion = {
 
 export const baseEndpointSchema = z.object({
   streamRate: z.number().optional(),
+  baseURL: z.string().optional(),
+  titlePrompt: z.string().optional(),
+  titleModel: z.string().optional(),
 });
 
 export type TBaseEndpoint = z.infer<typeof baseEndpointSchema>;
 
+export const bedrockEndpointSchema = baseEndpointSchema.merge(
+  z.object({
+    availableRegions: z.array(z.string()).optional(),
+  }),
+);
+
 export const assistantEndpointSchema = baseEndpointSchema.merge(
   z.object({
     /* assistants specific */
@@ -169,7 +182,6 @@ export const assistantEndpointSchema = baseEndpointSchema.merge(
       ]),
     /* general */
     apiKey: z.string().optional(),
-    baseURL: z.string().optional(),
     models: z
       .object({
         default: z.array(z.string()).min(1),
@@ -179,7 +191,6 @@ export const assistantEndpointSchema = baseEndpointSchema.merge(
       .optional(),
     titleConvo: z.boolean().optional(),
     titleMethod: z.union([z.literal('completion'), z.literal('functions')]).optional(),
-    titleModel: z.string().optional(),
     headers: z.record(z.any()).optional(),
   }),
 );
@@ -187,43 +198,39 @@ export const assistantEndpointSchema = baseEndpointSchema.merge(
 export type TAssistantEndpoint = z.infer<typeof assistantEndpointSchema>;
 
 export const agentsEndpointSChema = baseEndpointSchema.merge(
-  baseEndpointSchema.merge(
-    z.object({
-      /* assistants specific */
-      disableBuilder: z.boolean().optional(),
-      pollIntervalMs: z.number().optional(),
-      timeoutMs: z.number().optional(),
-      version: z.union([z.string(), z.number()]).default(2),
-      supportedIds: z.array(z.string()).min(1).optional(),
-      excludedIds: z.array(z.string()).min(1).optional(),
-      privateAssistants: z.boolean().optional(),
-      retrievalModels: z.array(z.string()).min(1).optional().default(defaultRetrievalModels),
-      capabilities: z
-        .array(z.nativeEnum(Capabilities))
-        .optional()
-        .default([
-          Capabilities.code_interpreter,
-          Capabilities.image_vision,
-          Capabilities.retrieval,
-          Capabilities.actions,
-          Capabilities.tools,
-        ]),
-      /* general */
-      apiKey: z.string().optional(),
-      baseURL: z.string().optional(),
-      models: z
-        .object({
-          default: z.array(z.string()).min(1),
-          fetch: z.boolean().optional(),
-          userIdQuery: z.boolean().optional(),
-        })
-        .optional(),
-      titleConvo: z.boolean().optional(),
-      titleMethod: z.union([z.literal('completion'), z.literal('functions')]).optional(),
-      titleModel: z.string().optional(),
-      headers: z.record(z.any()).optional(),
-    }),
-  ),
+  z.object({
+    /* assistants specific */
+    disableBuilder: z.boolean().optional(),
+    pollIntervalMs: z.number().optional(),
+    timeoutMs: z.number().optional(),
+    version: z.union([z.string(), z.number()]).default(2),
+    supportedIds: z.array(z.string()).min(1).optional(),
+    excludedIds: z.array(z.string()).min(1).optional(),
+    privateAssistants: z.boolean().optional(),
+    retrievalModels: z.array(z.string()).min(1).optional().default(defaultRetrievalModels),
+    capabilities: z
+      .array(z.nativeEnum(Capabilities))
+      .optional()
+      .default([
+        Capabilities.code_interpreter,
+        Capabilities.image_vision,
+        Capabilities.retrieval,
+        Capabilities.actions,
+        Capabilities.tools,
+      ]),
+    /* general */
+    apiKey: z.string().optional(),
+    models: z
+      .object({
+        default: z.array(z.string()).min(1),
+        fetch: z.boolean().optional(),
+        userIdQuery: z.boolean().optional(),
+      })
+      .optional(),
+    titleConvo: z.boolean().optional(),
+    titleMethod: z.union([z.literal('completion'), z.literal('functions')]).optional(),
+    headers: z.record(z.any()).optional(),
+  }),
 );
 
 export type TAgentsEndpoint = z.infer<typeof agentsEndpointSChema>;
@@ -244,7 +251,6 @@ export const endpointSchema = baseEndpointSchema.merge(
     }),
     titleConvo: z.boolean().optional(),
     titleMethod: z.union([z.literal('completion'), z.literal('functions')]).optional(),
-    titleModel: z.string().optional(),
     summarize: z.boolean().optional(),
     summaryModel: z.string().optional(),
     forcePrompt: z.boolean().optional(),
@@ -458,6 +464,7 @@ export const configSchema = z.object({
       modelSelect: z.boolean().optional(),
       parameters: z.boolean().optional(),
       sidePanel: z.boolean().optional(),
+      multiConvo: z.boolean().optional(),
       bookmarks: z.boolean().optional(),
       presets: z.boolean().optional(),
       prompts: z.boolean().optional(),
@@ -468,6 +475,7 @@ export const configSchema = z.object({
       parameters: true,
       sidePanel: true,
       presets: true,
+      multiConvo: true,
       bookmarks: true,
       prompts: true,
     }),
@@ -500,6 +508,7 @@ export const configSchema = z.object({
       [EModelEndpoint.assistants]: assistantEndpointSchema.optional(),
       [EModelEndpoint.agents]: agentsEndpointSChema.optional(),
       [EModelEndpoint.custom]: z.array(endpointSchema.partial()).optional(),
+      [EModelEndpoint.bedrock]: baseEndpointSchema.optional(),
     })
     .strict()
     .refine((data) => Object.keys(data).length > 0, {
@@ -552,6 +561,7 @@ export const defaultEndpoints: EModelEndpoint[] = [
   EModelEndpoint.google,
   EModelEndpoint.anthropic,
   EModelEndpoint.custom,
+  EModelEndpoint.bedrock,
 ];
 
 export const alternateName = {
@@ -566,6 +576,7 @@ export const alternateName = {
   [EModelEndpoint.google]: 'Google',
   [EModelEndpoint.anthropic]: 'Anthropic',
   [EModelEndpoint.custom]: 'Custom',
+  [EModelEndpoint.bedrock]: 'AWS Bedrock',
 };
 
 const sharedOpenAIModels = [
@@ -588,6 +599,52 @@ const sharedOpenAIModels = [
   'gpt-3.5-turbo-0613',
 ];
 
+const sharedAnthropicModels = [
+  'claude-3-5-sonnet-20240620',
+  'claude-3-opus-20240229',
+  'claude-3-sonnet-20240229',
+  'claude-3-haiku-20240307',
+  'claude-2.1',
+  'claude-2',
+  'claude-1.2',
+  'claude-1',
+  'claude-1-100k',
+  'claude-instant-1',
+  'claude-instant-1-100k',
+];
+
+export const bedrockModels = [
+  'anthropic.claude-3-5-sonnet-20240620-v1:0',
+  'anthropic.claude-3-haiku-20240307-v1:0',
+  'anthropic.claude-3-opus-20240229-v1:0',
+  'anthropic.claude-3-sonnet-20240229-v1:0',
+  'anthropic.claude-v2',
+  'anthropic.claude-v2:1',
+  'anthropic.claude-instant-v1',
+  // 'cohere.command-text-v14', // no conversation history
+  // 'cohere.command-light-text-v14', // no conversation history
+  'cohere.command-r-v1:0',
+  'cohere.command-r-plus-v1:0',
+  'meta.llama2-13b-chat-v1',
+  'meta.llama2-70b-chat-v1',
+  'meta.llama3-8b-instruct-v1:0',
+  'meta.llama3-70b-instruct-v1:0',
+  'meta.llama3-1-8b-instruct-v1:0',
+  'meta.llama3-1-70b-instruct-v1:0',
+  'meta.llama3-1-405b-instruct-v1:0',
+  'mistral.mistral-7b-instruct-v0:2',
+  'mistral.mixtral-8x7b-instruct-v0:1',
+  'mistral.mistral-large-2402-v1:0',
+  'mistral.mistral-large-2407-v1:0',
+  'mistral.mistral-small-2402-v1:0',
+  'ai21.jamba-instruct-v1:0',
+  // 'ai21.j2-mid-v1', // no streaming
+  // 'ai21.j2-ultra-v1', no conversation history
+  'amazon.titan-text-lite-v1',
+  'amazon.titan-text-express-v1',
+  'amazon.titan-text-premier-v1:0',
+];
+
 export const defaultModels = {
   [EModelEndpoint.azureAssistants]: sharedOpenAIModels,
   [EModelEndpoint.assistants]: ['chatgpt-4o-latest', ...sharedOpenAIModels],
@@ -606,19 +663,7 @@ export const defaultModels = {
     'code-bison',
     'code-bison-32k',
   ],
-  [EModelEndpoint.anthropic]: [
-    'claude-3-5-sonnet-20240620',
-    'claude-3-opus-20240229',
-    'claude-3-sonnet-20240229',
-    'claude-3-haiku-20240307',
-    'claude-2.1',
-    'claude-2',
-    'claude-1.2',
-    'claude-1',
-    'claude-1-100k',
-    'claude-instant-1',
-    'claude-instant-1-100k',
-  ],
+  [EModelEndpoint.anthropic]: sharedAnthropicModels,
   [EModelEndpoint.openAI]: [
     'chatgpt-4o-latest',
     ...sharedOpenAIModels,
@@ -626,6 +671,7 @@ export const defaultModels = {
     'gpt-3.5-turbo-instruct-0914',
     'gpt-3.5-turbo-instruct',
   ],
+  [EModelEndpoint.bedrock]: bedrockModels,
 };
 
 const fitlerAssistantModels = (str: string) => {
@@ -645,6 +691,7 @@ export const initialModelsConfig: TModelsConfig = {
   [EModelEndpoint.chatGPTBrowser]: ['text-davinci-002-render-sha'],
   [EModelEndpoint.google]: defaultModels[EModelEndpoint.google],
   [EModelEndpoint.anthropic]: defaultModels[EModelEndpoint.anthropic],
+  [EModelEndpoint.bedrock]: defaultModels[EModelEndpoint.bedrock],
 };
 
 export const EndpointURLs: { [key in EModelEndpoint]: string } = {
@@ -658,7 +705,8 @@ export const EndpointURLs: { [key in EModelEndpoint]: string } = {
   [EModelEndpoint.chatGPTBrowser]: `/api/ask/${EModelEndpoint.chatGPTBrowser}`,
   [EModelEndpoint.azureAssistants]: '/api/assistants/v1/chat',
   [EModelEndpoint.assistants]: '/api/assistants/v2/chat',
-  [EModelEndpoint.agents]: '/api/agents/chat',
+  [EModelEndpoint.agents]: `/api/${EModelEndpoint.agents}/chat`,
+  [EModelEndpoint.bedrock]: `/api/${EModelEndpoint.bedrock}/chat`,
 };
 
 export const modularEndpoints = new Set<EModelEndpoint | string>([
@@ -668,6 +716,8 @@ export const modularEndpoints = new Set<EModelEndpoint | string>([
   EModelEndpoint.openAI,
   EModelEndpoint.azureOpenAI,
   EModelEndpoint.custom,
+  EModelEndpoint.agents,
+  EModelEndpoint.bedrock,
 ]);
 
 export const supportsBalanceCheck = {
@@ -679,6 +729,7 @@ export const supportsBalanceCheck = {
   [EModelEndpoint.agents]: true,
   [EModelEndpoint.azureAssistants]: true,
   [EModelEndpoint.azureOpenAI]: true,
+  [EModelEndpoint.bedrock]: true,
 };
 
 export const visionModels = [
@@ -891,11 +942,18 @@ export enum ErrorTypes {
    * Moderation error
    */
   MODERATION = 'moderation',
-
   /**
    * Prompt exceeds max length
    */
   INPUT_LENGTH = 'INPUT_LENGTH',
+  /**
+   * Invalid request error, API rejected request
+   */
+  INVALID_REQUEST = 'invalid_request_error',
+  /**
+   * Invalid request error, API rejected request
+   */
+  NO_SYSTEM_MESSAGES = 'no_system_messages',
 }
 
 /**
@@ -1005,9 +1063,9 @@ export enum TTSProviders {
 /** Enum for app-wide constants */
 export enum Constants {
   /** Key for the app's version. */
-  VERSION = 'v0.7.5-rc1',
+  VERSION = 'v0.7.5-rc2',
   /** Key for the Custom Config's version (librechat.yaml). */
-  CONFIG_VERSION = '1.1.6',
+  CONFIG_VERSION = '1.1.7',
   /** Standard value for the first message's `parentMessageId` value, to indicate no parent exists. */
   NO_PARENT = '00000000-0000-0000-0000-000000000000',
   /** Standard value for the initial conversationId before a request is sent */
@@ -1026,6 +1084,8 @@ export enum Constants {
   SAVED_TAG = 'Saved',
   /** Max number of Conversation starters for Agents/Assistants */
   MAX_CONVO_STARTERS = 4,
+  /** Global/instance Project Name */
+  GLOBAL_PROJECT_NAME = 'instance',
 }
 
 export enum LocalStorageKeys {
@@ -1050,7 +1110,7 @@ export enum LocalStorageKeys {
   /** Key for the last selected fork setting */
   FORK_SETTING = 'forkSetting',
   /** Key for remembering the last selected option, instead of manually selecting */
-  REMEMBER_FORK_OPTION = 'rememberForkOption',
+  REMEMBER_FORK_OPTION = 'rememberDefaultFork',
   /** Key for remembering the split at target fork option modifier */
   FORK_SPLIT_AT_TARGET = 'splitAtTarget',
   /** Key for saving text drafts */
@@ -1059,6 +1119,8 @@ export enum LocalStorageKeys {
   FILES_DRAFT = 'filesDraft_',
   /** Key for last Selected Prompt Category */
   LAST_PROMPT_CATEGORY = 'lastPromptCategory',
+  /** Key for rendering User Messages as Markdown */
+  ENABLE_USER_MSG_MARKDOWN = 'enableUserMsgMarkdown',
 }
 
 export enum ForkOptions {
@@ -1105,6 +1167,7 @@ export enum SystemCategories {
 
 export const providerEndpointMap = {
   [EModelEndpoint.openAI]: EModelEndpoint.openAI,
+  [EModelEndpoint.bedrock]: EModelEndpoint.bedrock,
   [EModelEndpoint.azureOpenAI]: EModelEndpoint.openAI,
   [EModelEndpoint.anthropic]: EModelEndpoint.anthropic,
 };
diff --git a/packages/data-provider/src/data-service.ts b/packages/data-provider/src/data-service.ts
index 71c06654cc4..77114c60113 100644
--- a/packages/data-provider/src/data-service.ts
+++ b/packages/data-provider/src/data-service.ts
@@ -74,6 +74,15 @@ export function updateMessage(payload: t.TUpdateMessageRequest): Promise<unknown
   return request.put(endpoints.messages(conversationId, messageId), { text });
 }
 
+export function updateMessageContent(payload: t.TUpdateMessageContent): Promise<unknown> {
+  const { conversationId, messageId, index, text } = payload;
+  if (!conversationId) {
+    throw new Error('conversationId is required');
+  }
+
+  return request.put(endpoints.messages(conversationId, messageId), { text, index });
+}
+
 export function updateUserKey(payload: t.TUpdateUserKeyRequest) {
   const { value } = payload;
   if (!value) {
@@ -682,3 +691,7 @@ export function getUserTerms(): Promise<t.TUserTermsResponse> {
 export function acceptTerms(): Promise<t.TAcceptTermsResponse> {
   return request.post(endpoints.acceptUserTerms());
 }
+
+export function getBanner(): Promise<t.TBannerResponse> {
+  return request.get(endpoints.banner());
+}
diff --git a/packages/data-provider/src/file-config.ts b/packages/data-provider/src/file-config.ts
index 40bce689d7d..f1c4ff99416 100644
--- a/packages/data-provider/src/file-config.ts
+++ b/packages/data-provider/src/file-config.ts
@@ -12,6 +12,7 @@ export const supportsFiles = {
   [EModelEndpoint.azureOpenAI]: true,
   [EModelEndpoint.anthropic]: true,
   [EModelEndpoint.custom]: true,
+  [EModelEndpoint.bedrock]: true,
 };
 
 export const excelFileTypes = [
@@ -108,7 +109,7 @@ export const excelMimeTypes =
   /^application\/(vnd\.ms-excel|msexcel|x-msexcel|x-ms-excel|x-excel|x-dos_ms_excel|xls|x-xls|vnd\.openxmlformats-officedocument\.spreadsheetml\.sheet)$/;
 
 export const textMimeTypes =
-  /^(text\/(x-c|x-c\+\+|x-java|html|markdown|x-php|x-python|x-script\.python|x-ruby|x-tex|plain|css|javascript|csv))$/;
+  /^(text\/(x-c|x-csharp|x-c\+\+|x-java|html|markdown|x-php|x-python|x-script\.python|x-ruby|x-tex|plain|css|javascript|csv))$/;
 
 export const applicationMimeTypes =
   /^(application\/(epub\+zip|csv|json|pdf|x-tar|typescript|vnd\.openxmlformats-officedocument\.(wordprocessingml\.document|presentationml\.presentation|spreadsheetml\.sheet)|xml|zip))$/;
diff --git a/packages/data-provider/src/generate.ts b/packages/data-provider/src/generate.ts
index 42024fda75f..972e5d2ac10 100644
--- a/packages/data-provider/src/generate.ts
+++ b/packages/data-provider/src/generate.ts
@@ -13,10 +13,18 @@ export type ComponentType =
   | 'checkbox'
   | 'switch'
   | 'dropdown'
+  | 'combobox'
   | 'tags';
 
 export type OptionType = 'conversation' | 'model' | 'custom';
 
+export type Option = Record<string, unknown> & {
+  label?: string;
+  value: string | number | null;
+};
+
+export type OptionWithIcon = Option & { icon?: React.ReactNode };
+
 export enum ComponentTypes {
   Input = 'input',
   Textarea = 'textarea',
@@ -24,6 +32,7 @@ export enum ComponentTypes {
   Checkbox = 'checkbox',
   Switch = 'switch',
   Dropdown = 'dropdown',
+  Combobox = 'combobox',
   Tags = 'tags',
 }
 
@@ -45,6 +54,7 @@ export interface SettingDefinition {
   description?: string;
   type: 'number' | 'boolean' | 'string' | 'enum' | 'array';
   default?: number | boolean | string | string[];
+  showLabel?: boolean;
   showDefault?: boolean;
   options?: string[];
   range?: SettingRange;
@@ -64,6 +74,11 @@ export interface SettingDefinition {
   maxTags?: number; // Specific to tags component
   includeInput?: boolean; // Specific to slider component
   descriptionSide?: 'top' | 'right' | 'bottom' | 'left';
+  items?: OptionWithIcon[]; // Specific to combobox component
+  searchPlaceholder?: string; // Specific to combobox component
+  selectPlaceholder?: string; // Specific to combobox component
+  searchPlaceholderCode?: boolean; // Specific to combobox component
+  selectPlaceholderCode?: boolean; // Specific to combobox component
 }
 
 export type DynamicSettingProps = Partial<SettingDefinition> & {
@@ -190,6 +205,7 @@ const minColumns = 1;
 const maxColumns = 4;
 const minSliderOptions = 2;
 const minDropdownOptions = 2;
+const minComboboxOptions = 2;
 
 /**
  * Validates the provided setting using the constraints unique to each component type.
@@ -383,6 +399,19 @@ export function validateSettingDefinitions(settings: SettingsConfiguration): voi
       }
     }
 
+    if (setting.component === ComponentTypes.Combobox) {
+      if (!setting.options || setting.options.length < minComboboxOptions) {
+        errors.push({
+          code: ZodIssueCode.custom,
+          message: `Combobox component for setting ${setting.key} requires at least ${minComboboxOptions} options.`,
+          path: ['options'],
+        });
+      }
+      if (!setting.default && setting.options && setting.options.length > 0) {
+        setting.default = setting.options[0];
+      }
+    }
+
     // Default columnSpan
     if (!setting.columnSpan) {
       setting.columnSpan = Math.floor(columns / 2);
diff --git a/packages/data-provider/src/index.ts b/packages/data-provider/src/index.ts
index 7ea26d83b32..1fe1c00337d 100644
--- a/packages/data-provider/src/index.ts
+++ b/packages/data-provider/src/index.ts
@@ -1,5 +1,6 @@
 /* config */
 export * from './azure';
+export * from './bedrock';
 export * from './config';
 export * from './file-config';
 /* artifacts  */
diff --git a/packages/data-provider/src/keys.ts b/packages/data-provider/src/keys.ts
index 9b6cb6c235b..a4ed0b121cd 100644
--- a/packages/data-provider/src/keys.ts
+++ b/packages/data-provider/src/keys.ts
@@ -43,6 +43,7 @@ export enum QueryKeys {
   conversationTags = 'conversationTags',
   health = 'health',
   userTerms = 'userTerms',
+  banner = 'banner',
 }
 
 export enum MutationKeys {
diff --git a/packages/data-provider/src/parsers.ts b/packages/data-provider/src/parsers.ts
index b3a14509add..32303747351 100644
--- a/packages/data-provider/src/parsers.ts
+++ b/packages/data-provider/src/parsers.ts
@@ -13,14 +13,13 @@ import {
   gptPluginsSchema,
   // agentsSchema,
   compactAgentsSchema,
-  compactOpenAISchema,
   compactGoogleSchema,
   compactChatGPTSchema,
   chatGPTBrowserSchema,
   compactPluginsSchema,
   compactAssistantSchema,
-  compactAnthropicSchema,
 } from './schemas';
+import { bedrockInputSchema } from './bedrock';
 import { alternateName } from './config';
 
 type EndpointSchema =
@@ -31,7 +30,8 @@ type EndpointSchema =
   | typeof chatGPTBrowserSchema
   | typeof gptPluginsSchema
   | typeof assistantSchema
-  | typeof compactAgentsSchema;
+  | typeof compactAgentsSchema
+  | typeof bedrockInputSchema;
 
 const endpointSchemas: Record<EModelEndpoint, EndpointSchema> = {
   [EModelEndpoint.openAI]: openAISchema,
@@ -45,6 +45,7 @@ const endpointSchemas: Record<EModelEndpoint, EndpointSchema> = {
   [EModelEndpoint.assistants]: assistantSchema,
   [EModelEndpoint.azureAssistants]: assistantSchema,
   [EModelEndpoint.agents]: compactAgentsSchema,
+  [EModelEndpoint.bedrock]: bedrockInputSchema,
 };
 
 // const schemaCreators: Record<EModelEndpoint, (customSchema: DefaultSchemaValues) => EndpointSchema> = {
@@ -64,6 +65,7 @@ export function getEnabledEndpoints() {
     EModelEndpoint.chatGPTBrowser,
     EModelEndpoint.gptPlugins,
     EModelEndpoint.anthropic,
+    EModelEndpoint.bedrock,
   ];
 
   const endpointsEnv = process.env.ENDPOINTS ?? '';
@@ -182,12 +184,12 @@ export const parseConvo = ({
 }: {
   endpoint: EModelEndpoint;
   endpointType?: EModelEndpoint;
-  conversation: Partial<s.TConversation | s.TPreset>;
+  conversation: Partial<s.TConversation | s.TPreset> | null;
   possibleValues?: TPossibleValues;
   // TODO: POC for default schema
   // defaultSchema?: Partial<EndpointSchema>,
 }) => {
-  let schema = endpointSchemas[endpoint];
+  let schema = endpointSchemas[endpoint] as EndpointSchema | undefined;
 
   if (!schema && !endpointType) {
     throw new Error(`Unknown endpoint: ${endpoint}`);
@@ -199,14 +201,14 @@ export const parseConvo = ({
   //   schema = schemaCreators[endpoint](defaultSchema);
   // }
 
-  const convo = schema.parse(conversation) as s.TConversation;
+  const convo = schema?.parse(conversation) as s.TConversation | undefined;
   const { models, secondaryModels } = possibleValues ?? {};
 
   if (models && convo) {
     convo.model = getFirstDefinedValue(models) ?? convo.model;
   }
 
-  if (secondaryModels && convo.agentOptions) {
+  if (secondaryModels && convo?.agentOptions) {
     convo.agentOptions.model = getFirstDefinedValue(secondaryModels) ?? convo.agentOptions.model;
   }
 
@@ -214,37 +216,54 @@ export const parseConvo = ({
 };
 
 export const getResponseSender = (endpointOption: t.TEndpointOption): string => {
-  const { model, endpoint, endpointType, modelDisplayLabel, chatGptLabel, modelLabel, jailbreak } =
-    endpointOption;
-
+  const {
+    model: _m,
+    endpoint,
+    endpointType,
+    modelDisplayLabel,
+    chatGptLabel,
+    modelLabel,
+    jailbreak,
+  } = endpointOption;
+
+  const model = _m ?? '';
   if (
     [
       EModelEndpoint.openAI,
-      EModelEndpoint.azureOpenAI,
+      EModelEndpoint.bedrock,
       EModelEndpoint.gptPlugins,
+      EModelEndpoint.azureOpenAI,
       EModelEndpoint.chatGPTBrowser,
     ].includes(endpoint)
   ) {
     if (chatGptLabel) {
       return chatGptLabel;
+    } else if (model && /\bo1\b/i.test(model)) {
+      return 'o1';
     } else if (model && model.includes('gpt-3')) {
       return 'GPT-3.5';
+    } else if (model && model.includes('gpt-4o')) {
+      return 'GPT-4o';
     } else if (model && model.includes('gpt-4')) {
       return 'GPT-4';
     } else if (model && model.includes('mistral')) {
       return 'Mistral';
     }
-    return alternateName[endpoint] ?? 'ChatGPT';
+    return (alternateName[endpoint] as string | undefined) ?? 'ChatGPT';
   }
 
   if (endpoint === EModelEndpoint.bingAI) {
-    return jailbreak ? 'Sydney' : 'BingAI';
+    return jailbreak === true ? 'Sydney' : 'BingAI';
   }
 
   if (endpoint === EModelEndpoint.anthropic) {
     return modelLabel ?? 'Claude';
   }
 
+  if (endpoint === EModelEndpoint.bedrock) {
+    return modelLabel ?? alternateName[endpoint];
+  }
+
   if (endpoint === EModelEndpoint.google) {
     if (modelLabel) {
       return modelLabel;
@@ -266,6 +285,8 @@ export const getResponseSender = (endpointOption: t.TEndpointOption): string =>
       return 'Mistral';
     } else if (model && model.includes('gpt-3')) {
       return 'GPT-3.5';
+    } else if (model && model.includes('gpt-4o')) {
+      return 'GPT-4o';
     } else if (model && model.includes('gpt-4')) {
       return 'GPT-4';
     } else if (modelDisplayLabel) {
@@ -279,26 +300,28 @@ export const getResponseSender = (endpointOption: t.TEndpointOption): string =>
 };
 
 type CompactEndpointSchema =
-  | typeof compactOpenAISchema
+  | typeof openAISchema
   | typeof compactAssistantSchema
   | typeof compactAgentsSchema
   | typeof compactGoogleSchema
   | typeof bingAISchema
-  | typeof compactAnthropicSchema
+  | typeof anthropicSchema
   | typeof compactChatGPTSchema
+  | typeof bedrockInputSchema
   | typeof compactPluginsSchema;
 
 const compactEndpointSchemas: Record<string, CompactEndpointSchema> = {
-  [EModelEndpoint.openAI]: compactOpenAISchema,
-  [EModelEndpoint.azureOpenAI]: compactOpenAISchema,
-  [EModelEndpoint.custom]: compactOpenAISchema,
+  [EModelEndpoint.openAI]: openAISchema,
+  [EModelEndpoint.azureOpenAI]: openAISchema,
+  [EModelEndpoint.custom]: openAISchema,
   [EModelEndpoint.assistants]: compactAssistantSchema,
   [EModelEndpoint.azureAssistants]: compactAssistantSchema,
   [EModelEndpoint.agents]: compactAgentsSchema,
   [EModelEndpoint.google]: compactGoogleSchema,
+  [EModelEndpoint.bedrock]: bedrockInputSchema,
   /* BingAI needs all fields */
   [EModelEndpoint.bingAI]: bingAISchema,
-  [EModelEndpoint.anthropic]: compactAnthropicSchema,
+  [EModelEndpoint.anthropic]: anthropicSchema,
   [EModelEndpoint.chatGPTBrowser]: compactChatGPTSchema,
   [EModelEndpoint.gptPlugins]: compactPluginsSchema,
 };
diff --git a/packages/data-provider/src/react-query/react-query-service.ts b/packages/data-provider/src/react-query/react-query-service.ts
index 76f2c11c9f4..997751358a3 100644
--- a/packages/data-provider/src/react-query/react-query-service.ts
+++ b/packages/data-provider/src/react-query/react-query-service.ts
@@ -124,6 +124,20 @@ export const useUpdateMessageMutation = (
   });
 };
 
+export const useUpdateMessageContentMutation = (
+  conversationId: string,
+): UseMutationResult<unknown, unknown, t.TUpdateMessageContent, unknown> => {
+  const queryClient = useQueryClient();
+  return useMutation(
+    (payload: t.TUpdateMessageContent) => dataService.updateMessageContent(payload),
+    {
+      onSuccess: () => {
+        queryClient.invalidateQueries([QueryKeys.messages, conversationId]);
+      },
+    },
+  );
+};
+
 export const useUpdateUserKeysMutation = (): UseMutationResult<
   t.TUser,
   unknown,
@@ -437,3 +451,14 @@ export const useGetCustomConfigSpeechQuery = (
     },
   );
 };
+
+export const useGetBannerQuery = (
+  config?: UseQueryOptions<t.TBannerResponse>,
+): QueryObserverResult<t.TBannerResponse> => {
+  return useQuery<t.TBannerResponse>([QueryKeys.banner], () => dataService.getBanner(), {
+    refetchOnWindowFocus: false,
+    refetchOnReconnect: false,
+    refetchOnMount: false,
+    ...config,
+  });
+};
diff --git a/packages/data-provider/src/roles.ts b/packages/data-provider/src/roles.ts
index 62ade4fcd87..fca276b00e0 100644
--- a/packages/data-provider/src/roles.ts
+++ b/packages/data-provider/src/roles.ts
@@ -23,9 +23,17 @@ export enum PermissionTypes {
    */
   PROMPTS = 'PROMPTS',
   /**
-   * Type for Bookmarks Permissions
+   * Type for Bookmark Permissions
    */
   BOOKMARKS = 'BOOKMARKS',
+  /**
+   * Type for Agent Permissions
+   */
+  AGENTS = 'AGENTS',
+  /**
+   * Type for Multi-Conversation Permissions
+   */
+  MULTI_CONVO = 'MULTI_CONVO',
 }
 
 /**
@@ -42,22 +50,37 @@ export const promptPermissionsSchema = z.object({
   [Permissions.SHARED_GLOBAL]: z.boolean().default(false),
   [Permissions.USE]: z.boolean().default(true),
   [Permissions.CREATE]: z.boolean().default(true),
-  [Permissions.SHARE]: z.boolean().default(false),
+  // [Permissions.SHARE]: z.boolean().default(false),
 });
 
 export const bookmarkPermissionsSchema = z.object({
   [Permissions.USE]: z.boolean().default(true),
 });
 
+export const agentPermissionsSchema = z.object({
+  [Permissions.SHARED_GLOBAL]: z.boolean().default(false),
+  [Permissions.USE]: z.boolean().default(true),
+  [Permissions.CREATE]: z.boolean().default(true),
+  // [Permissions.SHARE]: z.boolean().default(false),
+});
+
+export const multiConvoPermissionsSchema = z.object({
+  [Permissions.USE]: z.boolean().default(false),
+});
+
 export const roleSchema = z.object({
   name: z.string(),
   [PermissionTypes.PROMPTS]: promptPermissionsSchema,
   [PermissionTypes.BOOKMARKS]: bookmarkPermissionsSchema,
+  [PermissionTypes.AGENTS]: agentPermissionsSchema,
+  [PermissionTypes.MULTI_CONVO]: multiConvoPermissionsSchema,
 });
 
 export type TRole = z.infer<typeof roleSchema>;
+export type TAgentPermissions = z.infer<typeof agentPermissionsSchema>;
 export type TPromptPermissions = z.infer<typeof promptPermissionsSchema>;
 export type TBookmarkPermissions = z.infer<typeof bookmarkPermissionsSchema>;
+export type TMultiConvoPermissions = z.infer<typeof multiConvoPermissionsSchema>;
 
 const defaultRolesSchema = z.object({
   [SystemRoles.ADMIN]: roleSchema.extend({
@@ -66,16 +89,27 @@ const defaultRolesSchema = z.object({
       [Permissions.SHARED_GLOBAL]: z.boolean().default(true),
       [Permissions.USE]: z.boolean().default(true),
       [Permissions.CREATE]: z.boolean().default(true),
-      [Permissions.SHARE]: z.boolean().default(true),
+      // [Permissions.SHARE]: z.boolean().default(true),
     }),
     [PermissionTypes.BOOKMARKS]: bookmarkPermissionsSchema.extend({
       [Permissions.USE]: z.boolean().default(true),
     }),
+    [PermissionTypes.AGENTS]: agentPermissionsSchema.extend({
+      [Permissions.SHARED_GLOBAL]: z.boolean().default(true),
+      [Permissions.USE]: z.boolean().default(true),
+      [Permissions.CREATE]: z.boolean().default(true),
+      // [Permissions.SHARE]: z.boolean().default(true),
+    }),
+    [PermissionTypes.MULTI_CONVO]: multiConvoPermissionsSchema.extend({
+      [Permissions.USE]: z.boolean().default(true),
+    }),
   }),
   [SystemRoles.USER]: roleSchema.extend({
     name: z.literal(SystemRoles.USER),
     [PermissionTypes.PROMPTS]: promptPermissionsSchema,
     [PermissionTypes.BOOKMARKS]: bookmarkPermissionsSchema,
+    [PermissionTypes.AGENTS]: agentPermissionsSchema,
+    [PermissionTypes.MULTI_CONVO]: multiConvoPermissionsSchema,
   }),
 });
 
@@ -84,10 +118,14 @@ export const roleDefaults = defaultRolesSchema.parse({
     name: SystemRoles.ADMIN,
     [PermissionTypes.PROMPTS]: {},
     [PermissionTypes.BOOKMARKS]: {},
+    [PermissionTypes.AGENTS]: {},
+    [PermissionTypes.MULTI_CONVO]: {},
   },
   [SystemRoles.USER]: {
     name: SystemRoles.USER,
     [PermissionTypes.PROMPTS]: {},
     [PermissionTypes.BOOKMARKS]: {},
+    [PermissionTypes.AGENTS]: {},
+    [PermissionTypes.MULTI_CONVO]: {},
   },
 });
diff --git a/packages/data-provider/src/schemas.ts b/packages/data-provider/src/schemas.ts
index dff571f9b4b..980cb3b2dde 100644
--- a/packages/data-provider/src/schemas.ts
+++ b/packages/data-provider/src/schemas.ts
@@ -25,11 +25,45 @@ export enum EModelEndpoint {
   azureAssistants = 'azureAssistants',
   agents = 'agents',
   custom = 'custom',
+  bedrock = 'bedrock',
 }
 
+export const paramEndpoints = new Set<EModelEndpoint | string>([
+  EModelEndpoint.agents,
+  EModelEndpoint.bedrock,
+  EModelEndpoint.openAI,
+  EModelEndpoint.anthropic,
+  EModelEndpoint.custom,
+]);
+
+export enum BedrockProviders {
+  AI21 = 'ai21',
+  Amazon = 'amazon',
+  Anthropic = 'anthropic',
+  Cohere = 'cohere',
+  Meta = 'meta',
+  MistralAI = 'mistral',
+  StabilityAI = 'stability',
+}
+
+export const getModelKey = (endpoint: EModelEndpoint | string, model: string) => {
+  if (endpoint === EModelEndpoint.bedrock) {
+    return model.split('.')[0] as BedrockProviders;
+  }
+  return model;
+};
+
+export const getSettingsKeys = (endpoint: EModelEndpoint | string, model: string) => {
+  const endpointKey = endpoint;
+  const modelKey = getModelKey(endpointKey, model);
+  const combinedKey = `${endpointKey}-${modelKey}`;
+  return [combinedKey, endpointKey];
+};
+
 export type AssistantsEndpoint = EModelEndpoint.assistants | EModelEndpoint.azureAssistants;
 
-export const isAssistantsEndpoint = (endpoint?: AssistantsEndpoint | null | string): boolean => {
+export const isAssistantsEndpoint = (_endpoint?: AssistantsEndpoint | null | string): boolean => {
+  const endpoint = _endpoint ?? '';
   if (!endpoint) {
     return false;
   }
@@ -38,13 +72,29 @@ export const isAssistantsEndpoint = (endpoint?: AssistantsEndpoint | null | stri
 
 export type AgentProvider = Exclude<keyof typeof EModelEndpoint, EModelEndpoint.agents> | string;
 
-export const isAgentsEndpoint = (endpoint?: EModelEndpoint.agents | null | string): boolean => {
+export const isAgentsEndpoint = (_endpoint?: EModelEndpoint.agents | null | string): boolean => {
+  const endpoint = _endpoint ?? '';
   if (!endpoint) {
     return false;
   }
   return endpoint === EModelEndpoint.agents;
 };
 
+export const isParamEndpoint = (
+  endpoint: EModelEndpoint | string,
+  endpointType?: EModelEndpoint | string,
+): boolean => {
+  if (paramEndpoints.has(endpoint)) {
+    return true;
+  }
+
+  if (endpointType != null) {
+    return paramEndpoints.has(endpointType);
+  }
+
+  return false;
+};
+
 export enum ImageDetail {
   low = 'low',
   auto = 'auto',
@@ -89,6 +139,7 @@ export const defaultAgentFormValues = {
   model_parameters: {},
   tools: [],
   provider: {},
+  projectIds: [],
   code_interpreter: false,
   image_vision: false,
   retrieval: false,
@@ -295,6 +346,7 @@ export const endpointSettings = {
   [EModelEndpoint.google]: googleSettings,
   [EModelEndpoint.anthropic]: anthropicSettings,
   [EModelEndpoint.agents]: agentsSettings,
+  [EModelEndpoint.bedrock]: agentsSettings,
 };
 
 const google = endpointSettings[EModelEndpoint.google];
@@ -433,10 +485,30 @@ export const coerceNumber = z.union([z.number(), z.string()]).transform((val) =>
   return val;
 });
 
+type DocumentTypeValue =
+  | null
+  | boolean
+  | number
+  | string
+  | DocumentTypeValue[]
+  | { [key: string]: DocumentTypeValue };
+
+const DocumentType: z.ZodType<DocumentTypeValue> = z.lazy(() =>
+  z.union([
+    z.null(),
+    z.boolean(),
+    z.number(),
+    z.string(),
+    z.array(z.lazy(() => DocumentType)),
+    z.record(z.lazy(() => DocumentType)),
+  ]),
+);
+
 export const tConversationSchema = z.object({
   conversationId: z.string().nullable(),
   endpoint: eModelEndpointSchema.nullable(),
   endpointType: eModelEndpointSchema.optional(),
+  isArchived: z.boolean().optional(),
   title: z.string().nullable().or(z.literal('New Chat')).default('New Chat'),
   user: z.string().optional(),
   messages: z.array(z.string()).optional(),
@@ -452,11 +524,12 @@ export const tConversationSchema = z.object({
   frequency_penalty: z.number().optional(),
   presence_penalty: z.number().optional(),
   parentMessageId: z.string().optional(),
-  maxOutputTokens: z.number().optional(),
+  maxOutputTokens: coerceNumber.optional(),
   maxContextTokens: coerceNumber.optional(),
   max_tokens: coerceNumber.optional(),
   /* Anthropic */
   promptCache: z.boolean().optional(),
+  system: z.string().optional(),
   /* artifacts */
   artifacts: z.string().optional(),
   /* google */
@@ -475,6 +548,10 @@ export const tConversationSchema = z.object({
   assistant_id: z.string().optional(),
   /* agents */
   agent_id: z.string().optional(),
+  /* AWS Bedrock */
+  region: z.string().optional(),
+  maxTokens: coerceNumber.optional(),
+  additionalModelRequestFields: DocumentType.optional(),
   /* assistant + agents */
   instructions: z.string().optional(),
   additional_instructions: z.string().optional(),
@@ -577,71 +654,6 @@ export const tConversationTagSchema = z.object({
 });
 export type TConversationTag = z.infer<typeof tConversationTagSchema>;
 
-export const openAISchema = tConversationSchema
-  .pick({
-    model: true,
-    modelLabel: true,
-    chatGptLabel: true,
-    promptPrefix: true,
-    temperature: true,
-    top_p: true,
-    presence_penalty: true,
-    frequency_penalty: true,
-    resendFiles: true,
-    artifacts: true,
-    imageDetail: true,
-    stop: true,
-    iconURL: true,
-    greeting: true,
-    spec: true,
-    maxContextTokens: true,
-    max_tokens: true,
-  })
-  .transform((obj) => {
-    const result = {
-      ...obj,
-      model: obj.model ?? openAISettings.model.default,
-      chatGptLabel: obj.chatGptLabel ?? obj.modelLabel ?? null,
-      promptPrefix: obj.promptPrefix ?? null,
-      temperature: obj.temperature ?? openAISettings.temperature.default,
-      top_p: obj.top_p ?? openAISettings.top_p.default,
-      presence_penalty: obj.presence_penalty ?? openAISettings.presence_penalty.default,
-      frequency_penalty: obj.frequency_penalty ?? openAISettings.frequency_penalty.default,
-      resendFiles:
-        typeof obj.resendFiles === 'boolean' ? obj.resendFiles : openAISettings.resendFiles.default,
-      imageDetail: obj.imageDetail ?? openAISettings.imageDetail.default,
-      stop: obj.stop ?? undefined,
-      iconURL: obj.iconURL ?? undefined,
-      greeting: obj.greeting ?? undefined,
-      spec: obj.spec ?? undefined,
-      maxContextTokens: obj.maxContextTokens ?? undefined,
-      max_tokens: obj.max_tokens ?? undefined,
-    };
-
-    if (obj.modelLabel) {
-      result.modelLabel = null;
-    }
-
-    return result;
-  })
-  .catch(() => ({
-    model: openAISettings.model.default,
-    chatGptLabel: null,
-    promptPrefix: null,
-    temperature: openAISettings.temperature.default,
-    top_p: openAISettings.top_p.default,
-    presence_penalty: openAISettings.presence_penalty.default,
-    frequency_penalty: openAISettings.frequency_penalty.default,
-    resendFiles: openAISettings.resendFiles.default,
-    imageDetail: openAISettings.imageDetail.default,
-    stop: undefined,
-    iconURL: undefined,
-    greeting: undefined,
-    spec: undefined,
-    maxContextTokens: undefined,
-    max_tokens: undefined,
-  }));
-
 export const googleSchema = tConversationSchema
   .pick({
     model: true,
@@ -725,64 +737,6 @@ export const bingAISchema = tConversationSchema
     invocationId: 1,
   }));
 
-export const anthropicSchema = tConversationSchema
-  .pick({
-    model: true,
-    modelLabel: true,
-    promptPrefix: true,
-    temperature: true,
-    maxOutputTokens: true,
-    topP: true,
-    topK: true,
-    resendFiles: true,
-    promptCache: true,
-    artifacts: true,
-    iconURL: true,
-    greeting: true,
-    spec: true,
-    maxContextTokens: true,
-  })
-  .transform((obj) => {
-    const model = obj.model ?? anthropicSettings.model.default;
-    return {
-      ...obj,
-      model,
-      modelLabel: obj.modelLabel ?? null,
-      promptPrefix: obj.promptPrefix ?? null,
-      temperature: obj.temperature ?? anthropicSettings.temperature.default,
-      maxOutputTokens: obj.maxOutputTokens ?? anthropicSettings.maxOutputTokens.reset(model),
-      topP: obj.topP ?? anthropicSettings.topP.default,
-      topK: obj.topK ?? anthropicSettings.topK.default,
-      promptCache:
-        typeof obj.promptCache === 'boolean'
-          ? obj.promptCache
-          : anthropicSettings.promptCache.default,
-      resendFiles:
-        typeof obj.resendFiles === 'boolean'
-          ? obj.resendFiles
-          : anthropicSettings.resendFiles.default,
-      iconURL: obj.iconURL ?? undefined,
-      greeting: obj.greeting ?? undefined,
-      spec: obj.spec ?? undefined,
-      maxContextTokens: obj.maxContextTokens ?? anthropicSettings.maxContextTokens.default,
-    };
-  })
-  .catch(() => ({
-    model: anthropicSettings.model.default,
-    modelLabel: null,
-    promptPrefix: null,
-    temperature: anthropicSettings.temperature.default,
-    maxOutputTokens: anthropicSettings.maxOutputTokens.default,
-    topP: anthropicSettings.topP.default,
-    topK: anthropicSettings.topK.default,
-    resendFiles: anthropicSettings.resendFiles.default,
-    promptCache: anthropicSettings.promptCache.default,
-    iconURL: undefined,
-    greeting: undefined,
-    spec: undefined,
-    maxContextTokens: anthropicSettings.maxContextTokens.default,
-  }));
-
 export const chatGPTBrowserSchema = tConversationSchema
   .pick({
     model: true,
@@ -836,7 +790,7 @@ export const gptPluginsSchema = tConversationSchema
       maxContextTokens: obj.maxContextTokens ?? undefined,
     };
 
-    if (obj.modelLabel) {
+    if (obj.modelLabel != null && obj.modelLabel !== '') {
       result.modelLabel = null;
     }
 
@@ -863,16 +817,17 @@ export const gptPluginsSchema = tConversationSchema
     maxContextTokens: undefined,
   }));
 
-export function removeNullishValues<T extends object>(obj: T): T {
+export function removeNullishValues<T extends Record<string, unknown>>(obj: T): Partial<T> {
   const newObj: Partial<T> = { ...obj };
 
   (Object.keys(newObj) as Array<keyof T>).forEach((key) => {
-    if (newObj[key] === undefined || newObj[key] === null || newObj[key] === '') {
+    const value = newObj[key];
+    if (value === undefined || value === null || value === '') {
       delete newObj[key];
     }
   });
 
-  return newObj as T;
+  return newObj;
 }
 
 export const assistantSchema = tConversationSchema
@@ -973,20 +928,7 @@ export const agentsSchema = tConversationSchema
     maxContextTokens: undefined,
   }));
 
-export const compactAgentsSchema = tConversationSchema
-  .pick({
-    model: true,
-    agent_id: true,
-    instructions: true,
-    promptPrefix: true,
-    iconURL: true,
-    greeting: true,
-    spec: true,
-  })
-  .transform(removeNullishValues)
-  .catch(() => ({}));
-
-export const compactOpenAISchema = tConversationSchema
+export const openAISchema = tConversationSchema
   .pick({
     model: true,
     chatGptLabel: true,
@@ -1005,29 +947,7 @@ export const compactOpenAISchema = tConversationSchema
     maxContextTokens: true,
     max_tokens: true,
   })
-  .transform((obj: Partial<TConversation>) => {
-    const newObj: Partial<TConversation> = { ...obj };
-    if (newObj.temperature === openAISettings.temperature.default) {
-      delete newObj.temperature;
-    }
-    if (newObj.top_p === openAISettings.top_p.default) {
-      delete newObj.top_p;
-    }
-    if (newObj.presence_penalty === openAISettings.presence_penalty.default) {
-      delete newObj.presence_penalty;
-    }
-    if (newObj.frequency_penalty === openAISettings.frequency_penalty.default) {
-      delete newObj.frequency_penalty;
-    }
-    if (newObj.resendFiles === openAISettings.resendFiles.default) {
-      delete newObj.resendFiles;
-    }
-    if (newObj.imageDetail === openAISettings.imageDetail.default) {
-      delete newObj.imageDetail;
-    }
-
-    return removeNullishValues(newObj);
-  })
+  .transform((obj: Partial<TConversation>) => removeNullishValues(obj))
   .catch(() => ({}));
 
 export const compactGoogleSchema = tConversationSchema
@@ -1065,7 +985,7 @@ export const compactGoogleSchema = tConversationSchema
   })
   .catch(() => ({}));
 
-export const compactAnthropicSchema = tConversationSchema
+export const anthropicSchema = tConversationSchema
   .pick({
     model: true,
     modelLabel: true,
@@ -1082,29 +1002,7 @@ export const compactAnthropicSchema = tConversationSchema
     spec: true,
     maxContextTokens: true,
   })
-  .transform((obj) => {
-    const newObj: Partial<TConversation> = { ...obj };
-    if (newObj.temperature === anthropicSettings.temperature.default) {
-      delete newObj.temperature;
-    }
-    if (newObj.maxOutputTokens === anthropicSettings.legacy.maxOutputTokens.default) {
-      delete newObj.maxOutputTokens;
-    }
-    if (newObj.topP === anthropicSettings.topP.default) {
-      delete newObj.topP;
-    }
-    if (newObj.topK === anthropicSettings.topK.default) {
-      delete newObj.topK;
-    }
-    if (newObj.resendFiles === anthropicSettings.resendFiles.default) {
-      delete newObj.resendFiles;
-    }
-    if (newObj.promptCache === anthropicSettings.promptCache.default) {
-      delete newObj.promptCache;
-    }
-
-    return removeNullishValues(newObj);
-  })
+  .transform((obj) => removeNullishValues(obj))
   .catch(() => ({}));
 
 export const compactChatGPTSchema = tConversationSchema
@@ -1170,3 +1068,27 @@ export const compactPluginsSchema = tConversationSchema
     return removeNullishValues(newObj);
   })
   .catch(() => ({}));
+
+const tBannerSchema = z.object({
+  bannerId: z.string(),
+  message: z.string(),
+  displayFrom: z.string(),
+  displayTo: z.string(),
+  createdAt: z.string(),
+  updatedAt: z.string(),
+  isPublic: z.boolean(),
+});
+export type TBanner = z.infer<typeof tBannerSchema>;
+
+export const compactAgentsSchema = tConversationSchema
+  .pick({
+    model: true,
+    agent_id: true,
+    instructions: true,
+    additional_instructions: true,
+    iconURL: true,
+    greeting: true,
+    spec: true,
+  })
+  .transform(removeNullishValues)
+  .catch(() => ({}));
diff --git a/packages/data-provider/src/types.ts b/packages/data-provider/src/types.ts
index 89d40b17e6b..41276c7557e 100644
--- a/packages/data-provider/src/types.ts
+++ b/packages/data-provider/src/types.ts
@@ -8,6 +8,7 @@ import type {
   TConversation,
   EModelEndpoint,
   TConversationTag,
+  TBanner,
 } from './schemas';
 import type { TSpecsConfig } from './models';
 export type TOpenAIMessage = OpenAI.Chat.ChatCompletionMessageParam;
@@ -128,6 +129,13 @@ export type TUpdateMessageRequest = {
   text: string;
 };
 
+export type TUpdateMessageContent = {
+  conversationId: string;
+  messageId: string;
+  index: number;
+  text: string;
+};
+
 export type TUpdateUserKeyRequest = {
   name: string;
   value: string;
@@ -221,6 +229,7 @@ export type TConfig = {
   type?: EModelEndpoint;
   azure?: boolean;
   availableTools?: [];
+  availableRegions?: string[];
   plugins?: Record<string, string>;
   name?: string;
   iconURL?: string;
@@ -309,6 +318,9 @@ export type TInterfaceConfig = {
   parameters: boolean;
   sidePanel: boolean;
   presets: boolean;
+  multiConvo: boolean;
+  bookmarks: boolean;
+  prompts: boolean;
 };
 
 export type TStartupConfig = {
@@ -507,3 +519,5 @@ export type TUserTermsResponse = {
 export type TAcceptTermsResponse = {
   success: boolean;
 };
+
+export type TBannerResponse = TBanner | null;
diff --git a/packages/data-provider/src/types/agents.ts b/packages/data-provider/src/types/agents.ts
index 04f668be634..d66fa63b9e6 100644
--- a/packages/data-provider/src/types/agents.ts
+++ b/packages/data-provider/src/types/agents.ts
@@ -10,10 +10,11 @@ export namespace Agents {
   export type MessageContentText = {
     type: ContentTypes.TEXT;
     text: string;
+    tool_call_ids?: string[];
   };
 
   export type MessageContentImageUrl = {
-    type: 'image_url';
+    type: ContentTypes.IMAGE_URL;
     image_url: string | { url: string; detail?: ImageDetail };
   };
 
@@ -21,7 +22,7 @@ export namespace Agents {
     | MessageContentText
     | MessageContentImageUrl
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    | (Record<string, any> & { type?: ContentTypes | 'image_url' | 'text_delta' | string })
+    | (Record<string, any> & { type?: ContentTypes | string })
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     | (Record<string, any> & { type?: never });
 
@@ -38,7 +39,7 @@ export namespace Agents {
 
     /** The arguments to the tool call */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    args: string | Record<string, any>;
+    args?: string | Record<string, any>;
 
     /** If provided, an identifier associated with the tool call */
     id?: string;
@@ -50,14 +51,14 @@ export namespace Agents {
     /** The Step Id of the Tool Call */
     id: string;
     /** The Completed Tool Call */
-    tool_call: ToolCall;
+    tool_call?: ToolCall;
     /** The content index of the tool call */
     index: number;
   };
 
   export type ToolCallContent = {
     type: ContentTypes.TOOL_CALL;
-    tool_call: ToolCall;
+    tool_call?: ToolCall;
   };
 
   /**
@@ -180,8 +181,8 @@ export namespace Agents {
     tool_calls: AgentToolCall[];
   };
   export type ToolCallDelta = {
-    type: StepTypes.TOOL_CALLS;
-    tool_calls: ToolCallChunk[];
+    type: StepTypes.TOOL_CALLS | string;
+    tool_calls?: ToolCallChunk[];
   };
   export type AgentToolCall = FunctionToolCall | ToolCall;
   export interface ExtendedMessageContent {
@@ -215,5 +216,5 @@ export namespace Agents {
      */
     content?: MessageContentComplex[];
   }
-  export type ContentType = ContentTypes.TEXT | 'image_url' | string;
+  export type ContentType = ContentTypes.TEXT | ContentTypes.IMAGE_URL | string;
 }
diff --git a/packages/data-provider/src/types/assistants.ts b/packages/data-provider/src/types/assistants.ts
index 7c70258e74b..0768a3d5b9d 100644
--- a/packages/data-provider/src/types/assistants.ts
+++ b/packages/data-provider/src/types/assistants.ts
@@ -160,6 +160,7 @@ export type Agent = {
   file_ids: string[];
   instructions: string | null;
   tools?: string[];
+  projectIds?: string[];
   tool_kwargs?: Record<string, unknown>;
   tool_resources?: ToolResources;
   metadata?: Record<string, unknown>;
@@ -192,8 +193,10 @@ export type AgentUpdateParams = {
   tools?: Array<FunctionTool | string>;
   tool_resources?: ToolResources;
   provider?: AgentProvider;
-  model: string | null;
-  model_parameters: AgentModelParameters;
+  model?: string | null;
+  model_parameters?: AgentModelParameters;
+  projectIds?: string[];
+  removeProjectIds?: string[];
 };
 
 export type AgentListParams = {
@@ -381,7 +384,7 @@ export type ContentPart = (
 
 export type TMessageContentParts =
   | { type: ContentTypes.ERROR; text: Text & PartMetadata }
-  | { type: ContentTypes.TEXT; text: string | (Text & PartMetadata) }
+  | { type: ContentTypes.TEXT; text: string | (Text & PartMetadata); tool_call_ids?: string[] }
   | {
       type: ContentTypes.TOOL_CALL;
       tool_call: (
diff --git a/packages/data-provider/src/types/mutations.ts b/packages/data-provider/src/types/mutations.ts
index bd791deea03..b9f8f2c3858 100644
--- a/packages/data-provider/src/types/mutations.ts
+++ b/packages/data-provider/src/types/mutations.ts
@@ -165,6 +165,12 @@ export type UpdateSharedLinkOptions = MutationOptions<
   types.TSharedLink,
   Partial<types.TSharedLink>
 >;
+
+export type ArchiveConvoOptions = MutationOptions<
+  types.TArchiveConversationResponse,
+  types.TArchiveConversationRequest
+>;
+
 export type DeleteSharedLinkOptions = MutationOptions<types.TSharedLink, { shareId: string }>;
 
 export type TUpdatePromptContext =
@@ -235,3 +241,10 @@ export type UpdateConversationTagOptions = MutationOptions<
   types.TConversationTagRequest
 >;
 export type DeleteConversationTagOptions = MutationOptions<types.TConversationTag, string>;
+
+export type AcceptTermsMutationOptions = MutationOptions<
+  types.TAcceptTermsResponse,
+  void,
+  unknown,
+  void
+>;
diff --git a/packages/data-provider/src/types/runs.ts b/packages/data-provider/src/types/runs.ts
index 4a28a320328..2d66d586956 100644
--- a/packages/data-provider/src/types/runs.ts
+++ b/packages/data-provider/src/types/runs.ts
@@ -1,5 +1,6 @@
 export enum ContentTypes {
   TEXT = 'text',
+  TEXT_DELTA = 'text_delta',
   TOOL_CALL = 'tool_call',
   IMAGE_FILE = 'image_file',
   IMAGE_URL = 'image_url',
diff --git a/prettier.config.js b/prettier.config.js
index d6f5ba07740..d01e0f609b6 100644
--- a/prettier.config.js
+++ b/prettier.config.js
@@ -1,4 +1,4 @@
-// v0.7.5-rc1
+// v0.7.5-rc2
 module.exports = {
   tailwindConfig: './client/tailwind.config.cjs',
   printWidth: 100,